Skip to content

Commit a3dd3a8

Browse files
authored
Merge pull request #67 from mkurz/upgrades
Upgrade dependencies
2 parents e825efb + 680e9d8 commit a3dd3a8

6 files changed

Lines changed: 12 additions & 12 deletions

File tree

.github/workflows/build-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ jobs:
1717
name: Tests
1818
uses: playframework/.github/.github/workflows/cmd.yml@v3
1919
with:
20-
java: 25, 21, 17, 11, 8
21-
scala: 2.12.21, 3.7.4
20+
java: 25, 21, 17
21+
scala: 2.12.21, 3.8.2
2222
cmd: |
2323
sbt ++$MATRIX_SCALA test scripted
2424

.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
publish-artifacts:
11-
name: JDK 8
11+
name: JDK 17
1212
runs-on: ubuntu-24.04
1313
if: ${{ github.repository_owner == 'sbt' }}
1414
steps:
@@ -25,7 +25,7 @@ jobs:
2525
- name: Install Adoptium Temurin OpenJDK
2626
uses: coursier/setup-action@v1
2727
with:
28-
jvm: adoptium:8
28+
jvm: adoptium:17
2929

3030
- name: Install sbt
3131
uses: sbt/setup-sbt@v1

build.sbt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
lazy val scala212 = "2.12.21"
2-
lazy val scala3 = "3.7.4"
2+
lazy val scala3 = "3.8.2"
33
ThisBuild / crossScalaVersions := Seq(scala212, scala3)
44

55
lazy val `sbt-coffeescript` = project in file(".")
@@ -13,8 +13,8 @@ developers += Developer(
1313
url("https://github.com/playframework")
1414
)
1515

16-
addSbtJsEngine("1.4.0-M1")
17-
addSbtWeb("1.6.0-M1")
16+
addSbtJsEngine("1.4.0-M2")
17+
addSbtWeb("1.6.0-M2")
1818

1919
libraryDependencies ++= Seq(
2020
"org.webjars.npm" % "node-require-fallback" % "1.0.0",
@@ -34,8 +34,8 @@ Global / onLoad := (Global / onLoad).value.andThen { s =>
3434

3535
ThisBuild / (pluginCrossBuild / sbtVersion) := {
3636
scalaBinaryVersion.value match {
37-
case "2.12" => "1.12.0"
38-
case _ => "2.0.0-RC8"
37+
case "2.12" => "1.12.4"
38+
case _ => "2.0.0-RC9"
3939
}
4040
}
4141

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.12.1
1+
sbt.version=1.12.4

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
addSbtPlugin("com.github.sbt" % "sbt-web-build-base" % "2.1.0-M1")
1+
addSbtPlugin("com.github.sbt" % "sbt-web-build-base" % "2.1.0-M2")
22

33
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.2")
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.12.1
1+
sbt.version=1.12.4

0 commit comments

Comments
 (0)