build(deps): update scala-library from 2.13.11 to 2.13.12 (#250)

--------- Co-authored-by: Hugo van Rijswijk <[email protected]>
stryker-mutator · Dec 7, 2023 · 15b77a4 · 15b77a4
1 parent eff9052
commit 15b77a4
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -19,7 +19,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
           cache: 'sbt'
       - name: Compile docs
         run: sbt "docs/mdoc"

diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml
@@ -3,7 +3,9 @@ name: Scala CI
 on:
   workflow_dispatch:
   push:
+    branches: [main]
   pull_request:
+    types: [synchronize, opened, reopened]
 
 jobs:
   build:
@@ -19,7 +21,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
           cache: 'sbt'
       - name: Compile code
         run: sbt "compile; docs3/mdoc --check"
@@ -32,7 +34,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
           cache: 'sbt'
       - name: Check formatting
         run: sbt scalafmtCheckAll
@@ -50,7 +52,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
           cache: 'sbt'
       - name: Test
         run: sbt test
@@ -63,11 +65,11 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
           cache: 'sbt'
       - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
           cache: 'npm'
           cache-dependency-path: node/package-lock.json
       - name: Generate JS
@@ -87,7 +89,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
           cache: 'sbt'
       - name: Run stryker
         run: sbt 'project WeaponRegeX; stryker'
@@ -112,7 +114,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
           cache: 'sbt'
       - run: git fetch --tags
       - name: Set NPM Env

diff --git a/build.sbt b/build.sbt
@@ -1,12 +1,12 @@
 import org.scalajs.linker.interface.{ESFeatures, ESVersion}
-import org.typelevel.scalacoptions.{ScalacOption, ScalacOptions}
+import org.typelevel.scalacoptions.{ScalaVersion, ScalacOption, ScalacOptions}
 import org.typelevel.sbt.tpolecat.DevMode
 
 // Skip publish root
 publish / skip := true
 
 val Scala212 = "2.12.18"
-val Scala213 = "2.13.11"
+val Scala213 = "2.13.12"
 val Scala3 = "3.3.1"
 
 inThisBuild(
@@ -49,7 +49,11 @@ lazy val WeaponRegeX = projectMatrix
     name := "weapon-regex",
     libraryDependencies += "com.lihaoyi" %%% "fastparse" % "3.0.2",
     libraryDependencies += "org.scalameta" %%% "munit" % "0.7.29" % Test,
-    tpolecatScalacOptions ++= Set(ScalacOptions.source3, ScalacOptions.release("8")),
+    tpolecatScalacOptions ++= Set(
+      ScalacOptions.source3,
+      ScalacOptions.release("8"),
+      ScalacOptions.other("-Wconf:cat=scala3-migration:s", _.isBetween(ScalaVersion.V2_12_2, ScalaVersion.V3_0_0))
+    ),
     tpolecatExcludeOptions ++= Set(ScalacOptions.warnNonUnitStatement, ScalacOptions.warnUnusedNoWarn)
   )
   .jvmPlatform(