Merge pull request #70 from mkurz/sbt2cross-update

Update sbt 2 cross build settings

Author: mkurz

.github/scala-steward.conf

@@ -7,11 +7,6 @@ pullRequests.grouping = [
 ]
 
 updates.pin = [
-  // sbt-coffeescript is a sbt plugin and sbt plugins use Scala 2.12
-  { groupId = "org.scala-lang", artifactId = "scala-compiler", version = "2.12." },
-  { groupId = "org.scala-lang", artifactId = "scala-library",  version = "2.12." },
-  { groupId = "org.scala-lang", artifactId = "scala-reflect",  version = "2.12." },
-  { groupId = "org.scala-lang", artifactId = "scalap",         version = "2.12." }
 ]
 
 updatePullRequests = never

.github/workflows/build-test.yml

@@ -17,8 +17,10 @@ jobs:
     name: Tests
     uses: playframework/.github/.github/workflows/cmd.yml@v3
     with:
-      java: 25, 21, 17
-      scala: 2.12.21, 3.8.2
+      java: 25, 17, 11, 8
+      scala: 2.12.x, 3.x
+      # Scala 3 build is only supported on Java 17 in this workflow.
+      exclude: '[{"java": "8", "scala": "3.x"}, {"java": "11", "scala": "3.x"}]'
       cmd: |
         sbt ++$MATRIX_SCALA test scripted
 

build.sbt

@@ -13,8 +13,8 @@ developers += Developer(
   url("https://github.com/playframework")
 )
 
-addSbtJsEngine("1.4.0-M2")
-addSbtWeb("1.6.0-M2")
+addSbtJsEngine("1.4.0-M4")
+addSbtWeb("1.6.0-M4")
 
 libraryDependencies ++= Seq(
   "org.webjars.npm" % "node-require-fallback" % "1.0.0",
@@ -34,14 +34,14 @@ Global / onLoad := (Global / onLoad).value.andThen { s =>
 
 ThisBuild / (pluginCrossBuild / sbtVersion) := {
   scalaBinaryVersion.value match {
-    case "2.12" => "1.12.4"
-    case _      => "2.0.0-RC9"
+    case "2.12" => "1.12.9"
+    case _      => "2.0.0-RC11"
   }
 }
 
 scalacOptions := {
   CrossVersion.partialVersion(scalaVersion.value) match {
-    case Some((2, _)) => Seq("-Xsource:3")
+    case Some((2, _)) => Seq("-Xsource:3", "-release:8")
     case _            => Seq.empty
   }
 }

project/build.properties

@@ -1 +1 @@
-sbt.version=1.12.8
+sbt.version=1.12.9

project/plugins.sbt

@@ -1,3 +1,3 @@
-addSbtPlugin("com.github.sbt" % "sbt-web-build-base" % "2.1.0-M2")
+addSbtPlugin("com.github.sbt" % "sbt-web-build-base" % "2.1.0-M3")
 
 addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.2")

src/main/scala/com/typesafe/sbt/coffeescript/SbtCoffeeScript.scala

@@ -10,6 +10,7 @@ import sbt.Keys._
 object Import {
 
   object CoffeeScriptKeys {
+    @transient
     val coffeescript = TaskKey[Seq[File]]("coffeescript", "Invoke the CoffeeScript compiler.")
 
     val bare = SettingKey[Boolean]("coffeescript-bare", "Compiles JavaScript that isn't wrapped in a function.")