Fix MavenCentral publishing process

Author: qiaoyuang

.github/workflows/build.yml

@@ -8,13 +8,6 @@ on:
     branches:    
       - '*'
 
-env:
-  ORG_GRADLE_PROJECT_NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }}
-  ORG_GRADLE_PROJECT_NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
-  ORG_GRADLE_PROJECT_SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
-  ORG_GRADLE_PROJECT_SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
-  ORG_GRADLE_PROJECT_SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
-
 jobs:
 
   build-mmkv-kotlin:

.github/workflows/publish.yml

@@ -4,11 +4,11 @@ on:
   workflow_dispatch:
 
 env:
-  ORG_GRADLE_PROJECT_NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }}
-  ORG_GRADLE_PROJECT_NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
-  ORG_GRADLE_PROJECT_SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
-  ORG_GRADLE_PROJECT_SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
-  ORG_GRADLE_PROJECT_SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
+  ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
+  ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
+  ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_KEY }}
+  ORG_GRADLE_PROJECT_signingInMemoryKeyId: ${{ secrets.SIGNING_KEY_ID }}
+  ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_KEY_PASSWORD }}
 
 jobs:
 

build.gradle.kts

@@ -2,4 +2,5 @@ plugins {
     alias(libs.plugins.multiplatform) apply false
     alias(libs.plugins.cocoapods) apply false
     alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.vanniktech.maven.publish) apply false
 }

gradle/libs.versions.toml

@@ -6,6 +6,8 @@ mmkv = "2.2.2"
 junit = "4.13.2"
 androidx-test = "1.6.1"
 androidx-test-runner = "1.6.2"
+desugar-jdk-libs = "2.1.5"
+vanniktech-maven-publish = "0.33.0"
 
 [libraries]
 
@@ -14,11 +16,12 @@ junit = { group = "junit", name = "junit", version.ref = "junit" }
 androidx-test-core = { group = "androidx.test", name = "core", version.ref = "androidx-test" }
 androidx-test-runner = { group = "androidx.test", name = "runner", version.ref = "androidx-test-runner" }
 androidx-test-rules = { group = "androidx.test", name = "rules", version.ref = "androidx-test" }
+desugar-jdk-libs = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "desugar-jdk-libs" }
 
 [plugins]
 
 multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 cocoapods = { id = "org.jetbrains.kotlin.native.cocoapods", version.ref = "kotlin" }
 kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize" }
 android-library = { id = "com.android.library", version.ref = "agp" }
-maven-publish = { id = "maven-publish" }
+vanniktech-maven-publish = { id = "com.vanniktech.maven.publish",  version.ref = "vanniktech-maven-publish" }

mmkv-kotlin/build.gradle.kts

@@ -6,15 +6,15 @@ plugins {
     alias(libs.plugins.cocoapods)
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.parcelize)
-    alias(libs.plugins.maven.publish)
-    signing
+    alias(libs.plugins.vanniktech.maven.publish)
 }
 
 version = "1.2.18"
 group = "com.ctrip.flight.mmkv"
 
 @OptIn(ExperimentalKotlinGradlePluginApi::class)
 kotlin {
+    jvmToolchain(21)
     androidTarget {
         publishLibraryVariants("release")
         instrumentedTestVariant.sourceSetTree.set(KotlinSourceSetTree.test)
@@ -72,63 +72,45 @@ android {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_21
+        isCoreLibraryDesugaringEnabled = true
     }
 }
 
-val javadocJar: TaskProvider<Jar> by tasks.registering(Jar::class) {
-    archiveClassifier.set("javadoc")
+dependencies {
+    coreLibraryDesugaring(libs.desugar.jdk.libs)
 }
 
-publishing {
-    publications.withType<MavenPublication> {
-        artifact(javadocJar)
-        with(pom) {
-            name.set("MMKV-Kotlin")
-            description.set("MMKV for Kotlin Multiplatform")
-            url.set("https://github.com/ctripcorp/mmkv-kotlin")
-            licenses {
-                license {
-                    name.set("The Apache License, Version 2.0")
-                    url.set("https://www.apache.org/licenses/LICENSE-2.0.txt")
-                }
-            }
-            developers {
-                developer {
-                    id.set("qiaoyuang")
-                    name.set("Yuang Qiao")
-                    email.set("[email protected]")
-                }
-            }
-            scm {
-                url.set("https://github.com/ctripcorp/mmkv-kotlin")
-                connection.set("scm:git:https://github.com/ctripcorp/mmkv-kotlin.git")
-                developerConnection.set("scm:git:https://github.com/ctripcorp/mmkv-kotlin.git")
+mavenPublishing {
+    publishToMavenCentral()
+    signAllPublications()
+
+    coordinates(
+        groupId = group.toString(),
+        artifactId = "mmkv-kotlin",
+        version = version.toString(),
+    )
+
+    pom {
+        name.set("MMKV-Kotlin")
+        description.set("MMKV for Kotlin Multiplatform")
+        url.set("https://github.com/ctripcorp/mmkv-kotlin")
+        licenses {
+            license {
+                name.set("The Apache License, Version 2.0")
+                url.set("https://www.apache.org/licenses/LICENSE-2.0.txt")
             }
         }
-    }
-    repositories {
-        maven {
-            credentials {
-                val NEXUS_USERNAME: String by project
-                val NEXUS_PASSWORD: String by project
-                username = NEXUS_USERNAME
-                password = NEXUS_PASSWORD
+        developers {
+            developer {
+                id.set("qiaoyuang")
+                name.set("Yuang Qiao")
+                email.set("[email protected]")
             }
-            url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2")
+        }
+        scm {
+            url.set("https://github.com/ctripcorp/mmkv-kotlin")
+            connection.set("scm:git:https://github.com/ctripcorp/mmkv-kotlin.git")
+            developerConnection.set("scm:git:https://github.com/ctripcorp/mmkv-kotlin.git")
         }
     }
-    signing {
-        val SIGNING_KEY_ID: String by project
-        val SIGNING_KEY: String by project
-        val SIGNING_PASSWORD: String by project
-        useInMemoryPgpKeys(SIGNING_KEY_ID, SIGNING_KEY, SIGNING_PASSWORD)
-        sign(publishing.publications)
-    }
-}
-
-// TODO: remove after https://youtrack.jetbrains.com/issue/KT-46466 is fixed
-project.tasks.withType(AbstractPublishToMaven::class.java).configureEach {
-    dependsOn(project.tasks.withType(Sign::class.java))
 }