Skip to content

Commit 3b81c89

Browse files
committed
Update Scala 2.12.x to 2.12.21 + switch CI build from JDK 21 to JDK 25
1 parent 84daf1c commit 3b81c89

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
matrix:
2222
java:
2323
- 17
24-
- 21
24+
- 25
2525
os:
2626
- ubuntu-22.04-arm
2727
- ubuntu-22.04
@@ -36,6 +36,10 @@ jobs:
3636
fetch-depth: 300
3737
- name: Fetch tags
3838
run: git fetch --depth=300 origin +refs/tags/*:refs/tags/*
39+
- name: Set JVM options for JDK 25+
40+
if: matrix.java >= 25
41+
run: echo "JAVA_TOOL_OPTIONS=-XX:+UseCompactObjectHeaders" >> $GITHUB_ENV
42+
shell: bash
3943
- name: Cache SBT deps
4044
uses: coursier/cache-action@v6
4145
- name: Setup Scala with SBT

build.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ lazy val `jsoniter-scala-core` = crossProject(JVMPlatform, JSPlatform, NativePla
168168
.settings(commonSettings)
169169
.settings(publishSettings)
170170
.settings(
171-
crossScalaVersions := Seq("3.3.7", "2.13.18", "2.12.20"),
171+
crossScalaVersions := Seq("3.3.7", "2.13.18", "2.12.21"),
172172
scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
173173
case Some((2, _)) => Seq()
174174
case _ => Seq(
@@ -206,7 +206,7 @@ lazy val `jsoniter-scala-macros` = crossProject(JVMPlatform, JSPlatform, NativeP
206206
.settings(commonSettings)
207207
.settings(publishSettings)
208208
.settings(
209-
crossScalaVersions := Seq("3.3.7", "2.13.18", "2.12.20"),
209+
crossScalaVersions := Seq("3.3.7", "2.13.18", "2.12.21"),
210210
scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
211211
case Some((2, _)) => Seq()
212212
case _ => Seq(
@@ -268,7 +268,7 @@ lazy val `jsoniter-scala-circe` = crossProject(JVMPlatform, JSPlatform, NativePl
268268
.settings(commonSettings)
269269
.settings(publishSettings)
270270
.settings(
271-
crossScalaVersions := Seq("3.3.7", "2.13.18", "2.12.20"),
271+
crossScalaVersions := Seq("3.3.7", "2.13.18", "2.12.21"),
272272
scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
273273
case Some((2, _)) => Seq()
274274
case _ => Seq(

0 commit comments

Comments
 (0)