From 05026d1f1a10eb490d81724c17b1626377e64c64 Mon Sep 17 00:00:00 2001 From: Erik Erlandson Date: Sat, 14 Oct 2023 11:06:48 -0700 Subject: [PATCH 1/2] stub coulomb-ciris --- .github/workflows/ci.yml | 4 ++-- build.sbt | 23 +++++++++++++++++++++++ ciris/src/main/scala/coulomb/ciris.scala | 20 ++++++++++++++++++++ 3 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 ciris/src/main/scala/coulomb/ciris.scala diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ab5c5c841..2fa3a98d0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -80,11 +80,11 @@ jobs: - name: Make target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/scala3') - run: mkdir -p runtime/.js/target spire/.js/target spire/.jvm/target testkit/.native/target units/.jvm/target runtime/.native/target testkit/.js/target parser/.jvm/target unidocs/target parser/.js/target core/.native/target pureconfig/.jvm/target spire/.native/target parser/.native/target core/.js/target units/.native/target runtime/.jvm/target core/.jvm/target refined/.native/target refined/.js/target refined/.jvm/target units/.js/target testkit/.jvm/target project/target + run: mkdir -p runtime/.js/target spire/.js/target spire/.jvm/target testkit/.native/target units/.jvm/target runtime/.native/target testkit/.js/target parser/.jvm/target unidocs/target parser/.js/target core/.native/target ciris/.js/target pureconfig/.jvm/target spire/.native/target parser/.native/target core/.js/target ciris/.jvm/target units/.native/target runtime/.jvm/target core/.jvm/target refined/.native/target refined/.js/target ciris/.native/target refined/.jvm/target units/.js/target testkit/.jvm/target project/target - name: Compress target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/scala3') - run: tar cf targets.tar runtime/.js/target spire/.js/target spire/.jvm/target testkit/.native/target units/.jvm/target runtime/.native/target testkit/.js/target parser/.jvm/target unidocs/target parser/.js/target core/.native/target pureconfig/.jvm/target spire/.native/target parser/.native/target core/.js/target units/.native/target runtime/.jvm/target core/.jvm/target refined/.native/target refined/.js/target refined/.jvm/target units/.js/target testkit/.jvm/target project/target + run: tar cf targets.tar runtime/.js/target spire/.js/target spire/.jvm/target testkit/.native/target units/.jvm/target runtime/.native/target testkit/.js/target parser/.jvm/target unidocs/target parser/.js/target core/.native/target ciris/.js/target pureconfig/.jvm/target spire/.native/target parser/.native/target core/.js/target ciris/.jvm/target units/.native/target runtime/.jvm/target core/.jvm/target refined/.native/target refined/.js/target ciris/.native/target refined/.jvm/target units/.js/target testkit/.jvm/target project/target - name: Upload target directories if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/scala3') diff --git a/build.sbt b/build.sbt index c4251f9d5..011ce446c 100644 --- a/build.sbt +++ b/build.sbt @@ -46,6 +46,7 @@ lazy val root = tlCrossRootProject runtime, parser, pureconfig, + ciris, spire, refined, testkit, @@ -135,6 +136,26 @@ lazy val pureconfig = crossProject( libraryDependencies += "com.github.pureconfig" %%% "pureconfig-core" % "0.17.4" ) +lazy val ciris = crossProject( + JVMPlatform, JSPlatform, NativePlatform +) + .crossType(CrossType.Pure) + .in(file("ciris")) + .settings(name := "coulomb-ciris") + .dependsOn( + core % "compile->compile;test->test", + runtime, + parser, + units % Test + ) + .settings( + tlVersionIntroduced := Map("3" -> "0.8.1") + ) + .settings(commonSettings: _*) + .settings( + libraryDependencies += "is.cir" %%% "ciris" % "3.3.0" + ) + lazy val spire = crossProject(JVMPlatform, JSPlatform, NativePlatform) .crossType(CrossType.Pure) .in(file("spire")) @@ -180,6 +201,7 @@ lazy val all = project runtime.jvm, parser.jvm, pureconfig.jvm, + ciris.jvm, spire.jvm, refined.jvm ) // scala repl only needs JVMPlatform subproj builds @@ -210,6 +232,7 @@ lazy val docs = project runtime.jvm, parser.jvm, pureconfig.jvm, + ciris.jvm, spire.jvm, refined.jvm ) diff --git a/ciris/src/main/scala/coulomb/ciris.scala b/ciris/src/main/scala/coulomb/ciris.scala new file mode 100644 index 000000000..b9a09d76f --- /dev/null +++ b/ciris/src/main/scala/coulomb/ciris.scala @@ -0,0 +1,20 @@ +/* + * Copyright 2022 Erik Erlandson + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package coulomb.ciris + +object test: + val stub = 0 From 6104769bc431720275b756174fee4df70d5fa6ef Mon Sep 17 00:00:00 2001 From: Erik Erlandson Date: Sat, 14 Oct 2023 11:11:15 -0700 Subject: [PATCH 2/2] format --- build.sbt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 011ce446c..60bc32e93 100644 --- a/build.sbt +++ b/build.sbt @@ -137,7 +137,9 @@ lazy val pureconfig = crossProject( ) lazy val ciris = crossProject( - JVMPlatform, JSPlatform, NativePlatform + JVMPlatform, + JSPlatform, + NativePlatform ) .crossType(CrossType.Pure) .in(file("ciris"))