Skip to content

Commit ebe3253

Browse files
committed
Update Scala 2 to 2.13.17
1 parent 4d21c9d commit ebe3253

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,7 @@ sbt ";dependencyUpdates; reload plugins; dependencyUpdates; reload return"
632632
### Run tests, check coverage and binary compatibility
633633

634634
```sh
635-
sbt -java-home /usr/lib/jvm/jdk-11 ++2.13.16 clean coverage jsoniter-scala-coreJVM/test jsoniter-scala-circeJVM/test jsoniter-scala-macrosJVM/test jsoniter-scala-benchmarkJVM/test coverageReport
635+
sbt -java-home /usr/lib/jvm/jdk-11 ++2.13.17 clean coverage jsoniter-scala-coreJVM/test jsoniter-scala-circeJVM/test jsoniter-scala-macrosJVM/test jsoniter-scala-benchmarkJVM/test coverageReport
636636
sbt -java-home /usr/lib/jvm/jdk-11 clean +test +mimaReportBinaryIssues
637637
```
638638

build.sbt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ lazy val commonSettings = Seq(
2020
url = url("https://twitter.com/aplokhotnyuk")
2121
)
2222
),
23-
scalaVersion := "2.13.16",
23+
scalaVersion := "2.13.17",
2424
scalacOptions ++= Seq(
2525
"-deprecation",
2626
"-encoding", "UTF-8",
@@ -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.6", "2.13.16", "2.12.20"),
171+
crossScalaVersions := Seq("3.3.6", "2.13.17", "2.12.20"),
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.6", "2.13.16", "2.12.20"),
209+
crossScalaVersions := Seq("3.3.6", "2.13.17", "2.12.20"),
210210
scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
211211
case Some((2, _)) => Seq()
212212
case _ => Seq(
@@ -267,7 +267,7 @@ lazy val `jsoniter-scala-circe` = crossProject(JVMPlatform, JSPlatform, NativePl
267267
.settings(commonSettings)
268268
.settings(publishSettings)
269269
.settings(
270-
crossScalaVersions := Seq("3.3.6", "2.13.16", "2.12.20"),
270+
crossScalaVersions := Seq("3.3.6", "2.13.17", "2.12.20"),
271271
scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
272272
case Some((2, _)) => Seq()
273273
case _ => Seq(
@@ -296,7 +296,7 @@ lazy val `jsoniter-scala-benchmark` = crossProject(JVMPlatform, JSPlatform)
296296
.settings(commonSettings)
297297
.settings(noPublishSettings)
298298
.settings(
299-
crossScalaVersions := Seq("3.7.3", "2.13.16"),
299+
crossScalaVersions := Seq("3.7.3", "2.13.17"),
300300
scalacOptions ++= (CrossVersion.partialVersion(scalaVersion.value) match {
301301
case Some((2, _)) => Seq(
302302
"-Wopt",

jsoniter-scala-benchmark/scala2-t16.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
(cd ..; sbt -java-home /usr/lib/jvm/jdk-17 ++2.13.16 clean jsoniter-scala-benchmarkJVM/assembly)
2+
(cd ..; sbt -java-home /usr/lib/jvm/jdk-17 ++2.13.17 clean jsoniter-scala-benchmarkJVM/assembly)
33
/usr/lib/jvm/graalvm-jdk-25/bin/java -jar jvm/target/scala-2.13/benchmarks.jar -jvmArgsAppend "-XX:+UseCompactObjectHeaders" -t 16 -p size=512 -prof gc -rf json -rff graalvm-jdk-25-t16.json .* 2>&1 | tee graalvm-jdk-25-t16.txt
44
/usr/lib/jvm/jdk-25/bin/java -jar jvm/target/scala-2.13/benchmarks.jar -jvmArgsAppend "-XX:+UseCompactObjectHeaders" -t 16 -p size=512 -prof gc -rf json -rff jdk-25-t16.json .* 2>&1 | tee jdk-25-t16.txt
55
/usr/lib/jvm/graalvm-community-jdk-25/bin/java -jar jvm/target/scala-2.13/benchmarks.jar -jvmArgsAppend "-XX:+UseCompactObjectHeaders" -t 16 -p size=512 -prof gc -rf json -rff graalvm-community-jdk-25-t16.json .* 2>&1 | tee graalvm-community-jdk-25-t16.txt

jsoniter-scala-benchmark/scala2-t24.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
(cd ..; sbt -java-home /usr/lib/jvm/jdk-17 ++2.13.16 clean jsoniter-scala-benchmarkJVM/assembly)
2+
(cd ..; sbt -java-home /usr/lib/jvm/jdk-17 ++2.13.17 clean jsoniter-scala-benchmarkJVM/assembly)
33
/usr/lib/jvm/graalvm-jdk-25/bin/java -jar jvm/target/scala-2.13/benchmarks.jar -jvmArgsAppend "-XX:+UseCompactObjectHeaders" -t 24 -p size=512 -prof gc -rf json -rff graalvm-jdk-25-t24.json .* 2>&1 | tee graalvm-jdk-25-t24.txt
44
/usr/lib/jvm/jdk-25/bin/java -jar jvm/target/scala-2.13/benchmarks.jar -jvmArgsAppend "-XX:+UseCompactObjectHeaders" -t 24 -p size=512 -prof gc -rf json -rff jdk-25-t24.json .* 2>&1 | tee jdk-25-t24.txt
55
/usr/lib/jvm/graalvm-community-jdk-25/bin/java -jar jvm/target/scala-2.13/benchmarks.jar -jvmArgsAppend "-XX:+UseCompactObjectHeaders" -t 24 -p size=512 -prof gc -rf json -rff graalvm-community-jdk-25-t24.json .* 2>&1 | tee graalvm-community-jdk-25-t24.txt

jsoniter-scala-benchmark/scala2-t8.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
(cd ..; sbt -java-home /usr/lib/jvm/jdk-17 ++2.13.16 clean jsoniter-scala-benchmarkJVM/assembly)
2+
(cd ..; sbt -java-home /usr/lib/jvm/jdk-17 ++2.13.17 clean jsoniter-scala-benchmarkJVM/assembly)
33
/usr/lib/jvm/graalvm-jdk-25/bin/java -jar jvm/target/scala-2.13/benchmarks.jar -jvmArgsAppend "-XX:+UseCompactObjectHeaders" -t 8 -p size=512 -prof gc -rf json -rff graalvm-jdk-25-t8.json .* 2>&1 | tee graalvm-jdk-25-t8.txt
44
/usr/lib/jvm/jdk-25/bin/java -jar jvm/target/scala-2.13/benchmarks.jar -jvmArgsAppend "-XX:+UseCompactObjectHeaders" -t 8 -p size=512 -prof gc -rf json -rff jdk-25-t8.json .* 2>&1 | tee jdk-25-t8.txt
55
/usr/lib/jvm/graalvm-community-jdk-25/bin/java -jar jvm/target/scala-2.13/benchmarks.jar -jvmArgsAppend "-XX:+UseCompactObjectHeaders" -t 8 -p size=512 -prof gc -rf json -rff graalvm-community-jdk-25-t8.json .* 2>&1 | tee graalvm-community-jdk-25-t8.txt

jsoniter-scala-benchmark/scala2.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
(cd ..; sbt -java-home /usr/lib/jvm/jdk-17 ++2.13.16 clean jsoniter-scala-benchmarkJVM/assembly)
2+
(cd ..; sbt -java-home /usr/lib/jvm/jdk-17 ++2.13.17 clean jsoniter-scala-benchmarkJVM/assembly)
33
/usr/lib/jvm/graalvm-jdk-25/bin/java -jar jvm/target/scala-2.13/benchmarks.jar -jvmArgsAppend "-XX:+UseCompactObjectHeaders" -p size=512 -prof gc -rf json -rff graalvm-jdk-25.json .* 2>&1 | tee graalvm-jdk-25.txt
44
/usr/lib/jvm/jdk-25/bin/java -jar jvm/target/scala-2.13/benchmarks.jar -jvmArgsAppend "-XX:+UseCompactObjectHeaders" -p size=512 -prof gc -rf json -rff jdk-25.json .* 2>&1 | tee jdk-25.txt
55
/usr/lib/jvm/graalvm-community-jdk-25/bin/java -jar jvm/target/scala-2.13/benchmarks.jar -jvmArgsAppend "-XX:+UseCompactObjectHeaders" -p size=512 -prof gc -rf json -rff graalvm-community-jdk-25.json .* 2>&1 | tee graalvm-community-jdk-25.txt

0 commit comments

Comments
 (0)