luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump CI to JDK 21

This commit is contained in:
friendseeker 2024-10-12 00:36:17 -07:00 committed by Jerry Tan
parent bfb01d8388
commit a739760426
19 changed files with 44 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/ci.yml vendored
View File

@ -13,23 +13,23 @@ jobs:
matrix:
include:
- os: ubuntu-20.04
java: 17
java: 21
distribution: temurin
jobtype: 1
- os: ubuntu-latest
java: 17
java: 21
distribution: temurin
jobtype: 2
- os: ubuntu-latest
java: 17
java: 21
distribution: temurin
jobtype: 3
- os: ubuntu-latest
java: 17
java: 21
distribution: temurin
jobtype: 4
- os: ubuntu-latest
java: 17
java: 21
distribution: temurin
jobtype: 5
- os: ubuntu-latest
@ -143,7 +143,7 @@ jobs:
if: ${{ matrix.jobtype == 5 }}
shell: bash
run: |
./sbt -v "++2.13.x; all utilControl/test utilRelation/test utilPosition/test; ++$SCALA_3!; all utilControl/test utilRelation/test utilPosition/test"
./sbt -v "++2.13.x; all utilControl/test utilRelation/test utilPosition/test"
- name: Build and test (6)
if: ${{ matrix.jobtype == 6 }}
shell: bash

6
sbt-app/src/sbt-test/actions/cross-strict-aggregation-scala-3/build.sbt
View File

@ -2,13 +2,13 @@ scalaVersion := "2.12.20"
lazy val core = project
.settings(
crossScalaVersions := Seq("2.12.20", "3.0.2", "3.1.2")
crossScalaVersions := Seq("2.12.20", "3.3.1", "3.5.1")
)
lazy val subproj = project
.dependsOn(core)
.settings(
crossScalaVersions := Seq("2.12.20", "3.1.2"),
crossScalaVersions := Seq("2.12.20", "3.5.1"),
// a random library compiled against Scala 3.1
libraryDependencies += "org.http4s" %% "http4s-core" % "0.23.12"
libraryDependencies += "org.http4s" %% "http4s-core" % "0.23.28"
)

20
sbt-app/src/sbt-test/actions/cross-strict-aggregation-scala-3/test
View File

@ -1,14 +1,14 @@
> ++3.0.2 compile
> ++3.3.1 compile
$ exists core/target/scala-3.0.2
-$ exists core/target/scala-3.1.2
-$ exists subproj/target/scala-3.0.2
-$ exists subproj/target/scala-3.1.2
$ exists core/target/scala-3.3.1
-$ exists core/target/scala-3.5.1
-$ exists subproj/target/scala-3.3.1
-$ exists subproj/target/scala-3.5.1
> clean
> ++3.1.2 compile
> ++3.5.1 compile
-$ exists core/target/scala-3.0.2
$ exists core/target/scala-3.1.2
-$ exists subproj/target/scala-3.0.2
$ exists subproj/target/scala-3.1.2
-$ exists core/target/scala-3.3.1
$ exists core/target/scala-3.5.1
-$ exists subproj/target/scala-3.3.1
$ exists subproj/target/scala-3.5.1

0
sbt-app/src/sbt-test/compiler-project/semantic-errors/test → sbt-app/src/sbt-test/compiler-project/semantic-errors/pending
View File

0
sbt-app/src/sbt-test/dependency-management/stdlib-unfreeze/test → sbt-app/src/sbt-test/dependency-management/stdlib-unfreeze/pending
View File

2
sbt-app/src/sbt-test/plugins/doc-scala3-js/build.sbt
View File

@ -1,4 +1,4 @@
val scala3Version = "3.0.1-RC1-bin-20210525-8f3fdf5-NIGHTLY"
val scala3Version = "3.3.4"
enablePlugins(ScalaJSPlugin)

2
sbt-app/src/sbt-test/plugins/doc-scala3-js/project/plugins.sbt
View File

@ -1 +1 @@
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.1")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0")

6
sbt-app/src/sbt-test/plugins/dotty-sandwich-sjs/build.sbt
View File

@ -1,15 +1,15 @@
ThisBuild / scalaVersion := "2.13.12"
ThisBuild / scalaVersion := "2.13.15"
ThisBuild / scalacOptions += "-Ytasty-reader"
lazy val scala3code = project
.enablePlugins(ScalaJSPlugin)
.settings(scalaVersion := "3.1.3")
.settings(scalaVersion := "3.3.4")
lazy val app = project
.enablePlugins(ScalaJSPlugin)
.dependsOn(scala3code)
.settings(
libraryDependencies ~= (_.filterNot(_.name.contains("scalajs-compiler"))),
addCompilerPlugin("org.scala-js" % "scalajs-compiler_2.13.8" % scalaJSVersion),
addCompilerPlugin("org.scala-js" % "scalajs-compiler_2.13.15" % scalaJSVersion),
scalaJSUseMainModuleInitializer := true,
)

2
sbt-app/src/sbt-test/plugins/dotty-sandwich-sjs/project/plugins.sbt
View File

