[4.x] Build: switch publication to the central portal (#6629)

* switch to the central portal

* fix previews

Author: martinbonnin

.github/workflows/preview.yml

@@ -27,10 +27,6 @@ jobs:
       - run: |
           git clone --depth 1 --single-branch --branch ${{ inputs.branch }} https://github.com/$GITHUB_REPOSITORY
           cd apollo-kotlin
-          sed -i .old 's/VERSION_NAME=\([\.0-9]*\).*/VERSION_NAME=\1-${{ inputs.prerelease }}/g' gradle.properties
-          export GOOGLE_APPLICATION_CREDENTIALS=google-services.json
-          echo ${GOOGLE_SERVICES_JSON} > $GOOGLE_APPLICATION_CREDENTIALS
-          ./gradlew publishAllPublicationsToApolloPreviewsRepository
+          LIBRARIAN_NIGHTLY=true ./gradlew librarianPublishToGcs
         env:
-          GOOGLE_SERVICES_JSON: ${{ secrets.GOOGLE_SERVICES_JSON }}
-          GITHUB_TOKEN: ${{ github.token }}
+          LIBRARIAN_GOOGLE_SERVICES_JSON: ${{ secrets.APOLLO_KOTLIN_GOOGLE_SERVICES_JSON }}

.github/workflows/push.yml

@@ -23,15 +23,12 @@ jobs:
         with:
           gradle-home-cache-cleanup: true
       - name: Build with Gradle
-        #--no-configuration-cache for https://youtrack.jetbrains.com/issue/KT-65879
         run: |
-          ./gradlew -p tests ciBuild -i
-          ./gradlew :apollo-kdoc:dokkaGeneratePublicationHtml --no-build-cache
-          ./gradlew ciPublishSnapshot --no-configuration-cache
+          ./gradlew :apollo-kdoc:dokkaGeneratePublicationHtml
+          ./gradlew nmcpPublishAggregationToCentralPortalSnapshots
         env:
-          SONATYPE_NEXUS_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
-          SONATYPE_NEXUS_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
-          COM_APOLLOGRAPHQL_PROFILE_ID: ${{ secrets.COM_APOLLOGRAPHQL_PROFILE_ID }}
+          LIBRARIAN_SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+          LIBRARIAN_SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
       - name: Collect Diagnostics
         if: always()
         run: ./scripts/collect-diagnostics.main.kts

.github/workflows/tag.yml

@@ -24,10 +24,9 @@ jobs:
       #--no-configuration-cache for https://youtrack.jetbrains.com/issue/KT-65879
       - name: Publish to Maven Central
         run: |
-          ./gradlew --no-build-cache ciPublishRelease -Pgradle.publish.key="${{ secrets.GRADLE_PUBLISH_KEY }}" -Pgradle.publish.secret="${{ secrets.GRADLE_PUBLISH_SECRET }}" --no-configuration-cache
+          LIBRARIAN_RELEASE=true ./gradlew nmcpPublishAggregationToCentralPortal :apollo-gradle-plugin:publishPlugins -Pgradle.publish.key="${{ secrets.GRADLE_PUBLISH_KEY }}" -Pgradle.publish.secret="${{ secrets.GRADLE_PUBLISH_SECRET }}"
         env:
-          SONATYPE_NEXUS_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
-          SONATYPE_NEXUS_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
-          COM_APOLLOGRAPHQL_PROFILE_ID: ${{ secrets.COM_APOLLOGRAPHQL_PROFILE_ID }}
-          GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
-          GPG_PRIVATE_KEY_PASSWORD: ${{ secrets.GPG_PRIVATE_KEY_PASSWORD }}
+          LIBRARIAN_SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+          LIBRARIAN_SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+          GPG_PRIVATE_KEY: ${{ secrets.SONATYPE_GPG_KEY }}
+          GPG_PRIVATE_KEY_PASSWORD: ${{ secrets.SONATYPE_GPG_KEY_PASSWORD }}

build-logic/build.gradle.kts

@@ -30,7 +30,8 @@ dependencies {
   // See https://github.com/gradle/gradle/issues/4741
   implementation(libs.android.plugin)
   implementation(libs.gradle.japicmp.plugin)
-  implementation(libs.vespene)
+  implementation(libs.librarian)
+  implementation(libs.nmcp)
   implementation(libs.kotlinx.serialization.json)
   implementation(libs.poet.java)
   implementation(libs.poet.kotlin)

build-logic/src/main/kotlin/Android.kt

@@ -11,7 +11,7 @@ fun Project.configureAndroid(
   plugins.apply("com.android.library")
 
   extensions.findByName("android")?.apply {
-    this as CommonExtension<*, *, *, *, *>
+    this as CommonExtension<*, *, *, *, *, *>
 
     compileSdk = getCatalogVersion("android.sdkversion.compile").toInt()
     this.namespace = namespace

build-logic/src/main/kotlin/Publishing.kt

@@ -1,11 +1,8 @@
 import com.android.build.api.dsl.LibraryExtension
 import com.android.build.gradle.BaseExtension
-import kotlinx.coroutines.runBlocking
-import net.mbonnin.vespene.lib.NexusStagingClient
 import org.gradle.api.Project
 import org.gradle.api.attributes.Usage
 import org.gradle.api.internal.file.FileOperations
-import org.gradle.api.plugins.ExtraPropertiesExtension
 import org.gradle.api.plugins.JavaPluginExtension
 import org.gradle.api.publish.PublishingExtension
 import org.gradle.api.publish.maven.MavenPublication
@@ -44,7 +41,7 @@ fun Project.configurePublishing(isAggregateKdoc: Boolean = false) {
   if (isAggregateKdoc) {
     configureDokkaAggregate()
   }
-  configurePublishingInternal()
+  configureModulePublishingInternal()
 }
 
 fun Project.configureDokkaCommon(): DokkaExtension {
@@ -97,6 +94,7 @@ fun Project.configureDokka() {
 
 private class MavenCoordinates(val module: String, val version: String)
 
+
 fun Project.configureDokkaAggregate() {
   val dokka = configureDokkaCommon()
 
@@ -114,7 +112,11 @@ fun Project.configureDokkaAggregate() {
   )
 
 
-  val olderVersionsCoordinates = listOf(MavenCoordinates("com.apollographql.apollo3:apollo-kdoc", "3.8.2"))
+  val olderVersionsCoordinates = listOf(
+      MavenCoordinates("com.apollographql.apollo:apollo-kdoc", "4.2.0"),
+      MavenCoordinates("com.apollographql.apollo3:apollo-kdoc", "3.8.2"),
+  )
+
   val kdocVersionTasks = olderVersionsCoordinates.map { coordinate ->
     val versionString = coordinate.version.replace(".", "_").replace("-", "_")
     val configuration = configurations.create("apolloKdocVersion_$versionString") {
@@ -149,7 +151,7 @@ fun Project.configureDokkaAggregate() {
 
   dokka.pluginsConfiguration.getByName("versioning") {
     this as DokkaVersioningPluginParameters
-    val currentVersion = findProperty("VERSION_NAME") as String
+    val currentVersion = version()
     version.set(currentVersion)
     olderVersionsDir.fileProvider(downloadKDocVersions.map { it.outputs.files.singleFile })
   }
@@ -166,33 +168,7 @@ fun Project.configureDokkaAggregate() {
 
 private abstract class FileOperationsHolder @Inject constructor(val fileOperations: FileOperations)
 
-private fun Project.getOssStagingUrl(): String {
-  val url = try {
-    this.extensions.extraProperties["ossStagingUrl"] as String?
-  } catch (e: ExtraPropertiesExtension.UnknownPropertyException) {
-    null
-  }
-  if (url != null) {
-    return url
-  }
-  val baseUrl = "https://s01.oss.sonatype.org/service/local/"
-  val client = NexusStagingClient(
-      baseUrl = baseUrl,
-      username = System.getenv("SONATYPE_NEXUS_USERNAME"),
-      password = System.getenv("SONATYPE_NEXUS_PASSWORD"),
-  )
-  val repositoryId = runBlocking {
-    client.createRepository(
-        profileId = System.getenv("COM_APOLLOGRAPHQL_PROFILE_ID"),
-        description = "apollo-kotlin $version"
-    )
-  }
-  return "${baseUrl}staging/deployByRepositoryId/${repositoryId}/".also {
-    this.extensions.extraProperties["ossStagingUrl"] = it
-  }
-}
-
-private fun Project.configurePublishingInternal() {
+private fun Project.configureModulePublishingInternal() {
   val emptyJavadocJar = tasks.register("emptyJavadocJar", org.gradle.jvm.tasks.Jar::class.java) {
     archiveClassifier.set("javadoc")
 
@@ -211,15 +187,6 @@ private fun Project.configurePublishingInternal() {
     }
   }
 
-  tasks.withType(Jar::class.java) {
-    manifest {
-      attributes["Built-By"] = findProperty("POM_DEVELOPER_ID") as String?
-      attributes["Created-By"] = "Gradle ${gradle.gradleVersion}"
-      attributes["Implementation-Title"] = findProperty("POM_NAME") as String?
-      attributes["Implementation-Version"] = findProperty("VERSION_NAME") as String?
-    }
-  }
-
   extensions.configure(PublishingExtension::class.java) {
     publications {
       when {
@@ -326,34 +293,11 @@ private fun Project.configurePublishingInternal() {
         name = "pluginTest"
         url = uri(rootProject.layout.buildDirectory.dir("localMaven"))
       }
-
-      maven {
-        name = "ossSnapshots"
-        url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
-        credentials {
-          username = System.getenv("SONATYPE_NEXUS_USERNAME")
-          password = System.getenv("SONATYPE_NEXUS_PASSWORD")
-        }
-      }
-
-      maven {
-        name = "ossStaging"
-        setUrl {
-          uri(rootProject.getOssStagingUrl())
-        }
-        credentials {
-          username = System.getenv("SONATYPE_NEXUS_USERNAME")
-          password = System.getenv("SONATYPE_NEXUS_PASSWORD")
-        }
-      }
-
-      maven {
-        name = "apolloPreviews"
-        setUrl("gcs://apollo-previews/m2")
-      }
     }
   }
 
+  pluginManager.apply("com.gradleup.nmcp")
+
   // See https://youtrack.jetbrains.com/issue/KT-46466/Kotlin-MPP-publishing-Gradle-7-disables-optimizations-because-of-task-dependencies#focus=Comments-27-7102038.0-0
   val signingTasks = tasks.withType(Sign::class.java)
   tasks.withType(AbstractPublishToMaven::class.java).configureEach {
@@ -371,7 +315,7 @@ private fun Project.configurePublishingInternal() {
     isEnabled = !System.getenv("GPG_PRIVATE_KEY").isNullOrBlank()
   }
 
-  // https://github.com/gradle/gradle/issues/26132
+  // https://github.com/gradle/gradle/issues/26091
   afterEvaluate {
     tasks.all {
       if (name.startsWith("compileTestKotlin")) {
@@ -395,7 +339,7 @@ private fun Project.configurePublishingInternal() {
  */
 private fun Project.setDefaultPomFields(mavenPublication: MavenPublication) {
   mavenPublication.groupId = findProperty("GROUP") as String?
-  mavenPublication.version = findProperty("VERSION_NAME") as String?
+  mavenPublication.version = version()
 
   mavenPublication.pom {
     name.set(findProperty("POM_NAME") as String?)

build-logic/src/main/kotlin/api.kt

@@ -1,11 +1,16 @@
 import app.cash.licensee.LicenseeExtension
 import app.cash.licensee.UnusedAction
+import com.gradleup.librarian.gradle.Librarian
+import nmcp.NmcpAggregationExtension
 import org.gradle.api.Project
 import org.gradle.api.Task
 import org.gradle.api.tasks.TaskProvider
 import org.gradle.jvm.tasks.Jar
 import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
+import kotlin.time.Duration.Companion.hours
+import kotlin.time.Duration.Companion.minutes
+import kotlin.time.toJavaDuration
 
 class AndroidOptions(
     val withCompose: Boolean,
@@ -15,6 +20,10 @@ class KotlinCompilerOptions(
     val version: KotlinVersion = KotlinVersion.KOTLIN_2_0,
 )
 
+fun Project.version(): String {
+  return Librarian.version(property("VERSION_NAME")!!.toString())
+}
+
 fun Project.apolloLibrary(
     namespace: String,
     jvmTarget: Int? = null,
@@ -28,7 +37,7 @@ fun Project.apolloLibrary(
     kotlinCompilerOptions: KotlinCompilerOptions = KotlinCompilerOptions(),
 ) {
   group = property("GROUP")!!
-  version = property("VERSION_NAME")!!
+  version = version()
 
   if (androidOptions != null) {
     configureAndroid(namespace, androidOptions)
@@ -131,5 +140,28 @@ fun Project.apolloTest(
 fun Project.apolloRoot(ciBuild: TaskProvider<Task>) {
   configureNode()
   rootSetup(ciBuild)
+
+  pluginManager.apply("com.gradleup.nmcp.aggregation")
+  val nmcpAggregation = extensions.getByType(NmcpAggregationExtension::class.java)
+  nmcpAggregation.apply {
+    centralPortal {
+      username.set(System.getenv("LIBRARIAN_SONATYPE_USERNAME"))
+      password.set(System.getenv("LIBRARIAN_SONATYPE_PASSWORD"))
+      validationTimeout.set(30.minutes.toJavaDuration())
+      publishingTimeout.set(1.hours.toJavaDuration())
+    }
+  }
+
+  Librarian.registerGcsTask(
+      this,
+      provider { "apollo-previews" },
+      provider { "m2" },
+      provider { System.getenv("LIBRARIAN_GOOGLE_SERVICES_JSON") },
+      nmcpAggregation.allFiles
+  )
+
+  subprojects.forEach {
+    configurations.getByName("nmcpAggregation").dependencies.add(dependencies.create(it))
+  }
 }
 

build.gradle.kts

@@ -17,45 +17,6 @@ fun subprojectTasks(name: String): List<Task> {
   }
 }
 
-fun isTag(): Boolean {
-  val ref = System.getenv("GITHUB_REF")
-
-  return ref?.startsWith("refs/tags/") == true
-}
-
-fun shouldPublishSnapshots(): Boolean {
-  val eventName = System.getenv("GITHUB_EVENT_NAME")
-  val ref = System.getenv("GITHUB_REF")
-
-  return eventName == "push" && (ref == "refs/heads/main")
-}
-
-tasks.register("ciPublishSnapshot") {
-  description = "Publishes a SNAPSHOT"
-
-  if (shouldPublishSnapshots()) {
-    dependsOn(subprojectTasks("publishAllPublicationsToOssSnapshotsRepository"))
-  } else {
-    doFirst {
-      error("We are not on a branch, fail snapshots publishing")
-    }
-  }
-}
-
-tasks.register("ciPublishRelease") {
-  description = "Publishes all artifacts to OSSRH and the Gradle Plugin Portal"
-
-  if (isTag()) {
-    dependsOn(subprojectTasks("publishAllPublicationsToOssStagingRepository"))
-    // Only publish plugins to the Gradle portal if everything else succeeded
-    finalizedBy(":apollo-gradle-plugin:publishPlugins")
-  } else {
-    doFirst {
-      error("We are not on a tag, fail release publishing")
-    }
-  }
-
-}
 
 tasks.register("ciTestsGradle") {
   description = "Execute the Gradle tests (slow)"

gradle/libraries.toml

@@ -2,7 +2,7 @@
 # The version we use by default in tests and benchmarks
 # Can be as high as IJ supports
 # Consult https://kotlinlang.org/docs/multiplatform-compatibility-guide.html#version-compatibility for compatibility with KGP
-android-plugin = "8.2.2"
+android-plugin = "8.7.2"
 # The version we compile against
 android-plugin-min = "8.0.0"
 # The version used by the 'android-plugin-max' test
@@ -184,7 +184,8 @@ androidx-test-runner = "androidx.test:runner:1.6.2"
 truth = { group = "com.google.truth", name = "truth", version.ref = "truth" }
 turbine = { group = "app.cash.turbine", name = "turbine", version = "1.1.0" }
 uuid = { group = "com.benasher44", name = "uuid", version = "0.8.2" }
-vespene = { group = "net.mbonnin.vespene", name = "vespene-lib", version = "0.5" }
+librarian = "com.gradleup.librarian:librarian-gradle-plugin:0.0.10-SNAPSHOT-ffba1a28eef796c5c91a33f609761618b0ef2e5e"
+nmcp = "com.gradleup.nmcp:nmcp:1.0.1"
 slf4j-simple = "org.slf4j:slf4j-simple:2.0.13"
 slf4j-nop = "org.slf4j:slf4j-nop:2.0.13"
 licensee = "app.cash.licensee:licensee-gradle-plugin:1.12.0"

gradle/repositories.gradle.kts

@@ -42,5 +42,12 @@ listOf(pluginManagement.repositories, dependencyResolutionManagement.repositorie
         includeModule("com.gradle", "develocity-gradle-plugin")
       }
     }
+
+    exclusiveContent {
+      forRepository { maven("https://storage.googleapis.com/gradleup/m2") }
+      filter {
+        includeGroup("com.gradleup.librarian")
+      }
+    }
   }
 }