Migrate publication pipeline on Central Portal from Legacy OSSRH (#171)

Saloed · web-flow · commit da2410bb05ba · 2025-05-12T15:54:49.000+03:00
* Upgrade gradle and plugins

* Upgrade version to 0.5.30

* Fix release to maven central

* Fix ubuntu runner
diff --git a/.github/workflows/build-and-run-tests.yml b/.github/workflows/build-and-run-tests.yml
@@ -15,17 +15,17 @@ jobs:
     name: Run tests
     strategy:
       matrix:
-        os: [ ubuntu-20.04, windows-latest, macos-latest ]
+        os: [ ubuntu-22.04, windows-latest, macos-latest ]
 
     runs-on: ${{ matrix.os }}
 
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up JDK 1.8
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
-          java-version: 8
+          java-version: 17
           distribution: 'zulu'
           cache: gradle
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,10 +12,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up JDK 1.8
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
-          java-version: 8
+          java-version: 17
           distribution: 'zulu'
           cache: gradle
 
@@ -29,7 +29,6 @@ jobs:
             publishAllPublicationsToReleaseDirRepository
             --no-daemon
             -Dorg.gradle.jvmargs=-XX:MaxMetaspaceSize=2G
-            -PmavenDeployUrl=https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/
             -PmavenDeployUser=${{ secrets.MAVEN_CENTRAL_USER }}
             -PmavenDeployPassword=${{ secrets.MAVEN_CENTRAL_PASSWORD }}
             -PmavenSignGpgKey="${{ secrets.MAVEN_SIGN_GPG_KEY }}"
diff --git a/.github/workflows/run-long-tests.yml b/.github/workflows/run-long-tests.yml
@@ -80,11 +80,11 @@ jobs:
           key: test-data-${{ env.TEST_DATA_REVISION }}-${{ matrix.os }}
           path: ksmt-test/testData/testData.zip
 
-      - name: Set up JDK 1.8
+      - name: Set up JDK 17
         if: steps.test-data-cache.outputs.cache-hit != 'true'
         uses: actions/setup-java@v4
         with:
-          java-version: 8
+          java-version: 17
           distribution: 'zulu'
           cache: gradle
 
@@ -131,10 +131,10 @@ jobs:
           echo "Test data is not available"
           exit 1
 
-      - name: Set up JDK 1.8
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
-          java-version: 8
+          java-version: 17
           distribution: 'zulu'
           cache: gradle
 
@@ -185,10 +185,10 @@ jobs:
         with:
           path: reports
 
-      - name: Set up JDK 1.8
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
-          java-version: 8
+          java-version: 17
           distribution: 'zulu'
 
       - name: Setup gradle
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ Get the most out of SMT solving with KSMT features:
 * Streamlined [solver delivery](#ksmt-distribution) with no need for building a solver or implementing JVM bindings
 
 [![KSMT: build](https://github.com/UnitTestBot/ksmt/actions/workflows/build-and-run-tests.yml/badge.svg)](https://github.com/UnitTestBot/ksmt/actions/workflows/build-and-run-tests.yml)
-[![Maven Central](https://img.shields.io/maven-central/v/io.ksmt/ksmt-core)](https://central.sonatype.com/artifact/io.ksmt/ksmt-core/0.5.29)
+[![Maven Central](https://img.shields.io/maven-central/v/io.ksmt/ksmt-core)](https://central.sonatype.com/artifact/io.ksmt/ksmt-core/0.5.30)
 [![javadoc](https://javadoc.io/badge2/io.ksmt/ksmt-core/javadoc.svg)](https://javadoc.io/doc/io.ksmt/ksmt-core)
 
 ## Get started
@@ -20,9 +20,9 @@ To start using KSMT, install it via [Gradle](https://gradle.org/):
 
 ```kotlin
 // core 
-implementation("io.ksmt:ksmt-core:0.5.29")
+implementation("io.ksmt:ksmt-core:0.5.30")
 // z3 solver
-implementation("io.ksmt:ksmt-z3:0.5.29")
+implementation("io.ksmt:ksmt-z3:0.5.30")
 ```
 
 Find basic instructions in the [Getting started](docs/getting-started.md) guide and try it out with the 
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -0,0 +1,19 @@
+plugins {
+    id("com.gradleup.nmcp.aggregation") version "0.1.3"
+}
+
+val mavenDeployUser = project.stringProperty("mavenDeployUser")
+if (mavenDeployUser != null) {
+    val mavenDeployPassword = project.stringProperty("mavenDeployPassword") ?: ""
+
+    nmcpAggregation {
+        centralPortal {
+            username.set(mavenDeployUser)
+            password.set(mavenDeployPassword)
+            publishingType.set("USER_MANAGED")
+        }
+
+        // Publish all projects that apply the 'maven-publish' plugin
+        publishAllProjectsProbablyBreakingProjectIsolation()
+    }
+}
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -19,6 +19,10 @@ dependencies {
     implementation("de.undercouch.download:de.undercouch.download.gradle.plugin:5.1.0")
 }
 
+tasks.withType<JavaCompile> {
+    targetCompatibility = JavaVersion.VERSION_1_8.toString()
+}
+
 tasks.withType<KotlinCompile> {
     kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
 }
diff --git a/buildSrc/src/main/kotlin/Publications.kt b/buildSrc/src/main/kotlin/Publications.kt
@@ -1,5 +1,5 @@
-import gradle.kotlin.dsl.accessors._87b80c14bf1c4d505c7a71d7741e0994.publishing
-import gradle.kotlin.dsl.accessors._87b80c14bf1c4d505c7a71d7741e0994.signing
+import gradle.kotlin.dsl.accessors._a772fae24f61b6fdfe5e797ccdf7ddf5.publishing
+import gradle.kotlin.dsl.accessors._a772fae24f61b6fdfe5e797ccdf7ddf5.signing
 import groovy.util.Node
 import org.gradle.api.Project
 import org.gradle.api.artifacts.Dependency
@@ -50,6 +50,12 @@ fun MavenPublication.addKsmtPom() {
     }
 }
 
+fun MavenPublication.generateMavenMetadata(project: Project) {
+    project.tasks.getByName("generateMetadataFileForMavenPublication") {
+        mustRunAfter(project.tasks.named("jar"))
+    }
+}
+
 fun MavenPublication.signKsmtPublication(project: Project) = with(project) {
     signing {
         val gpgKey = project.stringProperty("mavenSignGpgKey")?.removeSurrounding("\"")
diff --git a/buildSrc/src/main/kotlin/io.ksmt.ksmt-base.gradle.kts b/buildSrc/src/main/kotlin/io.ksmt.ksmt-base.gradle.kts
@@ -11,7 +11,7 @@ plugins {
 }
 
 group = "io.ksmt"
-version = "0.5.29"
+version = "0.5.30"
 
 repositories {
     mavenCentral()
@@ -31,6 +31,10 @@ detekt {
     config = files(rootDir.resolve("detekt.yml"))
 }
 
+tasks.withType<JavaCompile> {
+    targetCompatibility = JavaVersion.VERSION_1_8.toString()
+}
+
 tasks.withType<KotlinCompile> {
     kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()
 }
@@ -56,18 +60,5 @@ publishing {
             name = "releaseDir"
             url = uri(layout.buildDirectory.dir("release"))
         }
-
-        val mavenDeployUrl = project.stringProperty("mavenDeployUrl")
-        if (mavenDeployUrl != null) {
-            maven {
-                name = "central"
-                url = uri(mavenDeployUrl)
-
-                credentials {
-                    username = project.stringProperty("mavenDeployUser") ?: ""
-                    password = project.stringProperty("mavenDeployPassword") ?: ""
-                }
-            }
-        }
     }
 }
diff --git a/docs/getting-started.md b/docs/getting-started.md
@@ -34,7 +34,7 @@ repositories {
 ```kotlin
 dependencies {
     // core 
-    implementation("io.ksmt:ksmt-core:0.5.29")    
+    implementation("io.ksmt:ksmt-core:0.5.30")    
 }
 ```
 
@@ -43,9 +43,9 @@ dependencies {
 ```kotlin
 dependencies {
     // z3 
-    implementation("io.ksmt:ksmt-z3:0.5.29")
+    implementation("io.ksmt:ksmt-z3:0.5.30")
     // bitwuzla
-    implementation("io.ksmt:ksmt-bitwuzla:0.5.29")
+    implementation("io.ksmt:ksmt-bitwuzla:0.5.30")
 }
 ```
 
diff --git a/examples/build.gradle.kts b/examples/build.gradle.kts
@@ -9,11 +9,11 @@ repositories {
 
 dependencies {
     // core
-    implementation("io.ksmt:ksmt-core:0.5.29")
+    implementation("io.ksmt:ksmt-core:0.5.30")
     // z3 solver
-    implementation("io.ksmt:ksmt-z3:0.5.29")
+    implementation("io.ksmt:ksmt-z3:0.5.30")
     // Runner and portfolio solver
-    implementation("io.ksmt:ksmt-runner:0.5.29")
+    implementation("io.ksmt:ksmt-runner:0.5.30")
 }
 
 java {
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ksmt-cvc5/ksmt-cvc5-core/build.gradle.kts b/ksmt-cvc5/ksmt-cvc5-core/build.gradle.kts
@@ -2,7 +2,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 plugins {
     id("io.ksmt.ksmt-base")
-    id("com.github.johnrengelman.shadow") version "7.1.2"
+    id("com.gradleup.shadow") version "9.0.0-beta13"
 }
 
 val distDir = projectDir.parentFile.resolve("dist")
@@ -38,6 +38,7 @@ publishing {
             project.shadow.component(this)
 
             addKsmtPom()
+            generateMavenMetadata(project)
             addSourcesAndJavadoc(project)
             signKsmtPublication(project)
         }
diff --git a/ksmt-cvc5/ksmt-cvc5-native/build.gradle.kts b/ksmt-cvc5/ksmt-cvc5-native/build.gradle.kts
@@ -1,3 +1,5 @@
+import gratatouille.capitalizeFirstLetter
+
 plugins {
     id("io.ksmt.ksmt-base")
 }
@@ -42,6 +44,10 @@ cvc5Binaries.entries.forEach { (sourceSet, nativeConfig) ->
     val artifactName = "ksmt-cvc5-native-$name"
     val systemArch = name.replace('-', '/')
 
+    tasks.getByName("compile${name.capitalizeFirstLetter()}Kotlin") {
+        mustRunAfter(project(":ksmt-cvc5:ksmt-cvc5-core").tasks.named("jar"))
+    }
+
     val jarTask = tasks.register<Jar>("$name-jar") {
         archiveBaseName.set(artifactName)
         from(sourceSet.output)
diff --git a/ksmt-runner/build.gradle.kts b/ksmt-runner/build.gradle.kts
@@ -4,7 +4,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     id("io.ksmt.ksmt-base")
-    id("com.jetbrains.rdgen") version "2022.3.2"
+    id("com.jetbrains.rdgen") version "2025.1.1"
 }
 
 repositories {
diff --git a/ksmt-yices/ksmt-yices-core/build.gradle.kts b/ksmt-yices/ksmt-yices-core/build.gradle.kts
@@ -2,7 +2,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 plugins {
     id("io.ksmt.ksmt-base")
-    id("com.github.johnrengelman.shadow") version "7.1.2"
+    id("com.gradleup.shadow") version "9.0.0-beta13"
     `java-test-fixtures`
 }
 
@@ -38,6 +38,7 @@ publishing {
             project.shadow.component(this)
 
             addKsmtPom()
+            generateMavenMetadata(project)
             addSourcesAndJavadoc(project)
             signKsmtPublication(project)
         }
diff --git a/ksmt-yices/ksmt-yices-native/build.gradle.kts b/ksmt-yices/ksmt-yices-native/build.gradle.kts
@@ -1,3 +1,5 @@
+import gratatouille.capitalizeFirstLetter
+
 plugins {
     id("io.ksmt.ksmt-base")
 }
@@ -40,6 +42,10 @@ yicesBinaries.entries.forEach { (sourceSet, nativeConfig) ->
     val artifactName = "ksmt-yices-native-$name"
     val systemArch = name.replace('-', '/')
 
+    tasks.getByName("compile${name.capitalizeFirstLetter()}Kotlin") {
+        mustRunAfter(project(":ksmt-yices:ksmt-yices-core").tasks.named("jar"))
+    }
+
     val jarTask = tasks.register<Jar>("$name-jar") {
         archiveBaseName.set(artifactName)
         from(sourceSet.output)
diff --git a/ksmt-z3/ksmt-z3-core/build.gradle.kts b/ksmt-z3/ksmt-z3-core/build.gradle.kts
@@ -2,7 +2,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 plugins {
     id("io.ksmt.ksmt-base")
-    id("com.github.johnrengelman.shadow") version "7.1.2"
+    id("com.gradleup.shadow") version "9.0.0-beta13"
 }
 
 repositories {
@@ -40,6 +40,7 @@ publishing {
             project.shadow.component(this)
 
             addKsmtPom()
+            generateMavenMetadata(project)
             addSourcesAndJavadoc(project)
             signKsmtPublication(project)
         }
diff --git a/ksmt-z3/ksmt-z3-native/build.gradle.kts b/ksmt-z3/ksmt-z3-native/build.gradle.kts
@@ -1,3 +1,5 @@
+import gratatouille.capitalizeFirstLetter
+
 plugins {
     id("io.ksmt.ksmt-base")
 }
@@ -47,6 +49,10 @@ z3Binaries.forEach { (sourceSet, z3BinaryTask, nativeConfig) ->
     val artifactName = "ksmt-z3-native-$name"
     val systemArch = name.replace('-', '/')
 
+    tasks.getByName("compile${name.capitalizeFirstLetter()}Kotlin") {
+        mustRunAfter(project(":ksmt-z3:ksmt-z3-core").tasks.named("jar"))
+    }
+
     val jarTask = tasks.register<Jar>("$name-jar") {
         archiveBaseName.set(artifactName)
         from(sourceSet.output)
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -24,6 +24,11 @@ include("ksmt-test")
 include("ksmt-symfpu")
 
 pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        mavenCentral()
+    }
+
     resolutionStrategy {
         eachPlugin {
             if (requested.id.name == "rdgen") {

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,10 @@ dependencies {`
`19`	`19`	`implementation("de.undercouch.download:de.undercouch.download.gradle.plugin:5.1.0")`
`20`	`20`	`}`
`21`	`21`
	`22`	`+tasks.withType<JavaCompile> {`
	`23`	`+ targetCompatibility = JavaVersion.VERSION_1_8.toString()`
	`24`	`+}`
	`25`	`+`
`22`	`26`	`tasks.withType<KotlinCompile> {`
`23`	`27`	`kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()`
`24`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ plugins {`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`group = "io.ksmt"`
`14`		`-version = "0.5.29"`
	`14`	`+version = "0.5.30"`
`15`	`15`
`16`	`16`	`repositories {`
`17`	`17`	`mavenCentral()`
`@@ -31,6 +31,10 @@ detekt {`
`31`	`31`	`config = files(rootDir.resolve("detekt.yml"))`
`32`	`32`	`}`
`33`	`33`
	`34`	`+tasks.withType<JavaCompile> {`
	`35`	`+ targetCompatibility = JavaVersion.VERSION_1_8.toString()`
	`36`	`+}`
	`37`	`+`
`34`	`38`	`tasks.withType<KotlinCompile> {`
`35`	`39`	`kotlinOptions.jvmTarget = JavaVersion.VERSION_1_8.toString()`
`36`	`40`	`}`
`@@ -56,18 +60,5 @@ publishing {`
`56`	`60`	`name = "releaseDir"`
`57`	`61`	`url = uri(layout.buildDirectory.dir("release"))`
`58`	`62`	`}`
`59`		`-`
`60`		`- val mavenDeployUrl = project.stringProperty("mavenDeployUrl")`
`61`		`- if (mavenDeployUrl != null) {`
`62`		`- maven {`
`63`		`- name = "central"`
`64`		`- url = uri(mavenDeployUrl)`
`65`		`-`
`66`		`- credentials {`
`67`		`- username = project.stringProperty("mavenDeployUser") ?: ""`
`68`		`- password = project.stringProperty("mavenDeployPassword") ?: ""`
`69`		`- }`
`70`		`- }`
`71`		`- }`
`72`	`63`	`}`
`73`	`64`	`}`