Merge branch 'main' into add-java-25

Philippus · web-flow · commit bf1789c4e05c · 2025-10-15T12:03:01.000+02:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
       fail-fast: false
       matrix:
         java: [8, 11, 17, 21, 25]
-        scala: [2.13.16]
+        scala: [2.13.17]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
diff --git a/build.sbt b/build.sbt
@@ -1,4 +1,4 @@
-ThisBuild / scalaVersion := "2.13.16"
+ThisBuild / scalaVersion := "2.13.17"
 
 lazy val root = project.in(file("."))
   .aggregate(scalaLibraryNextJVM, scalaLibraryNextJS)
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.11.6
+sbt.version=1.11.7

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-ThisBuild / scalaVersion := "2.13.16"`
	`1`	`+ThisBuild / scalaVersion := "2.13.17"`
`2`	`2`
`3`	`3`	`lazy val root = project.in(file("."))`
`4`	`4`	`.aggregate(scalaLibraryNextJVM, scalaLibraryNextJS)`