Simplify the build

typelevel · Jun 18, 2022 · 974242f · 974242f
1 parent ba04205
commit 974242f
Show file tree

Hide file tree

Showing 18 changed files with 18 additions and 69 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,7 +28,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [3.0.2, 2.12.16, 2.13.8]
+        scala: [3.1.2, 2.12.16, 2.13.8]
         java: [temurin@8]
         project: [rootJS, rootJVM]
     runs-on: ${{ matrix.os }}
@@ -90,11 +90,11 @@ jobs:
 
       - name: Make target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
-        run: mkdir -p target ce2/jvm/target .js/target site/target ce3/js/target .jvm/target .native/target ce2/js/target ce3/jvm/target project/target
+        run: mkdir -p target .js/target site/target core/js/target core/jvm/target .jvm/target .native/target project/target
 
       - name: Compress target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
-        run: tar cf targets.tar target ce2/jvm/target .js/target site/target ce3/js/target .jvm/target .native/target ce2/js/target ce3/jvm/target project/target
+        run: tar cf targets.tar target .js/target site/target core/js/target core/jvm/target .jvm/target .native/target project/target
 
       - name: Upload target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
@@ -147,22 +147,22 @@ jobs:
             ~/Library/Caches/Coursier/v1
           key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
 
-      - name: Download target directories (3.0.2, rootJS)
+      - name: Download target directories (3.1.2, rootJS)
         uses: actions/download-artifact@v2
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-3.0.2-rootJS
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3.1.2-rootJS
 
-      - name: Inflate target directories (3.0.2, rootJS)
+      - name: Inflate target directories (3.1.2, rootJS)
         run: |
           tar xf targets.tar
           rm targets.tar
 
-      - name: Download target directories (3.0.2, rootJVM)
+      - name: Download target directories (3.1.2, rootJVM)
         uses: actions/download-artifact@v2
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-3.0.2-rootJVM
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3.1.2-rootJVM
 
-      - name: Inflate target directories (3.0.2, rootJVM)
+      - name: Inflate target directories (3.1.2, rootJVM)
         run: |
           tar xf targets.tar
           rm targets.tar

diff --git a/build.sbt b/build.sbt
@@ -1,77 +1,26 @@
-ThisBuild / tlBaseVersion := "1.0"
+ThisBuild / tlBaseVersion := "2.0"
 
 ThisBuild / developers += tlGitHubDev("milanvdm", "Milan van der Meer")
 ThisBuild / startYear := Some(2021)
 
-ThisBuild / crossScalaVersions := List("3.0.2", "2.12.16", "2.13.8")
+ThisBuild / crossScalaVersions := List("3.1.2", "2.12.16", "2.13.8")
 
 ThisBuild / tlFatalWarningsInCi := false
 
 lazy val docs = project
   .in(file("site"))
-  .dependsOn(ce3.jvm)
+  .dependsOn(core.jvm)
   .enablePlugins(TypelevelSitePlugin)
 
-lazy val root = tlCrossRootProject.aggregate(ce3, ce2)
+lazy val root = tlCrossRootProject.aggregate(core)
 
-lazy val ce3 = crossProject(JSPlatform, JVMPlatform)
+lazy val core = crossProject(JSPlatform, JVMPlatform)
   .crossType(CrossType.Full)
+  .in(file("core"))
   .settings(
-    name := "munit-cats-effect-3",
-    Compile / unmanagedSourceDirectories += baseDirectory.value / "../../common/shared/src/main/scala",
-    Test / unmanagedSourceDirectories += baseDirectory.value / "../../common/shared/src/test/scala"
-  )
-  .settings(
+    name := "munit-cats-effect",
     libraryDependencies ++= Seq(
-      "org.scalameta" %%% "munit" % "0.7.29",
+      "org.scalameta" %%% "munit" % "1.0.0-M5",
       "org.typelevel" %%% "cats-effect" % "3.3.12"
-    ),
-    // we are checking binary compatibility from the 1.0.6 version
-    mimaPreviousArtifacts ~= {
-      _.filter { m =>
-        VersionNumber(m.revision).matchesSemVer(SemanticSelector(">=1.0.6"))
-      }
-    }
-  )
-  .jvmSettings(
-    Compile / unmanagedSourceDirectories += baseDirectory.value / "../../common/jvm/src/main/scala",
-    Test / unmanagedSourceDirectories += baseDirectory.value / "../../common/jvm/src/test/scala"
-  )
-  .jsSettings(
-    Compile / unmanagedSourceDirectories += baseDirectory.value / "../../common/js/src/main/scala",
-    Test / unmanagedSourceDirectories += baseDirectory.value / "../../common/js/src/test/scala",
-    scalaJSLinkerConfig ~= (_.withModuleKind(ModuleKind.CommonJSModule))
-  )
-
-lazy val ce2 = crossProject(JSPlatform, JVMPlatform)
-  .crossType(CrossType.Full)
-  .settings(
-    name := "munit-cats-effect-2",
-    Compile / unmanagedSourceDirectories += baseDirectory.value / "../../common/shared/src/main/scala",
-    Test / unmanagedSourceDirectories += baseDirectory.value / "../../common/shared/src/test/scala"
-  )
-  .settings(
-    libraryDependencies ++= Seq(
-      "org.scalameta" %%% "munit" % "0.7.29",
-      "org.typelevel" %%% "cats-effect" % "2.5.5"
-    ),
-    // we are checking binary compatibility from the 1.0.6 version
-    mimaPreviousArtifacts ~= {
-      _.filter { m =>
-        VersionNumber(m.revision).matchesSemVer(SemanticSelector(">=1.0.6"))
-      }
-    }
+    )
   )
