diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 120f886..39e6d57 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,17 +10,21 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04, macos-11] - java: [ '17' ] + os: [ubuntu-22.04, macos-13] + java: [ '21' ] runs-on: ${{ matrix.os }} steps: - name: Checkout current branch (full) uses: actions/checkout@v3 - name: Setup Java - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: ${{ matrix.java }} cache: 'sbt' + - name: Install common dependencies + shell: bash + if: ${{ startsWith(matrix.os, 'macos') }} + run: brew install sbt - name: Run tests (${{ matrix.os }}) Java ${{ matrix.java }} run: sbt g8Test diff --git a/project/build.properties b/project/build.properties index 7a159c4..53bb739 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.10.6 +sbt.version = 1.10.11 diff --git a/src/main/g8/build.sbt b/src/main/g8/build.sbt index 54ecc64..4a1ffc0 100644 --- a/src/main/g8/build.sbt +++ b/src/main/g8/build.sbt @@ -1,4 +1,4 @@ -scalaVersion := "3.3.3" // A Long Term Support version. +scalaVersion := "3.3.6" // A Long Term Support version. enablePlugins(ScalaNativePlugin) diff --git a/src/main/g8/project/build.properties b/src/main/g8/project/build.properties index 7a159c4..53bb739 100644 --- a/src/main/g8/project/build.properties +++ b/src/main/g8/project/build.properties @@ -1 +1 @@ -sbt.version = 1.10.6 +sbt.version = 1.10.11 diff --git a/src/main/g8/project/plugins.sbt b/src/main/g8/project/plugins.sbt index e096f76..5a84321 100644 --- a/src/main/g8/project/plugins.sbt +++ b/src/main/g8/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.1") +addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.7")