Skip to content

Commit

Permalink
Core deps upgrade (#699)
Browse files Browse the repository at this point in the history 
* Upgrade core dependencies to unblock native upgrade path

* Upgrade to the latest native version

* Upgrade CI

* Use only latest JDK and 8

* Bump version for mima on native path
  • Loading branch information
@gemelen
gemelen authored Sep 26, 2024
1 parent 06f57cc commit 5f7f883
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 112 deletions.
137 changes: 32 additions & 105 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,25 +29,17 @@ jobs:
matrix:
os: [ubuntu-latest]
scala: [3, 2.13, 2.12]
java: [temurin@8, temurin@11, temurin@17]
java: [temurin@8, temurin@21]
project: [rootJS, rootJVM, rootNative]
exclude:
- scala: 3
java: temurin@11
- scala: 3
java: temurin@17
- scala: 2.13
java: temurin@11
java: temurin@21
- scala: 2.13
java: temurin@17
- project: rootJS
java: temurin@11
java: temurin@21
- project: rootJS
java: temurin@17
java: temurin@21
- project: rootNative
java: temurin@11
- project: rootNative
java: temurin@17
java: temurin@21
runs-on: ${{ matrix.os }}
timeout-minutes: 60
steps:
Expand All @@ -73,30 +65,17 @@ jobs:
if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
run: sbt +update

- name: Setup Java (temurin@11)
id: setup-java-temurin-11
if: matrix.java == 'temurin@11'
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 11
cache: sbt

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

- name: Setup Java (temurin@17)
id: setup-java-temurin-17
if: matrix.java == 'temurin@17'
- name: Setup Java (temurin@21)
id: setup-java-temurin-21
if: matrix.java == 'temurin@21'
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 17
java-version: 21
cache: sbt

- name: sbt update
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
if: matrix.java == 'temurin@21' && steps.setup-java-temurin-21.outputs.cache-hit == 'false'
run: sbt +update

- name: Check that workflows are up to date
Expand Down Expand Up @@ -172,30 +151,17 @@ jobs:
if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
run: sbt +update

- name: Setup Java (temurin@11)
id: setup-java-temurin-11
if: matrix.java == 'temurin@11'
- name: Setup Java (temurin@21)
id: setup-java-temurin-21
if: matrix.java == 'temurin@21'
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 11
java-version: 21
cache: sbt

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

- name: Setup Java (temurin@17)
id: setup-java-temurin-17
if: matrix.java == 'temurin@17'
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 17
cache: sbt

- name: sbt update
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
if: matrix.java == 'temurin@21' && steps.setup-java-temurin-21.outputs.cache-hit == 'false'
run: sbt +update

- name: Download target directories (3, rootJS)
Expand Down Expand Up @@ -343,36 +309,23 @@ jobs:
if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
run: sbt +update

- name: Setup Java (temurin@11)
id: setup-java-temurin-11
if: matrix.java == 'temurin@11'
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 11
cache: sbt

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

- name: Setup Java (temurin@17)
id: setup-java-temurin-17
if: matrix.java == 'temurin@17'
- name: Setup Java (temurin@21)
id: setup-java-temurin-21
if: matrix.java == 'temurin@21'
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 17
java-version: 21
cache: sbt

- name: sbt update
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
if: matrix.java == 'temurin@21' && steps.setup-java-temurin-21.outputs.cache-hit == 'false'
run: sbt +update

- name: Submit Dependencies
uses: scalacenter/sbt-dependency-submission@v2
with:
modules-ignore: rootjs_3 rootjs_2.13 rootjs_2.12 docs_3 docs_2.13 docs_2.12 cats-collections-tests_sjs1_3 cats-collections-tests_sjs1_2.13 cats-collections-tests_sjs1_2.12 rootjvm_3 rootjvm_2.13 rootjvm_2.12 rootnative_3 rootnative_2.13 rootnative_2.12 cats-collections-tests_3 cats-collections-tests_2.13 cats-collections-tests_2.12 cats-collections-tests_native0.4_3 cats-collections-tests_native0.4_2.13 cats-collections-tests_native0.4_2.12 cats-collections-bench_3 cats-collections-bench_2.13 cats-collections-bench_2.12
modules-ignore: rootjs_3 rootjs_2.13 rootjs_2.12 docs_3 docs_2.13 docs_2.12 cats-collections-tests_sjs1_3 cats-collections-tests_sjs1_2.13 cats-collections-tests_sjs1_2.12 rootjvm_3 rootjvm_2.13 rootjvm_2.12 rootnative_3 rootnative_2.13 rootnative_2.12 cats-collections-tests_3 cats-collections-tests_2.13 cats-collections-tests_2.12 cats-collections-tests_native0.5_3 cats-collections-tests_native0.5_2.13 cats-collections-tests_native0.5_2.12 cats-collections-bench_3 cats-collections-bench_2.13 cats-collections-bench_2.12
configs-ignore: test scala-tool scala-doc-tool test-internal

coverage:
Expand Down Expand Up @@ -406,30 +359,17 @@ jobs:
if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
run: sbt +update

- name: Setup Java (temurin@11)
id: setup-java-temurin-11
if: matrix.java == 'temurin@11'
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 11
cache: sbt

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

- name: Setup Java (temurin@17)
id: setup-java-temurin-17
if: matrix.java == 'temurin@17'
- name: Setup Java (temurin@21)
id: setup-java-temurin-21
if: matrix.java == 'temurin@21'
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 17
java-version: 21
cache: sbt

- name: sbt update
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
if: matrix.java == 'temurin@21' && steps.setup-java-temurin-21.outputs.cache-hit == 'false'
run: sbt +update

- name: Setup Python
Expand All @@ -449,7 +389,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
java: [temurin@11]
java: [temurin@21]
runs-on: ${{ matrix.os }}
steps:
- name: Install sbt
Expand All @@ -474,30 +414,17 @@ jobs:
if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
run: sbt +update

- name: Setup Java (temurin@11)
id: setup-java-temurin-11
if: matrix.java == 'temurin@11'
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 11
cache: sbt

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

- name: Setup Java (temurin@17)
id: setup-java-temurin-17
if: matrix.java == 'temurin@17'
- name: Setup Java (temurin@21)
id: setup-java-temurin-21
if: matrix.java == 'temurin@21'
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 17
java-version: 21
cache: sbt

- name: sbt update
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
if: matrix.java == 'temurin@21' && steps.setup-java-temurin-21.outputs.cache-hit == 'false'
run: sbt +update

- name: Generate site
Expand Down
12 changes: 6 additions & 6 deletions build.sbt
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import com.typesafe.tools.mima.core._

val catsVersion = "2.11.0"
val catsVersion = "2.12.0"
val munitVersion = "1.0.0"
val munitDisciplineVersion = "2.0.0-M3"
val scalacheckVersion = "1.17.1"
val algebraVersion = "2.11.0"
val munitDisciplineVersion = "2.0.0"
val scalacheckVersion = "1.18.1"
val algebraVersion = "2.12.0"

val Scala212 = "2.12.20"
val Scala213 = "2.13.15"
Expand All @@ -18,7 +18,7 @@ ThisBuild / tlVersionIntroduced := Map("3" -> "0.9.3")
ThisBuild / tlFatalWarnings := false
ThisBuild / tlCiReleaseBranches := Seq("master")
ThisBuild / tlSitePublishBranch := Some("master")
ThisBuild / githubWorkflowJavaVersions := Seq("8", "11", "17").map(JavaSpec.temurin)
ThisBuild / githubWorkflowJavaVersions := Seq("8", "21").map(JavaSpec.temurin)
ThisBuild / githubWorkflowAddedJobs +=
WorkflowJob(
"coverage",
Expand All @@ -43,7 +43,7 @@ lazy val commonJsSettings = Seq(

lazy val commonNativeSettings = Seq(
coverageEnabled := false,
tlVersionIntroduced ++= List("2.12", "2.13", "3").map(_ -> "0.9.4").toMap
tlVersionIntroduced ++= List("2.12", "2.13", "3").map(_ -> "0.9.9").toMap
)

lazy val core = crossProject(JSPlatform, JVMPlatform, NativePlatform)
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.1")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.17")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.5")
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
val sbtTypelevelVersion = "0.7.3"
addSbtPlugin("org.typelevel" % "sbt-typelevel" % sbtTypelevelVersion)
Expand Down

0 comments on commit 5f7f883

Please sign in to comment.