Switch publication to the central portal (#6581)

* Switch to the central portal

* remove intellij-plugin

* remove other instance of intellij-plugin

* keep versions in sync

* update package-lock.json

* fix test with Gradle 9

Author: martinbonnin

.github/workflows/preview.yml

@@ -28,9 +28,7 @@ jobs:
           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
+          ./gradlew librarianPublishToGcs
         env:
-          GOOGLE_SERVICES_JSON: ${{ secrets.GOOGLE_SERVICES_JSON }}
+          LIBRARIAN_GOOGLE_SERVICES_JSON: ${{ secrets.GOOGLE_SERVICES_JSON }}
           GITHUB_TOKEN: ${{ github.token }}

.github/workflows/push.yml

@@ -23,15 +23,11 @@ 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 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
+          ./gradlew nmcpPublishAggregationToCentralPortal
         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 }}
           GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
           GPG_PRIVATE_KEY_PASSWORD: ${{ secrets.GPG_PRIVATE_KEY_PASSWORD }}

build-logic/build.gradle.kts

@@ -31,7 +31,7 @@ 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.kotlinx.serialization.json)
   implementation(libs.poet.java)
   implementation(libs.poet.kotlin)
@@ -49,7 +49,6 @@ dependencies {
   runtimeOnly(libs.atomicfu.plugin)
 
   runtimeOnly(libs.sqldelight.plugin)
-  runtimeOnly(libs.gradle.publish.plugin)
   runtimeOnly(libs.benmanes.versions)
   runtimeOnly(libs.gratatouille)
   runtimeOnly(libs.kotlinx.binarycompatibilityvalidator)

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 {
@@ -171,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")
 
@@ -325,34 +296,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 {
@@ -370,7 +318,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")) {

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

@@ -1,5 +1,7 @@
 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
@@ -131,5 +133,27 @@ 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"))
+      publishingType.set("USER_MANAGED")
+    }
+  }
+
+  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

@@ -30,32 +30,6 @@ fun shouldPublishSnapshots(): Boolean {
   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)"
@@ -71,7 +45,7 @@ tasks.register("ciTestsNoGradle") {
 
 
   subprojects {
-    if (name !in setOf("apollo-gradle-plugin", "intellij-plugin")) {
+    if (name !in setOf("apollo-gradle-plugin")) {
       dependsOn(tasks.matching { it.name == "test" })
     }
     dependsOn(tasks.matching { it.name == "jvmTest" })
@@ -136,8 +110,6 @@ configure<kotlinx.validation.ApiValidationExtension> {
           "com.apollographql.apollo.runtime.java.network.http.internal",
       )
   )
-
-  ignoredProjects.add("intellij-plugin")
   ignoredProjects.add("apollo-testing-support-internal")
 }
 

gradle.properties

@@ -1,6 +1,6 @@
 # Publishing defaults, could ultimately be moved to build scripts
 GROUP=com.apollographql.apollo
-VERSION_NAME=5.0.0-SNAPSHOT
+VERSION_NAME=5.0.0-alpha.0-SNAPSHOT
 
 POM_URL=https://github.com/apollographql/apollo-kotlin/
 POM_SCM_URL=https://github.com/apollographql/apollo-kotlin/

gradle/libraries.toml

@@ -15,7 +15,7 @@ android-sdkversion-benchmark-min = "24"
 android-sdkversion-target = "30"
 androidx-sqlite = "2.3.1"
 # This is used by the gradle integration tests to get the artifacts locally
-apollo = "5.0.0-SNAPSHOT"
+apollo = "5.0.0-alpha.0-SNAPSHOT"
 apollo-execution = "0.1.0"
 apollo-normalizedcache-incubating = "1.0.0-alpha.3"
 # Used by the apollo-tooling project which uses a published version of Apollo
@@ -108,7 +108,6 @@ gratatouille = { group = "com.gradleup.gratatouille", name = "gratatouille-gradl
 # Keep in sync with MIN_GRADLE_VERSION
 gradle-api-min = { group = "dev.gradleplugins", name = "gradle-api", version = "8.0" }
 gradle-japicmp-plugin = { group = "me.champeau.gradle", name = "japicmp-gradle-plugin", version = "0.2.8" }
-gradle-publish-plugin = { group = "com.gradle.publish", name = "plugin-publish-plugin", version = "1.1.0" }
 guava-jre = { group = "com.google.guava", name = "guava", version.ref = "guava" }
 http4k-bom = "org.http4k:http4k-bom:5.8.0.0"
 http4k-core = { module = "org.http4k:http4k-core" }
@@ -188,7 +187,7 @@ 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.8-SNAPSHOT-30f5819e9747430b54e96ebb8d680e0fbe30f563"
 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

@@ -32,14 +32,18 @@ listOf(pluginManagement.repositories, dependencyResolutionManagement.repositorie
       }
     }
 
+    exclusiveContent {
+      forRepository { maven("https://storage.googleapis.com/gradleup/m2") }
+      filter {
+        includeGroup("com.gradleup.librarian")
+      }
+    }
+
     exclusiveContent {
       forRepository(::gradlePluginPortal)
       filter {
-        includeModule("org.gradle.kotlin.embedded-kotlin", "org.gradle.kotlin.embedded-kotlin.gradle.plugin")
-        includeModule("org.gradle.kotlin", "gradle-kotlin-dsl-plugins")
         includeModule("me.champeau.gradle", "japicmp-gradle-plugin")
         includeModule("org.jetbrains.kotlinx", "kotlinx-benchmark-plugin")
-        includeModule("com.gradle.publish", "plugin-publish-plugin")
         includeModule("com.github.ben-manes", "gradle-versions-plugin")
         includeModule("com.gradle", "develocity-gradle-plugin")
       }