Central Portal migration. #503

Author: czyzby

.github/CONTRIBUTING.md

@@ -67,11 +67,9 @@ Some useful Gradle tasks include:
 - `check` - runs all tests in all projects.
 - `clean` - removes the `build` directories, which forces rebuilds of the modules.
 - `distZip` - prepares a zip archive with all jars in `build/distributions` folder. Useful for releases.
-- `publish` - pushes the archives to _Maven Central_ or the snapshot repository, depending on the
-[version](../version.txt). Requires complete `gradle.properties` with archive signing and _Sonatype_ logging data.
-- `closeAndReleaseRepository` - closes and releases the Nexus repository. Should be run after `publish` in case of
-a non-snapshot upload to _Maven Central_. Might fail at times on the release task; running `releaseRepository`
-separately should fix the issue.
+- `publishToMavenCentral` - pushes the archives to _Maven Central Portal_ or the snapshot repository, depending on 
+the [version](../version.txt). Requires complete `gradle.properties` with _Sonatype_ credentials as well as the archive
+signing properties for non-snapshot releases.
 
 ### Adding a new KTX module
 
@@ -168,9 +166,7 @@ Apply `dev` label and milestone corresponding to the libGDX version. An example
 - Create a pull request from the `develop` branch to the `master` branch. Review and merge the changes to the `master`
 branch.
 - Checkout the `master` branch. Fetch the latest changes.
-- Run `gradle build publish closeAndReleaseRepository` to push artifacts to _Maven Central_. Note that the Maven plugin
-has its issues and might fail with an error, but usually the release will be successful. You can check if the staging
-repository was properly close, promoted and released at [Nexus Repository Manager](https://oss.sonatype.org/).
+- Run `gradle build publishToMavenCentral` to push artifacts to the _Maven Central Portal_.
 - Run `gradle distZip` to prepare an archive with **KTX** sources, compiled binary and documentation.
 - Upload the archive to [releases](https://github.com/libktx/ktx/releases) section. The tag should be made from the
 `master` branch and its name should match the released version. Name of the release should match `KTX $libVersion`.
@@ -193,8 +189,8 @@ that the library was compiled against.
 if the current [version](../version.txt) is not a snapshot to avoid accidentally pushing a stable release.
 
 Note that snapshots are automatically uploaded to Maven Central (OSS Sonatype)
-[snapshots repository](https://oss.sonatype.org/content/repositories/snapshots/io/github/libktx/) after pushing
-to the `develop` branch.
+[snapshots repository](https://central.sonatype.com/repository/maven-snapshots/)
+after pushing to the `develop` branch.
 
 #### Automated tasks
 

.github/workflows/upload-snapshot.yml

@@ -25,5 +25,5 @@ jobs:
       - name: Upload snapshot to Maven Central
         run: ./gradlew build uploadSnapshot -x dokkaHtml
         env:
-          ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.ossrhUsername }}
-          ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.ossrhPassword }}
+          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.CENTRAL_USERNAME }}
+          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.CENTRAL_PASSWORD }}

CHANGELOG.md

