v0.5.1

Author: alexandru

.github/workflows/publish-release-scala.yaml

@@ -15,9 +15,19 @@ jobs:
         with:
           java-version: 21
           distribution: 'temurin'
-      - run: ./sbt ci-release
+      - run: ./sbt ci-publish
         env:
-          PGP_PASSPHRASE: ${{ secrets.SIGNING_KEY_PASSWORD }}
-          PGP_SECRET: ${{ secrets.SIGNING_KEY }}
+          # For gradle
+          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.MAVEN_USERNAME }}
+          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_PASSWORD }}
+          ORG_GRADLE_PROJECT_signingInMemoryKeyId: ${{ secrets.GRADLE_SIGNING_KEY_ID }}
+          ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.GRADLE_SIGNING_KEY_PASSWORD }}
+          ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.GRADLE_SIGNING_KEY }}
+          # For sbt
+          PGP_KEY_ID: ${{ secrets.SBT_PGP_KEY_ID }}
+          PGP_PASSPHRASE: ${{ secrets.SBT_PGP_PASSPHRASE }}
+          PGP_SECRET: ${{ secrets.SBT_PGP_SECRET }}
+          # SBT_PGP_USE_GPG: false
           SONATYPE_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
           SONATYPE_USERNAME: ${{ secrets.MAVEN_USERNAME }}
+          BUILD_RELEASE: true

.github/workflows/publish-release.yaml

@@ -21,12 +21,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
           ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.MAVEN_USERNAME }}
           ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_PASSWORD }}
-          ORG_GRADLE_PROJECT_signingInMemoryKeyId: ${{ secrets.SIGNING_KEY_ID }}
-          ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_KEY_PASSWORD }}
-          ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_KEY }}
-      - 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 }}
+          ORG_GRADLE_PROJECT_signingInMemoryKeyId: ${{ secrets.GRADLE_SIGNING_KEY_ID }}
+          ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.GRADLE_SIGNING_KEY_PASSWORD }}
+          ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.GRADLE_SIGNING_KEY }}
+ 

README.md

@@ -27,7 +27,7 @@ Supported database systems:
 ### Documentation
 
 - [Java Usage Guide](./docs/java-usage-guide.md)
-- [Javadoc](https://javadoc.io/doc/org.funfix/delayedqueue-jvm/0.4.0/org/funfix/tasks/jvm/package-summary.html)
+- [Javadoc](https://javadoc.io/doc/org.funfix/delayedqueue-jvm/0.5.1/org/funfix/tasks/jvm/package-summary.html)
 - [Internals](./docs/internals.md)
 
 ---
@@ -37,20 +37,20 @@ Maven:
 <dependency>
   <groupId>org.funfix</groupId>
   <artifactId>delayedqueue-jvm</artifactId>
-  <version>0.4.0</version>
+  <version>0.5.1</version>
 </dependency>
 ```
 
 Gradle:
 ```kotlin
 dependencies {
-    implementation("org.funfix:delayedqueue-jvm:0.4.0")
+    implementation("org.funfix:delayedqueue-jvm:0.5.1")
 }
 ```
 
 sbt:
 ```scala
-libraryDependencies += "org.funfix" % "delayedqueue-jvm" % "0.4.0"
+libraryDependencies += "org.funfix" % "delayedqueue-jvm" % "0.5.1"
 ```
 
 You will need to add a supported JDBC driver:

build.sbt

@@ -1,6 +1,8 @@
 import java.io.FileInputStream
 import java.util.Properties
 import sbt.ThisBuild
+import scala.sys.process.Process
+import xerial.sbt.Sonatype.sonatypeCentralHost
 
 val scala3Version = "3.3.7"
 val scala2Version = "2.13.18"
@@ -15,6 +17,9 @@ inThisBuild(
   Seq(
     organization := "org.funfix",
     scalaVersion := scala2Version,
+    // Configure for Sonatype Central Portal
+    sonatypeCredentialHost := sonatypeCentralHost,
+    usePgpKeyHex(sys.env.get("PGP_KEY_ID").getOrElse("")),
     // ---
     // Settings for dealing with the local Gradle-assembled artifacts
     // Also see: publishLocalGradleDependencies
@@ -35,7 +40,8 @@ inThisBuild(
           .orElse(Option(System.getProperty("buildRelease")))
           .exists(it => it == "true" || it == "1" || it == "yes" || it == "on")
       if (isRelease) base else s"$base-SNAPSHOT"
-    }
+    },
+    versionScheme := Some("early-semver")
   )
 )
 
@@ -101,7 +107,7 @@ val sharedSettings = Seq(
   publishTo := {
     val centralSnapshots = "https://central.sonatype.com/repository/maven-snapshots/"
     if (version.value.endsWith("-SNAPSHOT")) Some("central-snapshots".at(centralSnapshots))
-    else localStaging.value
+    else sonatypePublishToBundle.value
   },
 
   // ScalaDoc settings
@@ -130,10 +136,14 @@ lazy val root = project
     publishLocalGradleDependencies := {
       import scala.sys.process.*
       val rootDir = (ThisBuild / baseDirectory).value
-      val command = Process(
-        "./gradlew" :: "publishToMavenLocal" :: Nil,
-        rootDir
-      )
+      val commandArgs =
+        List(
+          List("./gradlew"),
+          if (!version.value.endsWith("-SNAPSHOT")) List("-PbuildRelease=true") else Nil,
+          List("publishToMavenLocal")
+        ).flatten
+
+      val command = Process(commandArgs, rootDir)
       val log = streams.value.log
       val exitCode = command ! log
       if (exitCode != 0) {
@@ -174,5 +184,5 @@ addCommandAlias(
 )
 addCommandAlias(
   "ci-publish",
-  ";publishLocalGradleDependencies; +Test/compile; +publishSigned; sonaUpload"
+  ";publishLocalGradleDependencies; +Test/compile; +publishSigned; sonatypeBundleUpload"
 )

gradle.properties

@@ -1,5 +1,5 @@
 # TO BE modified whenever a new version is released
-project.version=0.4.0
+project.version=0.5.1
 
 # Project configuration
 org.gradle.parallel=true

project/plugins.sbt

@@ -2,6 +2,7 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.6")
 addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.2")
 addSbtPlugin("org.wartremover" % "sbt-wartremover" % "3.5.5")
 addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.1")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.12.2")
 
 // https://github.com/typelevel/sbt-tpolecat/issues/291
 libraryDependencies += "org.typelevel" %% "scalac-options" % "0.1.9"