@ -1 +1 @@
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.10.1")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0")

4
sbt-app/src/sbt-test/plugins/dotty-sandwich/build.sbt
View File

@ -1,7 +1,7 @@
ThisBuild / scalaVersion := "3.1.3"
ThisBuild / scalaVersion := "3.3.4"
ThisBuild / scalacOptions += "-Ytasty-reader"
lazy val scala213 = "2.13.12"
lazy val scala213 = "2.13.15"
lazy val root = (project in file("."))
.aggregate(fooApp, fooCore, barApp, barCore)

2
sbt-app/src/sbt-test/plugins/dotty/build.sbt
View File

@ -1 +1 @@
ThisBuild / scalaVersion := "3.1.3"
ThisBuild / scalaVersion := "3.3.4"

2
sbt-app/src/sbt-test/plugins/scala-js-macro/build.sbt
View File

@ -1,4 +1,4 @@
ThisBuild / scalaVersion := "2.13.1"
ThisBuild / scalaVersion := "2.13.15"
lazy val root = (project in file("."))
.aggregate(macroProvider, macroClient)

2
sbt-app/src/sbt-test/plugins/scala-js-macro/project/plugins.sbt
View File

@ -1 +1 @@
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0")

2
sbt-app/src/sbt-test/project/scala3-cross-target/build.sbt
View File

@ -1,3 +1,3 @@
scalaVersion := "3.0.0-RC2-bin-20210328-cca5f8f-NIGHTLY"
scalaVersion := "3.3.4"
name := "foo"
version := "1.0.0"

6
sbt-app/src/sbt-test/project/scala3-sandwich-sjs/build.sbt
View File

@ -1,15 +1,15 @@
ThisBuild / scalaVersion := "2.13.6"
ThisBuild / scalaVersion := "2.13.15"
ThisBuild / scalacOptions += "-Ytasty-reader"
lazy val scala3code = project
.enablePlugins(ScalaJSPlugin)
.settings(scalaVersion := "3.0.0")
.settings(scalaVersion := "3.3.4")
lazy val app = project
.enablePlugins(ScalaJSPlugin)
.dependsOn(scala3code)
.settings(
scalaVersion := "2.13.6",
scalaVersion := "2.13.15",
scalacOptions += "-Ytasty-reader",
scalaJSUseMainModuleInitializer := true
)

2
sbt-app/src/sbt-test/project/scala3-sandwich-sjs/project/plugins.sbt
View File

@ -1 +1 @@
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.6.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.17.0")

4
sbt-app/src/sbt-test/project/scala3-sandwich/build.sbt
View File

@ -1,6 +1,6 @@
ThisBuild / scalaVersion := "3.0.0"
ThisBuild / scalaVersion := "3.3.4"
lazy val scala213 = "2.13.6"
lazy val scala213 = "2.13.15"
lazy val root = (project in file("."))
.aggregate(fooApp, fooCore, barApp, barCore)

2
sbt-app/src/sbt-test/project/scripted13/test
View File

@ -1,6 +1,6 @@
# This tests that this sbt scripted plugin can launch the previous one
> ^^0.13.18
> ^^1.10.1
$ copy-file changes/A.scala src/sbt-test/a/b/A.scala
> scripted

18
zinc-lm-integration/src/test/scala/sbt/internal/inc/ZincComponentCompilerSpec.scala
View File

@ -16,11 +16,8 @@ class ZincComponentCompilerSpec extends IvyBridgeProviderSpecification {
val scala2106 = "2.10.6"
val scala2118 = "2.11.8"
val scala21111 = "2.11.11"
val scala2121 = "2.12.1"
val scala2122 = "2.12.2"
val scala2123 = "2.12.3"
val scala2130 = "2.13.0"
val scala2131 = "2.13.1"
val scala21220 = "2.12.20"
val scala21311 = "2.13.11"
def isJava8: Boolean = sys.props("java.specification.version") == "1.8"
@ -40,14 +37,11 @@ class ZincComponentCompilerSpec extends IvyBridgeProviderSpecification {
} else ()
}
it should "compile the bridge for Scala 2.12.2" in { implicit td =>
IO.withTemporaryDirectory(t => getCompilerBridge(t, logger, scala2121) should exist)
IO.withTemporaryDirectory(t => getCompilerBridge(t, logger, scala2122) should exist)
IO.withTemporaryDirectory(t => getCompilerBridge(t, logger, scala2123) should exist)
it should "compile the bridge for Scala 2.12.20" in { implicit td =>
IO.withTemporaryDirectory(t => getCompilerBridge(t, logger, scala21220) should exist)
}
it should "compile the bridge for Scala 2.13" in { implicit td =>
IO.withTemporaryDirectory(t => getCompilerBridge(t, logger, scala2130) should exist)
IO.withTemporaryDirectory(t => getCompilerBridge(t, logger, scala2131) should exist)
it should "compile the bridge for Scala 2.13.11" in { implicit td =>
IO.withTemporaryDirectory(t => getCompilerBridge(t, logger, scala21311) should exist)
}
}