-  .jvmSettings(
-    Compile / unmanagedSourceDirectories += baseDirectory.value / "../../common/jvm/src/main/scala",
-    Test / unmanagedSourceDirectories += baseDirectory.value / "../../common/jvm/src/test/scala"
-  )
-  .jsSettings(
-    libraryDependencies += "org.scala-js" %%% "scala-js-macrotask-executor" % "1.0.0",
-    Compile / unmanagedSourceDirectories += baseDirectory.value / "../../common/js/src/main/scala",
-    Test / unmanagedSourceDirectories += baseDirectory.value / "../../common/js/src/test/scala",
-    scalaJSLinkerConfig ~= (_.withModuleKind(ModuleKind.CommonJSModule))
-  )
-
-addCommandAlias("fmt", """scalafmtSbt;scalafmtAll""")
-addCommandAlias("fmtCheck", """scalafmtSbtCheck;scalafmtCheckAll""")
diff --git a/...la/munit/CatsEffectFixturesPlatform.scala → ...la/munit/CatsEffectFixturesPlatform.scala b/...la/munit/CatsEffectFixturesPlatform.scala → ...la/munit/CatsEffectFixturesPlatform.scala
diff --git a/...scala/munit/CatsEffectSuitePlatform.scala → ...scala/munit/CatsEffectSuitePlatform.scala b/...scala/munit/CatsEffectSuitePlatform.scala → ...scala/munit/CatsEffectSuitePlatform.scala
diff --git a/...la/munit/CatsEffectFixturesPlatform.scala → ...la/munit/CatsEffectFixturesPlatform.scala b/...la/munit/CatsEffectFixturesPlatform.scala → ...la/munit/CatsEffectFixturesPlatform.scala
diff --git a/...scala/munit/CatsEffectSuitePlatform.scala → ...scala/munit/CatsEffectSuitePlatform.scala b/...scala/munit/CatsEffectSuitePlatform.scala → ...scala/munit/CatsEffectSuitePlatform.scala
diff --git a/...unit/CatsEffectFixturesPlatformSpec.scala → ...unit/CatsEffectFixturesPlatformSpec.scala b/...unit/CatsEffectFixturesPlatformSpec.scala → ...unit/CatsEffectFixturesPlatformSpec.scala
diff --git a/...in/scala/munit/CatsEffectAssertions.scala → ...in/scala/munit/CatsEffectAssertions.scala b/...in/scala/munit/CatsEffectAssertions.scala → ...in/scala/munit/CatsEffectAssertions.scala
diff --git a/...main/scala/munit/CatsEffectFixtures.scala → ...main/scala/munit/CatsEffectFixtures.scala b/...main/scala/munit/CatsEffectFixtures.scala → ...main/scala/munit/CatsEffectFixtures.scala
diff --git a/...n/scala/munit/CatsEffectFunFixtures.scala → ...n/scala/munit/CatsEffectFunFixtures.scala b/...n/scala/munit/CatsEffectFunFixtures.scala → ...n/scala/munit/CatsEffectFunFixtures.scala
diff --git a/...rc/main/scala/munit/CatsEffectSuite.scala → ...rc/main/scala/munit/CatsEffectSuite.scala b/...rc/main/scala/munit/CatsEffectSuite.scala → ...rc/main/scala/munit/CatsEffectSuite.scala
diff --git a/...hared/src/main/scala/munit/internal.scala → ...hared/src/main/scala/munit/internal.scala b/...hared/src/main/scala/munit/internal.scala → ...hared/src/main/scala/munit/internal.scala
diff --git a/...cala/munit/CatsEffectAssertionsSpec.scala → ...cala/munit/CatsEffectAssertionsSpec.scala b/...cala/munit/CatsEffectAssertionsSpec.scala → ...cala/munit/CatsEffectAssertionsSpec.scala
diff --git a/...unit/CatsEffectAssertionsSyntaxSpec.scala → ...unit/CatsEffectAssertionsSyntaxSpec.scala b/...unit/CatsEffectAssertionsSyntaxSpec.scala → ...unit/CatsEffectAssertionsSyntaxSpec.scala
diff --git a/.../scala/munit/CatsEffectFixturesSpec.scala → .../scala/munit/CatsEffectFixturesSpec.scala b/.../scala/munit/CatsEffectFixturesSpec.scala → .../scala/munit/CatsEffectFixturesSpec.scala
diff --git a/...ala/munit/CatsEffectFunFixturesSpec.scala → ...ala/munit/CatsEffectFunFixturesSpec.scala b/...ala/munit/CatsEffectFunFixturesSpec.scala → ...ala/munit/CatsEffectFunFixturesSpec.scala
diff --git a/...est/scala/munit/CatsEffectSuiteSpec.scala → ...est/scala/munit/CatsEffectSuiteSpec.scala b/...est/scala/munit/CatsEffectSuiteSpec.scala → ...est/scala/munit/CatsEffectSuiteSpec.scala
diff --git a/...d/src/test/scala/munit/ExampleSuite.scala → ...d/src/test/scala/munit/ExampleSuite.scala b/...d/src/test/scala/munit/ExampleSuite.scala → ...d/src/test/scala/munit/ExampleSuite.scala