Update to munit 1.0.0-M4

typelevel · May 16, 2022 · 51628a2 · 51628a2
1 parent 1a44757
commit 51628a2
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 25 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,7 +28,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.12.15, 2.13.6, 3.0.2]
+        scala: [2.12.15, 2.13.6, 3.1.2]
         java: [temurin@8]
         project: [rootJS, rootJVM, rootNative]
     runs-on: ${{ matrix.os }}
@@ -211,32 +211,32 @@ jobs:
           tar xf targets.tar
           rm targets.tar
 
-      - 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
 
-      - name: Download target directories (3.0.2, rootNative)
+      - name: Download target directories (3.1.2, rootNative)
         uses: actions/download-artifact@v2
         with:
-          name: target-${{ matrix.os }}-${{ matrix.java }}-3.0.2-rootNative
+          name: target-${{ matrix.os }}-${{ matrix.java }}-3.1.2-rootNative
 
-      - name: Inflate target directories (3.0.2, rootNative)
+      - name: Inflate target directories (3.1.2, rootNative)
         run: |
           tar xf targets.tar
           rm targets.tar

diff --git a/build.sbt b/build.sbt
@@ -1,19 +1,18 @@
-val mUnit      = "0.7.29"
-val discipline = "1.1.5"
+val mUnit      = "1.0.0-M4"
+val discipline = "1.5.1"
 
 Global / onChangedBuildSource := ReloadOnSourceChanges
 
 inThisBuild(
   List(
-    tlBaseVersion       := "1.0",
-    scalaVersion        := "2.13.6",
-    crossScalaVersions  := Seq("2.12.15", "2.13.6", "3.0.2"),
-    tlVersionIntroduced := Map("3" -> "1.0.9"),
-    licenses            := List(
+    tlBaseVersion      := "2.0",
+    scalaVersion       := "2.13.6",
+    crossScalaVersions := Seq("2.12.15", "2.13.6", "3.1.2"),
+    licenses           := List(
       "BSD-3-Clause" -> url("http://opensource.org/licenses/BSD-3-Clause")
     ),
-    startYear           := Some(2020),
-    developers          := List(
+    startYear          := Some(2020),
+    developers         := List(
       Developer(
         "rpiaggio",
         "Raúl Piaggio",
@@ -36,7 +35,3 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform)
       "org.typelevel" %%% "discipline-core"  % discipline
     )
   )
-  .nativeSettings(
-    tlVersionIntroduced ++= List("2.12", "2.13").map(_ -> "1.0.5").toMap,
-    crossScalaVersions := (ThisBuild / crossScalaVersions).value.filter(_.startsWith("2."))
-  )
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,6 +1,6 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.8.0")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.10.0")
 
-addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.2")
+addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.4")
 
 addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.2.0")