diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6ad1f55..1933600 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: os: [macos-latest, ubuntu-latest] - java: [8, 11, 17] + java: [11, 17, 21] distribution: [temurin] runs-on: ${{ matrix.os }} steps: @@ -26,7 +26,15 @@ jobs: with: distribution: ${{ matrix.distribution }} java-version: ${{ matrix.java }} + + - run: brew install sbt + if: ${{ matrix.os == 'macos-latest' }} + + - run: python3 -m pip install --break-system-packages meson ninja + if: ${{ matrix.os == 'macos-latest' }} + - run: python3 -m pip install meson ninja + if: ${{ matrix.os == 'ubuntu-latest' }} - name: Check formatting run: sbt scalafmtCheckAll @@ -41,7 +49,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - java: [8] + java: [11] distribution: [temurin] runs-on: ${{ matrix.os }} steps: diff --git a/build.sbt b/build.sbt index 7a08205..cfa776d 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ import scala.sys.process._ -val scalaVersions = Seq("3.4.1", "2.13.13", "2.12.19", "2.11.12") +val scalaVersions = Seq("3.4.1", "2.13.14", "2.12.19", "2.11.12") val macrosParadiseVersion = "2.1.1" ThisBuild / versionScheme := Some("semver-spec") diff --git a/plugin/src/sbt-test/sbt-jni/overloads/project/ScriptedHelper.scala b/plugin/src/sbt-test/sbt-jni/overloads/project/ScriptedHelper.scala index b169fda..9c0dcc3 100644 --- a/plugin/src/sbt-test/sbt-jni/overloads/project/ScriptedHelper.scala +++ b/plugin/src/sbt-test/sbt-jni/overloads/project/ScriptedHelper.scala @@ -8,7 +8,7 @@ object ScriptedHelper extends AutoPlugin { override def projectSettings = Seq( scalacOptions ++= Seq("-feature", "-deprecation"), - crossScalaVersions := Seq("2.13.13", "2.12.14"), + crossScalaVersions := Seq("2.13.14", "2.12.19"), scalaVersion := crossScalaVersions.value.head ) diff --git a/plugin/src/sbt-test/sbt-jni/overloads/project/build.properties b/plugin/src/sbt-test/sbt-jni/overloads/project/build.properties deleted file mode 100644 index 04267b1..0000000 --- a/plugin/src/sbt-test/sbt-jni/overloads/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=1.9.9 diff --git a/plugin/src/sbt-test/sbt-jni/overloads/project/build.properties b/plugin/src/sbt-test/sbt-jni/overloads/project/build.properties new file mode 120000 index 0000000..4f1a8ba --- /dev/null +++ b/plugin/src/sbt-test/sbt-jni/overloads/project/build.properties @@ -0,0 +1 @@ +../../simple/project/build.properties \ No newline at end of file diff --git a/plugin/src/sbt-test/sbt-jni/simple-cargo/project/ScriptedHelper.scala b/plugin/src/sbt-test/sbt-jni/simple-cargo/project/ScriptedHelper.scala index 6f38d0e..9c0dcc3 100644 --- a/plugin/src/sbt-test/sbt-jni/simple-cargo/project/ScriptedHelper.scala +++ b/plugin/src/sbt-test/sbt-jni/simple-cargo/project/ScriptedHelper.scala @@ -8,7 +8,7 @@ object ScriptedHelper extends AutoPlugin { override def projectSettings = Seq( scalacOptions ++= Seq("-feature", "-deprecation"), - crossScalaVersions := Seq("2.13.13", "2.12.19"), + crossScalaVersions := Seq("2.13.14", "2.12.19"), scalaVersion := crossScalaVersions.value.head ) diff --git a/plugin/src/sbt-test/sbt-jni/simple-cargo/project/build.properties b/plugin/src/sbt-test/sbt-jni/simple-cargo/project/build.properties deleted file mode 100644 index 04267b1..0000000 --- a/plugin/src/sbt-test/sbt-jni/simple-cargo/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=1.9.9 diff --git a/plugin/src/sbt-test/sbt-jni/simple-cargo/project/build.properties b/plugin/src/sbt-test/sbt-jni/simple-cargo/project/build.properties new file mode 120000 index 0000000..4f1a8ba --- /dev/null +++ b/plugin/src/sbt-test/sbt-jni/simple-cargo/project/build.properties @@ -0,0 +1 @@ +../../simple/project/build.properties \ No newline at end of file diff --git a/plugin/src/sbt-test/sbt-jni/simple-meson/project/ScriptedHelper.scala b/plugin/src/sbt-test/sbt-jni/simple-meson/project/ScriptedHelper.scala index 6f38d0e..9c0dcc3 100644 --- a/plugin/src/sbt-test/sbt-jni/simple-meson/project/ScriptedHelper.scala +++ b/plugin/src/sbt-test/sbt-jni/simple-meson/project/ScriptedHelper.scala @@ -8,7 +8,7 @@ object ScriptedHelper extends AutoPlugin { override def projectSettings = Seq( scalacOptions ++= Seq("-feature", "-deprecation"), - crossScalaVersions := Seq("2.13.13", "2.12.19"), + crossScalaVersions := Seq("2.13.14", "2.12.19"), scalaVersion := crossScalaVersions.value.head ) diff --git a/plugin/src/sbt-test/sbt-jni/simple-meson/project/build.properties b/plugin/src/sbt-test/sbt-jni/simple-meson/project/build.properties deleted file mode 100644 index 46e43a9..0000000 --- a/plugin/src/sbt-test/sbt-jni/simple-meson/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=1.8.2 diff --git a/plugin/src/sbt-test/sbt-jni/simple-meson/project/build.properties b/plugin/src/sbt-test/sbt-jni/simple-meson/project/build.properties new file mode 120000 index 0000000..4f1a8ba --- /dev/null +++ b/plugin/src/sbt-test/sbt-jni/simple-meson/project/build.properties @@ -0,0 +1 @@ +../../simple/project/build.properties \ No newline at end of file diff --git a/plugin/src/sbt-test/sbt-jni/simple-syntax/project/ScriptedHelper.scala b/plugin/src/sbt-test/sbt-jni/simple-syntax/project/ScriptedHelper.scala index 00c4d8f..f20fd5d 100644 --- a/plugin/src/sbt-test/sbt-jni/simple-syntax/project/ScriptedHelper.scala +++ b/plugin/src/sbt-test/sbt-jni/simple-syntax/project/ScriptedHelper.scala @@ -8,7 +8,7 @@ object ScriptedHelper extends AutoPlugin { override def projectSettings = Seq( scalacOptions ++= Seq("-feature", "-deprecation"), - crossScalaVersions := Seq("3.4.1", "2.13.13", "2.12.19"), + crossScalaVersions := Seq("3.4.1", "2.13.14", "2.12.19"), scalaVersion := crossScalaVersions.value.head ) diff --git a/plugin/src/sbt-test/sbt-jni/simple-syntax/project/build.properties b/plugin/src/sbt-test/sbt-jni/simple-syntax/project/build.properties deleted file mode 100644 index 04267b1..0000000 --- a/plugin/src/sbt-test/sbt-jni/simple-syntax/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=1.9.9 diff --git a/plugin/src/sbt-test/sbt-jni/simple-syntax/project/build.properties b/plugin/src/sbt-test/sbt-jni/simple-syntax/project/build.properties new file mode 120000 index 0000000..4f1a8ba --- /dev/null +++ b/plugin/src/sbt-test/sbt-jni/simple-syntax/project/build.properties @@ -0,0 +1 @@ +../../simple/project/build.properties \ No newline at end of file diff --git a/plugin/src/sbt-test/sbt-jni/simple/project/ScriptedHelper.scala b/plugin/src/sbt-test/sbt-jni/simple/project/ScriptedHelper.scala index 6f38d0e..9c0dcc3 100644 --- a/plugin/src/sbt-test/sbt-jni/simple/project/ScriptedHelper.scala +++ b/plugin/src/sbt-test/sbt-jni/simple/project/ScriptedHelper.scala @@ -8,7 +8,7 @@ object ScriptedHelper extends AutoPlugin { override def projectSettings = Seq( scalacOptions ++= Seq("-feature", "-deprecation"), - crossScalaVersions := Seq("2.13.13", "2.12.19"), + crossScalaVersions := Seq("2.13.14", "2.12.19"), scalaVersion := crossScalaVersions.value.head ) diff --git a/plugin/src/sbt-test/sbt-jni/simple/project/build.properties b/plugin/src/sbt-test/sbt-jni/simple/project/build.properties index 04267b1..081fdbb 100644 --- a/plugin/src/sbt-test/sbt-jni/simple/project/build.properties +++ b/plugin/src/sbt-test/sbt-jni/simple/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.9 +sbt.version=1.10.0 diff --git a/project/build.properties b/project/build.properties index 04267b1..081fdbb 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.9 +sbt.version=1.10.0