From 09682322e47a2a85d7418d69af13771305493d5a Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Mon, 27 Jun 2022 15:41:26 +0200 Subject: [PATCH 1/5] Update coursier/setup-action to 1.2.0-M3 --- .github/workflows/launchers.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/launchers.yml b/.github/workflows/launchers.yml index 8a89907..f8be7e7 100644 --- a/.github/workflows/launchers.yml +++ b/.github/workflows/launchers.yml @@ -20,7 +20,7 @@ jobs: fetch-depth: 0 submodules: true - uses: coursier/cache-action@v6.3 - - uses: coursier/setup-action@v1 + - uses: coursier/setup-action@v1.2.0-M3 with: jvm: 8 - run: | @@ -61,7 +61,7 @@ jobs: fetch-depth: 0 submodules: true - uses: coursier/cache-action@v6.3 - - uses: coursier/setup-action@v1 + - uses: coursier/setup-action@v1.2.0-M3 with: jvm: 8 - run: | @@ -93,7 +93,7 @@ jobs: fetch-depth: 0 submodules: true - uses: coursier/cache-action@v6.3 - - uses: coursier/setup-action@v1 + - uses: coursier/setup-action@v1.2.0-M3 with: jvm: 8 - run: | From 80acd017060984120be21b9f7e0590844ac8b15b Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Mon, 27 Jun 2022 15:41:42 +0200 Subject: [PATCH 2/5] Use Java 17 on CI --- .github/workflows/launchers.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/launchers.yml b/.github/workflows/launchers.yml index f8be7e7..33af8d7 100644 --- a/.github/workflows/launchers.yml +++ b/.github/workflows/launchers.yml @@ -22,7 +22,7 @@ jobs: - uses: coursier/cache-action@v6.3 - uses: coursier/setup-action@v1.2.0-M3 with: - jvm: 8 + jvm: temurin:17 - run: | ./mill -i "native[$scalaJsVersion].writeNativeImageScript" generate.sh "" && \ ./generate.sh && \ @@ -63,7 +63,7 @@ jobs: - uses: coursier/cache-action@v6.3 - uses: coursier/setup-action@v1.2.0-M3 with: - jvm: 8 + jvm: temurin:17 - run: | ./mill -i "native-static[$scalaJsVersion].writeNativeImageScript" generate.sh "" && \ ./generate.sh && \ @@ -95,7 +95,7 @@ jobs: - uses: coursier/cache-action@v6.3 - uses: coursier/setup-action@v1.2.0-M3 with: - jvm: 8 + jvm: temurin:17 - run: | ./mill -i "native-mostly-static[$scalaJsVersion].writeNativeImageScript" generate.sh "" && \ ./generate.sh && \ From 6cd612641c5c4b2a2aa8e48f99917011e928c4c9 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Mon, 27 Jun 2022 15:27:40 +0200 Subject: [PATCH 3/5] Update scala-js-cli to 1.1.1-sc5 --- build.sc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sc b/build.sc index b01700e..b8462be 100644 --- a/build.sc +++ b/build.sc @@ -9,7 +9,7 @@ import mill._ import mill.scalalib._ import coursier.core.Version -def scalaJsCliVersion = "1.1.1-sc4.1" +def scalaJsCliVersion = "1.1.1-sc5" def scalaJsVersions = Seq("1.9.0", "1.10.0") class ScalaJsCliNativeImage(val scalaJsVersion0: String) extends ScalaModule with NativeImage { From 0d5900ff93cf11c74e24ec9500bb677e834235b1 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Mon, 27 Jun 2022 15:27:50 +0200 Subject: [PATCH 4/5] Add Scala.js 1.10.1 support --- .github/workflows/launchers.yml | 6 +++--- build.sc | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/launchers.yml b/.github/workflows/launchers.yml index 33af8d7..b279904 100644 --- a/.github/workflows/launchers.yml +++ b/.github/workflows/launchers.yml @@ -13,7 +13,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, windows-latest, macos-latest] - scalaJsVersion: ["1.9.0", "1.10.0"] + scalaJsVersion: ["1.9.0", "1.10.0", "1.10.1"] steps: - uses: actions/checkout@v2 with: @@ -54,7 +54,7 @@ jobs: strategy: fail-fast: false matrix: - scalaJsVersion: ["1.9.0", "1.10.0"] + scalaJsVersion: ["1.9.0", "1.10.0", "1.10.1"] steps: - uses: actions/checkout@v2 with: @@ -86,7 +86,7 @@ jobs: strategy: fail-fast: false matrix: - scalaJsVersion: ["1.9.0", "1.10.0"] + scalaJsVersion: ["1.9.0", "1.10.0", "1.10.1"] steps: - uses: actions/checkout@v2 with: diff --git a/build.sc b/build.sc index b8462be..f93f062 100644 --- a/build.sc +++ b/build.sc @@ -10,7 +10,7 @@ import mill.scalalib._ import coursier.core.Version def scalaJsCliVersion = "1.1.1-sc5" -def scalaJsVersions = Seq("1.9.0", "1.10.0") +def scalaJsVersions = Seq("1.9.0", "1.10.0", "1.10.1") class ScalaJsCliNativeImage(val scalaJsVersion0: String) extends ScalaModule with NativeImage { def scalaVersion = "2.13.8" From 3d673a4c7c67c8c8b734e2c341bd12928a878fab Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Mon, 27 Jun 2022 15:28:14 +0200 Subject: [PATCH 5/5] Update GraalVM to 22.1.0 --- build.sc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sc b/build.sc index f93f062..34d2df4 100644 --- a/build.sc +++ b/build.sc @@ -35,7 +35,7 @@ class ScalaJsCliNativeImage(val scalaJsVersion0: String) extends ScalaModule wit ) } def nativeImagePersist = System.getenv("CI") != null - def graalVmVersion = "22.0.0" + def graalVmVersion = "22.1.0" def nativeImageGraalVmJvmId = s"graalvm-java17:$graalVmVersion" def nativeImageName = "scala-js-ld" def ivyDeps = super.ivyDeps() ++ Seq(