Skip to content

Commit 8cf53fd

Browse files
satabinsatabin
authored
Merge pull request #463 from majk-p/update/scala-native-0.5.x
Update libs for Scala Native 0.5.x
2 parents 1688b33 + be2e502 commit 8cf53fd

File tree

3 files changed

+41
-33
lines changed

3 files changed

+41
-33
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
matrix:
3030
os: [ubuntu-22.04]
3131
scala: [2.12, 2.13, 3]
32-
java: [temurin@11]
32+
java: [temurin@17]
3333
project: [diffsonJVM, diffsonJS, diffsonNative]
3434
runs-on: ${{ matrix.os }}
3535
timeout-minutes: 60
@@ -42,24 +42,24 @@ jobs:
4242
- name: Setup sbt
4343
uses: sbt/setup-sbt@v1
4444

45-
- name: Setup Java (temurin@11)
46-
id: setup-java-temurin-11
47-
if: matrix.java == 'temurin@11'
45+
- name: Setup Java (temurin@17)
46+
id: setup-java-temurin-17
47+
if: matrix.java == 'temurin@17'
4848
uses: actions/setup-java@v4
4949
with:
5050
distribution: temurin
51-
java-version: 11
51+
java-version: 17
5252
cache: sbt
5353

5454
- name: sbt update
55-
if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false'
55+
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
5656
run: sbt +update
5757

5858
- name: Check that workflows are up to date
5959
run: sbt githubWorkflowCheck
6060

6161
- name: Check headers and formatting
62-
if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-22.04'
62+
if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-22.04'
6363
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck
6464

6565
- name: scalaJSLink
@@ -74,11 +74,11 @@ jobs:
7474
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test
7575

7676
- name: Check binary compatibility
77-
if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-22.04'
77+
if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-22.04'
7878
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' mimaReportBinaryIssues
7979

8080
- name: Generate API documentation
81-
if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-22.04'
81+
if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-22.04'
8282
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' doc
8383

8484
- name: Make target directories
@@ -103,7 +103,7 @@ jobs:
103103
strategy:
104104
matrix:
105105
os: [ubuntu-22.04]
106-
java: [temurin@11]
106+
java: [temurin@17]
107107
runs-on: ${{ matrix.os }}
108108
steps:
109109
- name: Checkout current branch (full)
@@ -114,17 +114,17 @@ jobs:
114114
- name: Setup sbt
115115
uses: sbt/setup-sbt@v1
116116

117-
- name: Setup Java (temurin@11)
118-
id: setup-java-temurin-11
119-
if: matrix.java == 'temurin@11'
117+
- name: Setup Java (temurin@17)
118+
id: setup-java-temurin-17
119+
if: matrix.java == 'temurin@17'
120120
uses: actions/setup-java@v4
121121
with:
122122
distribution: temurin
123-
java-version: 11
123+
java-version: 17
124124
cache: sbt
125125

126126
- name: sbt update
127-
if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false'
127+
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
128128
run: sbt +update
129129

130130
- name: Download target directories (2.12, diffsonJVM)
@@ -247,7 +247,7 @@ jobs:
247247
strategy:
248248
matrix:
249249
os: [ubuntu-22.04]
250-
java: [temurin@11]
250+
java: [temurin@17]
251251
runs-on: ${{ matrix.os }}
252252
steps:
253253
- name: Checkout current branch (full)
@@ -258,17 +258,17 @@ jobs:
258258
- name: Setup sbt
259259
uses: sbt/setup-sbt@v1
260260

261-
- name: Setup Java (temurin@11)
262-
id: setup-java-temurin-11
263-
if: matrix.java == 'temurin@11'
261+
- name: Setup Java (temurin@17)
262+
id: setup-java-temurin-17
263+
if: matrix.java == 'temurin@17'
264264
uses: actions/setup-java@v4
265265
with:
266266
distribution: temurin
267-
java-version: 11
267+
java-version: 17
268268
cache: sbt
269269

270270
- name: sbt update
271-
if: matrix.java == 'temurin@11' && steps.setup-java-temurin-11.outputs.cache-hit == 'false'
271+
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
272272
run: sbt +update
273273

