From 871173a022da1e856e7993ea08240135f1d46a34 Mon Sep 17 00:00:00 2001 From: Derek Wickern Date: Mon, 1 Apr 2024 14:55:12 -0700 Subject: [PATCH 1/4] remove Maven profile workaround --- build.sbt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/build.sbt b/build.sbt index a810029..341f5c7 100644 --- a/build.sbt +++ b/build.sbt @@ -5,11 +5,6 @@ sbtPlugin := true enablePlugins(ScriptedPlugin) scriptedLaunchOpts += s"-Dproject.version=${version.value}" -scriptedDependencies := { - // publish to maven instead of ivy, in order to activate maven profiles on Windows - (Test / compile).value - publishM2.value -} addSbtPlugin("com.github.sbt" % "sbt-web" % "1.5.5") From 7cf66dd2a8c6f31f33ed359597284861ad17faba Mon Sep 17 00:00:00 2001 From: Derek Wickern Date: Mon, 1 Apr 2024 15:03:04 -0700 Subject: [PATCH 2/4] replace sbt-release with sbt-ci-release --- build.sbt | 20 +------------------- project/plugins.sbt | 4 +--- version.sbt | 1 - 3 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 version.sbt diff --git a/build.sbt b/build.sbt index 341f5c7..c08a322 100644 --- a/build.sbt +++ b/build.sbt @@ -11,8 +11,6 @@ addSbtPlugin("com.github.sbt" % "sbt-web" % "1.5.5") libraryDependencies ++= Seq( "com.aayushatharva.brotli4j" % "brotli4j" % "1.16.0" ) - -publishTo := sonatypePublishToBundle.value pomExtra := { https://github.com/dwickern/sbt-web-brotli @@ -38,20 +36,4 @@ pomExtra := { https://github.com/enalmada -} - -import ReleaseTransformations._ -releaseProcess := Seq[ReleaseStep]( - checkSnapshotDependencies, - inquireVersions, - runClean, - runTest, - setReleaseVersion, - commitReleaseVersion, - tagRelease, - releaseStepCommandAndRemaining("publishSigned"), - releaseStepCommand("sonatypeBundleRelease"), - setNextVersion, - commitNextVersion, - pushChanges -) +} \ No newline at end of file diff --git a/project/plugins.sbt b/project/plugins.sbt index 0daa06c..10e96e6 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,3 @@ -addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0") -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.10.0") -addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1") +addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12") libraryDependencies += "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value diff --git a/version.sbt b/version.sbt deleted file mode 100644 index 7378fbf..0000000 --- a/version.sbt +++ /dev/null @@ -1 +0,0 @@ -ThisBuild / version := "1.1.1-SNAPSHOT" From 30c72d51348b70f9c20de0bc1b159369e4e78a1e Mon Sep 17 00:00:00 2001 From: Derek Wickern Date: Mon, 1 Apr 2024 15:05:23 -0700 Subject: [PATCH 3/4] replace pomExtra with settings --- build.sbt | 37 +++++++++++-------------------------- 1 file changed, 11 insertions(+), 26 deletions(-) diff --git a/build.sbt b/build.sbt index c08a322..27c80f7 100644 --- a/build.sbt +++ b/build.sbt @@ -11,29 +11,14 @@ addSbtPlugin("com.github.sbt" % "sbt-web" % "1.5.5") libraryDependencies ++= Seq( "com.aayushatharva.brotli4j" % "brotli4j" % "1.16.0" ) -pomExtra := { - https://github.com/dwickern/sbt-web-brotli - - - Apache 2 - http://www.apache.org/licenses/LICENSE-2.0.txt - - - - scm:git:git@github.com:dwickern/sbt-web-brotli.git - scm:git:git@github.com:dwickern/sbt-web-brotli.git - https://github.com/dwickern - - - - dwickern - Derek Wickern - https://github.com/dwickern - - - enalmada - Adam Lane - https://github.com/enalmada - - -} \ No newline at end of file + +homepage := Some(url("https://github.com/dwickern/sbt-web-brotli")) +licenses := List(License.Apache2) +developers := List( + Developer( + "dwickern", + "Derek Wickern", + "dwickern@gmail.com", + url("https://github.com/dwickern") + ) +) From de3029c833549116e5b56ec983c119ac44c7edf2 Mon Sep 17 00:00:00 2001 From: Derek Wickern Date: Mon, 1 Apr 2024 15:13:14 -0700 Subject: [PATCH 4/4] add release workflow --- .github/workflows/release.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..fa4c04c --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,23 @@ +name: Release +on: + push: + branches: [master, main] + tags: ["*"] +jobs: + publish: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: 8 + cache: sbt + - run: sbt ci-release + env: + PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} + PGP_SECRET: ${{ secrets.PGP_SECRET }} + SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} + SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}