Merge pull request #88 from eed3si9n/wip/bump

ci: Fix publishing

Author: gemelen

.github/workflows/ci.yml

@@ -4,7 +4,7 @@ on:
   pull_request:
   push:
     branches: [main]
-    tags: ['*']
+    tags: ['**']
 
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -14,27 +14,31 @@ jobs:
     name: Build and Test
     strategy:
       matrix:
-        os: [ubuntu-latest]
-        java: ['temurin:8', 'temurin:21']
+        include:
+          - os: ubuntu-latest
+            java: 8
+            distribution: zulu
+          - os: ubuntu-latest
+            java: 21
+            distribution: temurin
     runs-on: ${{ matrix.os }}
     env:
       # define Java options for both official sbt and sbt-extras
-      JAVA_OPTS: -Dfile.encoding=UTF-8
-      JVM_OPTS:  -Dfile.encoding=UTF-8
-      ADDITIONAL_JVM_OPTS: -Djava.security.manager=allow
+      JAVA_OPTS: -Dfile.encoding=UTF-8 -Djava.security.manager=allow
+      JVM_OPTS:  -Dfile.encoding=UTF-8 -Djava.security.manager=allow
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
-      - name: Setup cache
-        uses: coursier/cache-action@v6
-      - name: Setup jdk and sbt
-        uses: coursier/setup-action@v1
+        uses: actions/checkout@v5
+      - name: Setup JDK
+        uses: actions/setup-java@v5
         with:
-          jvm: ${{ matrix.java }}
-          apps: sbt
+          distribution: "${{ matrix.distribution }}"
+          java-version: "${{ matrix.java }}"
+          cache: sbt
+      - uses: sbt/setup-sbt@v1
       - name: Test
         shell: bash
-        run: sbt -v clean test scripted
+        run: sbt -v clean +test +scripted
       - name: Ensure formatting
         shell: bash
         run: sbt -v clean scalafmtSbtCheck scalafmtCheckAll

.github/workflows/release.yml

@@ -3,7 +3,7 @@ on:
   push:
     branches:
       - main
-    tags: ['*']
+    tags: ['**']
 jobs:
   publish:
     runs-on: ubuntu-latest
@@ -13,16 +13,16 @@ jobs:
       JVM_OPTS:  -Dfile.encoding=UTF-8
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
-      - name: Setup cache
-        uses: coursier/cache-action@v6
-      - name: Setup jdk and sbt
-        uses: coursier/setup-action@v1
+      - name: Setup JDK
+        uses: actions/setup-java@v5
         with:
-          jvm: 'temurin:8'
-          apps: sbt
+          distribution: "zulu"
+          java-version: "8"
+          cache: sbt
+      - uses: sbt/setup-sbt@v1
       - name: Release
         run: sbt ci-release
         env:

build.sbt

@@ -3,7 +3,7 @@ val mvnResolverVersion = "1.9.18"
 val scala212 = "2.12.20"
 
 ThisBuild / organization := "com.github.sbt"
-ThisBuild / licenses := Seq("Apache-2.0" -> url("http://opensource.org/licenses/Apache-2.0"))
+ThisBuild / licenses := Seq(License.Apache2)
 ThisBuild / developers := List(Developer("", "", "", url("https://github.com/sbt/sbt-pom-reader/graphs/contributors")))
 ThisBuild / homepage := Some(url("https://github.com/sbt/sbt-pom-reader"))
 ThisBuild / dynverSonatypeSnapshots := true
@@ -19,7 +19,7 @@ lazy val root = (project in file("."))
   .enablePlugins(SbtPlugin)
   .settings(nocomma {
     name := "sbt-pom-reader"
-    scalacOptions := Seq(
+    scalacOptions ++= Seq(
       "-Wconf:any:wv",
       "-Xlint:unused",
       "-Xlint:deprecation"
@@ -46,5 +46,16 @@ lazy val root = (project in file("."))
     scriptedLaunchOpts := scriptedLaunchOpts.value ++ Seq("-Dproject.version=" + version.value)
     scriptedLaunchOpts ++= Seq("-Dplugin.version=" + version.value)
     scriptedBufferLog := true
-    scriptedSbt := "1.9.9"
+    (pluginCrossBuild / sbtVersion) := {
+      scalaBinaryVersion.value match {
+        case "2.12" => "1.9.9"
+        case _      => "2.0.0-RC5"
+      }
+    }
+    scriptedSbt := {
+      scalaBinaryVersion.value match {
+        case "2.12" => "1.11.6"
+        case _      => (pluginCrossBuild / sbtVersion).value
+      }
+    }
   })

project/build.properties

@@ -1 +1 @@
-sbt.version=1.10.9
+sbt.version=1.11.6

project/plugins.sbt

@@ -1,3 +1,3 @@
 addSbtPlugin("com.eed3si9n" % "sbt-nocomma" % "0.1.2")
-addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.2")
+addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.2")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4")