274274
- name: Submit Dependencies

‎build.sbt‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
import com.typesafe.tools.mima.core._
22

33
val scala212 = "2.12.20"
4-
val scala213 = "2.13.14"
5-
val scala3 = "3.3.3"
4+
val scala213 = "2.13.16"
5+
val scala3 = "3.3.6"
66

7-
val scalatestVersion = "3.2.18"
8-
val scalacheckVersion = "1.17.1"
7+
val scalatestVersion = "3.2.19"
8+
val scalacheckVersion = "1.18.1"
99

1010
ThisBuild / tlJdkRelease := Some(11)
1111
ThisBuild / scalaVersion := scala213
1212
ThisBuild / crossScalaVersions := Seq(elems = scala212, scala213, scala3)
1313

1414
ThisBuild / tlFatalWarnings := false
1515

16-
ThisBuild / tlBaseVersion := "4.6"
16+
ThisBuild / tlBaseVersion := "5.0"
1717

1818
ThisBuild / organization := "org.gnieh"
1919
ThisBuild / organizationName := "Diffson Project"
@@ -24,6 +24,14 @@ ThisBuild / developers := List(
2424
tlGitHubDev("ybasket", "Yannick Heiber")
2525
)
2626

27+
// use JDK 17
28+
ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("17"))
29+
30+
// Silence binary compatibility warnings for test-interface in Scala Native 0.5.x series
31+
// has to include _native suffix due to https://github.com/sbt/sbt/issues/7140
32+
ThisBuild / libraryDependencySchemes +=
33+
"org.scala-native" %% "test-interface_native0.5" % VersionScheme.Always
34+
2735
lazy val commonSettings = Seq(
2836
description := "Json diff/patch library",
2937
homepage := Some(url("https://github.com/gnieh/diffson"))
@@ -39,8 +47,8 @@ lazy val core = crossProject(JSPlatform, JVMPlatform, NativePlatform)
3947
.settings(
4048
name := "diffson-core",
4149
libraryDependencies ++= Seq(
42-
"org.scala-lang.modules" %%% "scala-collection-compat" % "2.11.0",
43-
"org.typelevel" %%% "cats-core" % "2.10.0",
50+
"org.scala-lang.modules" %%% "scala-collection-compat" % "2.13.0",
51+
"org.typelevel" %%% "cats-core" % "2.13.0",
4452
"org.scalatest" %%% "scalatest" % scalatestVersion % Test,
4553
"org.scalacheck" %%% "scalacheck" % scalacheckVersion % Test
4654
),
@@ -74,12 +82,12 @@ lazy val playJson = crossProject(JSPlatform, JVMPlatform, NativePlatform)
7482
.in(file("playJson"))
7583
.settings(commonSettings: _*)
7684
.settings(name := "diffson-play-json",
77-
libraryDependencies += "org.playframework" %%% "play-json" % "3.0.4",
85+
libraryDependencies += "org.playframework" %%% "play-json" % "3.1.0-M3",
7886
tlVersionIntroduced := Map("3" -> "4.3.0"))
7987
.nativeSettings(tlVersionIntroduced := Map("2.12" -> "4.5.0", "2.13" -> "4.5.0", "3" -> "4.5.0"))
8088
.dependsOn(core, testkit % Test)
8189

82-
val circeVersion = "0.14.8"
90+
val circeVersion = "0.14.14"
8391
lazy val circe = crossProject(JSPlatform, JVMPlatform, NativePlatform)
8492
.crossType(CrossType.Full)
8593
.in(file("circe"))
@@ -93,7 +101,7 @@ lazy val circe = crossProject(JSPlatform, JVMPlatform, NativePlatform)
93101
)
94102
.dependsOn(core, testkit % Test)
95103

96-
val ujsonVersion = "3.1.4"
104+
val ujsonVersion = "3.3.1"
97105
lazy val ujson = crossProject(JSPlatform, JVMPlatform, NativePlatform)
98106
.crossType(CrossType.Full)
99107
.in(file("ujson"))

‎project/plugins.sbt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.8.0")
2-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
3-
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")
2+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.19.0")
3+
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.8")
44
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")

0 commit comments

Comments
 (0)