@@ -1,9 +1,12 @@
 _See also: [the official libGDX changelog](https://github.com/libgdx/libgdx/blob/master/CHANGES)._
 
 #### 1.13.5-SNAPSHOT
+
 - **[UPDATE]** Updated to libGDX 1.13.5.
-- **[UPDATE]** Updated `shape` extension function for tiled to support the new `TextMapObject`.
-- **[FEATURE]** Add a new `forEachCell` extension function for `TiledMapTileLayer` objects.
+- **[UPDATE]** Updated to Gradle 8.14.2.
+- **[MISC]** Migrated publishing from OSSRH to Maven Central Portal.
+- **[CHANGE]** (`ktx-tiled`) Updated `shape` extension function to support the new `TextMapObject`.
+- **[FEATURE]** (`ktx-tiled`) Add a new `forEachCell` extension function for `TiledMapTileLayer` objects.
 
 #### 1.13.1-rc1
 

build.gradle.kts

@@ -1,8 +1,11 @@
 import ktx.*
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
 import org.gradle.api.tasks.testing.logging.TestLogEvent.*
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.dsl.jvm.JvmTargetValidationMode
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import com.vanniktech.maven.publish.JavadocJar
+import com.vanniktech.maven.publish.KotlinJvm
 
 buildscript {
   repositories {
@@ -24,11 +27,12 @@ buildscript {
 val libGroup: String by project
 val ossrhUsername: String by project
 val ossrhPassword: String by project
+val mavenPublishingPluginVersion: String by project
 
 plugins {
   java
   distribution
-  id("io.codearte.nexus-staging") version "0.22.0"
+  id("com.vanniktech.maven.publish") version "0.33.0"
 }
 
 repositories {
@@ -48,11 +52,11 @@ allprojects {
 }
 
 subprojects {
-  apply(plugin = "maven-publish")
   apply(plugin = "java")
   apply(plugin = "kotlin")
   apply(plugin = "signing")
   apply(plugin = "jacoco")
+  apply(plugin = "com.vanniktech.maven.publish.base")
 
   val isReleaseVersion = !libVersion.endsWith("SNAPSHOT")
 
@@ -77,14 +81,14 @@ subprojects {
   }
 
   tasks.withType<KotlinCompile> {
-    kotlinOptions {
-      jvmTarget = JavaVersion.VERSION_1_8.toString()
-      freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
+    compilerOptions {
+      jvmTarget.set(JvmTarget.JVM_1_8)
+      freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
     }
     jvmTargetValidationMode.set(JvmTargetValidationMode.IGNORE)
   }
   val compileTestKotlin: KotlinCompile by tasks
-  compileTestKotlin.kotlinOptions.jvmTarget = JavaVersion.VERSION_11.toString()
+  compileTestKotlin.compilerOptions.jvmTarget.set(JvmTarget.JVM_11)
 
   dependencies {
     val kotlinVersion: String by project
@@ -140,117 +144,54 @@ subprojects {
   }
 
   val dokkaHtml by tasks.getting
-
   tasks.register<Zip>("dokkaZip") {
-    from("$buildDir/dokka/html")
-    dependsOn(dokkaHtml)
-  }
-
-  val javadocJar by tasks.registering(Jar::class) {
-    archiveClassifier.set("javadoc")
-    from("$buildDir/dokka/html")
+    from("${layout.buildDirectory}/dokka/html")
     dependsOn(dokkaHtml)
   }
 
-  val sourcesJar by tasks.registering(Jar::class) {
-    from(sourceSets.main.get().allSource)
-    archiveClassifier.set("sources")
-  }
-
-  artifacts {
-    archives(javadocJar)
-    archives(sourcesJar)
-  }
-
-  afterEvaluate {
-    rootProject.distributions {
-      main {
-        distributionBaseName.set(libVersion)
-        contents {
-          into("lib") {
-            from(tasks.jar)
-          }
-          into("doc") {
-            from(tasks["dokkaZip"])
-          }
-          into("src") {
-            from(tasks["sourcesJar"])
-          }
-        }
-      }
+  mavenPublishing {
+    publishToMavenCentral(automaticRelease = true)
+    if (isReleaseVersion) {
+      signAllPublications()
     }
-  }
-
-  tasks.register("uploadSnapshot") {
-    if (!isReleaseVersion) finalizedBy(tasks["publishAllPublicationsToMavenRepository"])
-  }
-
-  configure<PublishingExtension> {
-    repositories {
-      maven {
-        val releasesRepoUrl = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
-        val snapshotsRepoUrl = uri("https://oss.sonatype.org/content/repositories/snapshots/")
-        url = if (version.toString().endsWith("SNAPSHOT")) snapshotsRepoUrl else releasesRepoUrl
-
-        credentials {
-          username = ossrhUsername
-          password = ossrhPassword
+    configure(KotlinJvm(
+      javadocJar = if (isReleaseVersion) JavadocJar.Dokka("dokkaHtml") else JavadocJar.None(),
+      sourcesJar = true
+    ))
+
+    coordinates(libGroup, projectName, libVersion)
+
+    pom {
+      name.set(projectName)
+      description.set(projectDesc)
+      inceptionYear.set("2016")
+      url.set("https://github.com/libktx/ktx")
+      licenses {
+        license {
+          name.set("CC0-1.0")
+          url.set("https://creativecommons.org/publicdomain/zero/1.0/")
         }
       }
-    }
-
-    publications {
-      create<MavenPublication>("mavenKtx") {
-        pom {
-          name.set(projectName)
-          packaging = "jar"
-          description.set(projectDesc)
-          afterEvaluate {
-            artifactId = tasks.jar.get().archiveBaseName.get()
-          }
-
-          from(components["kotlin"])
-          artifact(sourcesJar)
-          artifact(javadocJar)
-
-          url.set("https://libktx.github.io/")
-
-          licenses {
-            license {
-              name.set("CC0-1.0")
-              url.set("https://creativecommons.org/publicdomain/zero/1.0/")
-            }
-          }
-
-          scm {
-            connection.set("scm:git:git@github.com:libktx/ktx.git")
-            developerConnection.set("scm:git:git@github.com:libktx/ktx.git")
-            url.set("https://github.com/libktx/ktx/")
-          }
-
-          developers {
-            developer {
-              id.set("mj")
-              name.set("MJ")
-            }
-          }
+      developers {
+        developer {
+          id.set("mj")
+          name.set("MJ")
+          url.set("https://github.com/czyzby")
         }
       }
+      scm {
+        url.set("https://github.com/libktx/ktx")
+        connection.set("scm:git:git://github.com/libktx/ktx.git")
+        developerConnection.set("scm:git:ssh://git@github.com/libktx/ktx.git")
+      }
     }
   }
 
-  tasks.withType<Sign> { onlyIf { isReleaseVersion } }
-
-  configure<SigningExtension> {
-    setRequired { isReleaseVersion && gradle.taskGraph.hasTask("publish") }
-    sign(extensions.getByType<PublishingExtension>().publications["mavenKtx"])
+  tasks.register("uploadSnapshot") {
+    if (!isReleaseVersion) finalizedBy(tasks["publishToMavenCentral"])
   }
-}
 
-nexusStaging {
-  packageGroup = libGroup
-  username = ossrhUsername
-  password = ossrhPassword
+  tasks.withType<Sign> { onlyIf { isReleaseVersion } }
 }
 
 tasks.register<JavaExec>("linterIdeSetup") {

gradle.properties

@@ -5,6 +5,9 @@ kotlinVersion=2.1.10
 dokkaVersion=2.0.0
 junitPlatformVersion=1.2.0
 configurationsPluginVersion=3.0.3
+mavenPublishingPluginVersion=0.33.0
+
+org.gradle.jvmargs=-Xmx1024m
 
 # The following properties are mock-ups. To deploy the archives,
 # you need to fill these with proper data. To avoid accidental
@@ -16,8 +19,6 @@ configurationsPluginVersion=3.0.3
 #signing.password= 
 #signing.secretKeyRingFile=
 
-# Jira logging data:
-ossrhUsername=
-ossrhPassword=
-
-org.gradle.jvmargs=-Xmx1024m
+# Maven Central logging data:
+mavenCentralUsername=
+mavenCentralPassword=

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-all.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists