diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 325176e42..e0f6f4c71 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.12.19, 2.13.11] - java: [adopt@1.8] + java: [temurin@8] platform: [jvm, js, native] runs-on: ${{ matrix.os }} steps: @@ -34,10 +34,12 @@ jobs: with: fetch-depth: 0 - - name: Setup Java and Scala - uses: olafurpg/setup-scala@v13 + - name: Setup Java (temurin@8) + if: matrix.java == 'temurin@8' + uses: actions/setup-java@v2 with: - java-version: ${{ matrix.java }} + distribution: temurin + java-version: 8 - name: Cache sbt uses: actions/cache@v2 @@ -76,7 +78,7 @@ jobs: matrix: os: [ubuntu-latest] scala: [2.13.11] - java: [adopt@1.8] + java: [temurin@8] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) @@ -84,10 +86,12 @@ jobs: with: fetch-depth: 0 - - name: Setup Java and Scala - uses: olafurpg/setup-scala@v13 + - name: Setup Java (temurin@8) + if: matrix.java == 'temurin@8' + uses: actions/setup-java@v2 with: - java-version: ${{ matrix.java }} + distribution: temurin + java-version: 8 - name: Cache sbt uses: actions/cache@v2 diff --git a/build.sbt b/build.sbt index cb898b05d..5dd1f3fba 100644 --- a/build.sbt +++ b/build.sbt @@ -16,7 +16,7 @@ ThisBuild / mimaFailOnNoPrevious := false // GHA configuration ThisBuild / githubWorkflowBuildPreamble := Seq(WorkflowStep.Run(List("sudo apt install clang libunwind-dev libgc-dev libre2-dev"))) -ThisBuild / githubWorkflowJavaVersions := Seq("adopt@1.8") +ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("8")) ThisBuild / githubWorkflowBuildMatrixAdditions += "platform" -> List("jvm", "js", "native") ThisBuild / githubWorkflowArtifactUpload := false ThisBuild / githubWorkflowBuildMatrixFailFast := Some(false) diff --git a/project/plugins.sbt b/project/plugins.sbt index 471481c8f..51e0daf6f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -10,4 +10,4 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1. addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.1") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2") addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2") -addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.13.0") +addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.14.2")