From f6bf6c7ab4d04a5f9ee79284384ac1ebf9644226 Mon Sep 17 00:00:00 2001 From: Yang Date: Sat, 14 Jun 2025 13:56:09 +1000 Subject: [PATCH] Migrate to Sonatype Central Portal. --- .github/workflows/ci.yml | 4 ++-- CHANGELOG.md | 7 +++++++ RELEASING.md | 11 ++++------- .../cache4k/buildlogic/convention/ConventionPlugin.kt | 2 +- gradle/libs.versions.toml | 2 +- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cf2e9ca..d309c93 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -51,8 +51,8 @@ jobs: if: github.ref == 'refs/heads/main' runs-on: macos-14 env: - ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }} - ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} + ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_CENTRAL_USERNAME }} + ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_CENTRAL_PASSWORD }} steps: - uses: actions/checkout@v4 diff --git a/CHANGELOG.md b/CHANGELOG.md index 1375772..669b5c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Change Log +## Unreleased + +### Changed + +- Kotlin 2.1.20 +- Migrate to Sonatype Central Portal. + ## 0.14.0 ### Changed diff --git a/RELEASING.md b/RELEASING.md index 47713a9..64f6c1a 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -5,10 +5,7 @@ 3. Update the `README.md` with the new version. 4. `git commit -am "Prepare for release X.Y.Z."` (where X.Y.Z is the new version). 5. `./gradlew publishAndReleaseToMavenCentral` -6. Visit [Sonatype Nexus](https://s01.oss.sonatype.org/) to verify the release has been completed. -7. `git tag -a X.Y.X -m "X.Y.Z"` (where X.Y.Z is the new version) -8. Update the top-level `gradle.properties` to the next SNAPSHOT version. -9. `git commit -am "Prepare next development version."` -10. `git push && git push --tags` - -If step 5 or 6 fails, drop the Sonatype repo, fix the problem, commit, and start again at step 5. +6. `git tag -a X.Y.X -m "X.Y.Z"` (where X.Y.Z is the new version) +7. Update the top-level `gradle.properties` to the next SNAPSHOT version. +8. `git commit -am "Prepare next development version."` +9. `git push && git push --tags` diff --git a/build-logic/src/main/kotlin/io/github/reactivecircus/cache4k/buildlogic/convention/ConventionPlugin.kt b/build-logic/src/main/kotlin/io/github/reactivecircus/cache4k/buildlogic/convention/ConventionPlugin.kt index 77806cf..e1018bf 100644 --- a/build-logic/src/main/kotlin/io/github/reactivecircus/cache4k/buildlogic/convention/ConventionPlugin.kt +++ b/build-logic/src/main/kotlin/io/github/reactivecircus/cache4k/buildlogic/convention/ConventionPlugin.kt @@ -105,7 +105,7 @@ private fun Project.configureSubproject() { // configure publishing pluginManager.apply(MavenPublishPlugin::class.java) extensions.configure { - publishToMavenCentral(SonatypeHost.S01, automaticRelease = true) + publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL, automaticRelease = true) signAllPublications() } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4c29c01..a8adbe8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ dokka = "2.0.0" binaryCompabilityValidator = "0.17.0" toolchainsResolver = "0.10.0" detekt = "1.23.7" -mavenPublish = "0.30.0" +mavenPublish = "0.32.0" coroutines = "1.10.1" atomicfu = "0.27.0" lincheck = "2.26"