Merge pull request #34 from mkurz/upgrades_ubuntu_24.04

Latest sbt and sbt-ci-release + Adjust release workflow

Author: mkurz

.github/workflows/release.yml

@@ -1,26 +1,47 @@
 name: Release
-on: workflow_dispatch
+
+on:
+  push:
+    branches: # Snapshots
+      - master
+    tags: ["**"] # Releases
 
 jobs:
-  release:
-    name: Release
-    runs-on: ubuntu-latest
-    env:
-      PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
-      SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
-      SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+  publish-artifacts:
+    name: JDK 8
+    runs-on: ubuntu-24.04
+    if: ${{ github.repository_owner == 'sbt' }}
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v3
         with:
+          # we don't know what commit the last tag was it's safer to get entire repo so previousStableVersion resolves
           fetch-depth: 0
-      - uses: actions/setup-java@v3
+
+      - name: Coursier Cache
+        id: coursier-cache
+        uses: coursier/cache-action@v6
+
+      - name: Install Adoptium Temurin OpenJDK
+        uses: coursier/setup-action@v1
         with:
-          distribution: temurin
-          java-version: 8.0.372+7
-          cache: sbt
-          gpg-private-key: ${{ secrets.PGP_SECRET }}
-          gpg-passphrase: PGP_PASSPHRASE
-      - run: git config user.email "[email protected]"
-      - run: git config user.name "sbt release bot"
-      - name: Push tag
-        run: sbt "release with-defaults"
+          jvm: adoptium:8
+
+      - name: Install sbt
+        uses: sbt/setup-sbt@v1
+
+      - name: Publish artifacts
+        run: sbt ci-release
+        env:
+          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+          PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
+          PGP_SECRET: ${{ secrets.PGP_SECRET }}
+
+      - name: Cleanup before cache
+        shell: bash
+        run: |
+          find $HOME/Library/Caches/Coursier/v1        -name "ivydata-*.properties" -delete || true
+          find $HOME/.ivy2/cache                       -name "ivydata-*.properties" -delete || true
+          find $HOME/.cache/coursier/v1                -name "ivydata-*.properties" -delete || true
+          find $HOME/.sbt                              -name "*.lock"               -delete || true

.github/workflows/scala.yml

@@ -19,5 +19,7 @@ jobs:
         distribution: temurin
         java-version: 8.0.372+7
         cache: sbt
+    - name: Install sbt
+      uses: sbt/setup-sbt@v1
     - name: Run tests
-      run: sbt "^ scripted"
+      run: sbt "^ scripted"

.gitignore

@@ -1,2 +1,3 @@
 target
 project/project
+.bsp/

build.sbt

@@ -3,7 +3,7 @@
  */
 
 // sbt cross build
-crossSbtVersions := Seq("1.10.2")
+crossSbtVersions := Seq("1.11.1")
 
 // dependencies
 val packagerVersion = "1.10.4"
@@ -55,7 +55,6 @@ lazy val `sbt-javaagent` = (project.in(file(".")))
   )
 
 // publish settings
-publishMavenStyle := true
 licenses += "Apache-2.0" -> url(
   "http://www.apache.org/licenses/LICENSE-2.0.html"
 )
@@ -74,21 +73,3 @@ developers := List(
     url("https://github.com/sbt/sbt-javaagent/graphs/contributors")
   )
 )
-publishTo := sonatypePublishTo.value
-
-// release settings
-import ReleaseTransformations._
-releaseProcess := Seq[ReleaseStep](
-  checkSnapshotDependencies,
-  inquireVersions,
-  runClean,
-  releaseStepCommandAndRemaining("^ scripted"),
-  setReleaseVersion,
-  commitReleaseVersion,
-  tagRelease,
-  releaseStepCommandAndRemaining("^ publishSigned"),
-  releaseStepCommand("sonatypeReleaseAll"),
-  setNextVersion,
-  commitNextVersion,
-  pushChanges
-)

project/build.properties

@@ -1 +1 @@
-sbt.version=1.10.2
+sbt.version=1.11.1

project/plugins.sbt

@@ -2,6 +2,4 @@
  * Copyright © 2016-2017 Lightbend, Inc. <http://www.lightbend.com>
  */
 
-addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0")
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3")
-addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
+addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.1")

src/sbt-test/agent/arguments/test.sbt

@@ -29,7 +29,7 @@ TaskKey[Unit]("check") := {
 
   import scala.sys.process._
   val output =
-    ((Universal / stagingDirectory).value / "bin" / packageName.value).absolutePath.!!
+    ((Universal / com.typesafe.sbt.packager.universal.UniversalPlugin.autoImport.stagingDirectory).value / "bin" / packageName.value).absolutePath.!!
 
   assert(
     !(output contains "Agent 86"),

src/sbt-test/agent/compile/test.sbt

@@ -18,7 +18,7 @@ TaskKey[Unit]("checkLog") := {
 TaskKey[Unit]("checkDist") := {
   import scala.sys.process._
   val output =
-    ((Universal / stagingDirectory).value / "bin" / packageName.value).absolutePath.!!
+    ((Universal / com.typesafe.sbt.packager.universal.UniversalPlugin.autoImport.stagingDirectory).value / "bin" / packageName.value).absolutePath.!!
   expect("dist run", output, "Agent 86")
   expect("dist run", output, "class maxwell.Maxwell")
 }

src/sbt-test/agent/dist/test.sbt

@@ -8,7 +8,7 @@ TaskKey[Unit]("check") := {
 
   import scala.sys.process._
   val output =
-    ((Universal / stagingDirectory).value / "bin" / packageName.value).absolutePath.!!
+    ((Universal / com.typesafe.sbt.packager.universal.UniversalPlugin.autoImport.stagingDirectory).value / "bin" / packageName.value).absolutePath.!!
 
   assert(
     output contains "Agent 86",

src/sbt-test/agent/dist_1.9.x/test.sbt

@@ -8,7 +8,7 @@ TaskKey[Unit]("check") := {
 
   import scala.sys.process._
   val output =
-    ((Universal / stagingDirectory).value / "bin" / packageName.value).absolutePath.!!
+    ((Universal / com.typesafe.sbt.packager.universal.UniversalPlugin.autoImport.stagingDirectory).value / "bin" / packageName.value).absolutePath.!!
 
   assert(
     output contains "Agent 86",