publish to GCS

martinbonnin · martinbonnin · commit ee4d29e45a3b · 2024-11-03T23:42:48.000+01:00
diff --git a/.github/workflows/publish-snapshot.yaml b/.github/workflows/publish-snapshot.yaml
@@ -12,8 +12,10 @@ jobs:
       - uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda #v3.4.2
       - run: |
           ./gradlew librarianPublishToSnapshots
+          LIBRARIAN_VERSION_SHA1=$GITHUB_SHA ./gradlew librarianPublishToGcs
         env:
           LIBRARIAN_SONATYPE_USERNAME: ${{ secrets.LIBRARIAN_SONATYPE_USERNAME }}
           LIBRARIAN_SONATYPE_PASSWORD: ${{ secrets.LIBRARIAN_SONATYPE_PASSWORD }}
           LIBRARIAN_SIGNING_PRIVATE_KEY: ${{ secrets.LIBRARIAN_SIGNING_PRIVATE_KEY }}
           LIBRARIAN_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.LIBRARIAN_SIGNING_PRIVATE_KEY_PASSWORD }}
+          LIBRARIAN_GOOGLE_SERVICES_JSON: ${{ secrets.LIBRARIAN_GOOGLE_SERVICES_JSON }}
diff --git a/apollo-execution-gradle-plugin/build.gradle.kts b/apollo-execution-gradle-plugin/build.gradle.kts
@@ -1,11 +1,11 @@
-import com.gradleup.librarian.gradle.librarianModule
+import com.gradleup.librarian.gradle.Librarian
 
 plugins {
   id("org.jetbrains.kotlin.jvm")
   id("java-gradle-plugin")
 }
 
-librarianModule(true)
+Librarian.module(project)
 
 dependencies {
   compileOnly(libs.ksp.gradle)
diff --git a/apollo-execution-gradle-plugin/librarian.module.properties b/apollo-execution-gradle-plugin/librarian.module.properties
diff --git a/apollo-execution-http4k/build.gradle.kts b/apollo-execution-http4k/build.gradle.kts
@@ -1,10 +1,10 @@
-import com.gradleup.librarian.gradle.librarianModule
+import com.gradleup.librarian.gradle.Librarian
 
 plugins {
   id("org.jetbrains.kotlin.multiplatform")
 }
 
-librarianModule(true)
+Librarian.module(project)
 
 kotlin {
   jvm()
diff --git a/apollo-execution-ktor/build.gradle.kts b/apollo-execution-ktor/build.gradle.kts
@@ -1,10 +1,10 @@
-import com.gradleup.librarian.gradle.librarianModule
+import com.gradleup.librarian.gradle.Librarian
 
 plugins {
   id("org.jetbrains.kotlin.multiplatform")
 }
 
-librarianModule(true)
+Librarian.module(project)
 
 kotlin {
   jvm()
diff --git a/apollo-execution-processor/build.gradle.kts b/apollo-execution-processor/build.gradle.kts
@@ -1,10 +1,10 @@
-import com.gradleup.librarian.gradle.librarianModule
+import com.gradleup.librarian.gradle.Librarian
 
 plugins {
   id("org.jetbrains.kotlin.jvm")
 }
 
-librarianModule(true)
+Librarian.module(project)
 
 dependencies {
   implementation(libs.ksp.api)
diff --git a/apollo-execution-processor/librarian.module.properties b/apollo-execution-processor/librarian.module.properties
diff --git a/apollo-execution-reporting/build.gradle.kts b/apollo-execution-reporting/build.gradle.kts
@@ -1,11 +1,11 @@
-import com.gradleup.librarian.gradle.librarianModule
+import com.gradleup.librarian.gradle.Librarian
 
 plugins {
   id("org.jetbrains.kotlin.multiplatform")
   id("com.squareup.wire")
 }
 
-librarianModule(true)
+Librarian.module(project)
 
 kotlin {
   jvm()
diff --git a/apollo-execution-runtime/build.gradle.kts b/apollo-execution-runtime/build.gradle.kts
@@ -1,10 +1,10 @@
-import com.gradleup.librarian.gradle.librarianModule
+import com.gradleup.librarian.gradle.Librarian
 
 plugins {
   id("org.jetbrains.kotlin.multiplatform")
 }
 
-librarianModule(true)
+Librarian.module(project)
 
 kotlin {
   jvm()
diff --git a/apollo-execution-spring/build.gradle.kts b/apollo-execution-spring/build.gradle.kts
@@ -1,10 +1,10 @@
-import com.gradleup.librarian.gradle.librarianModule
+import com.gradleup.librarian.gradle.Librarian
 
 plugins {
   id("org.jetbrains.kotlin.multiplatform")
 }
 
-librarianModule(true)
+Librarian.module(project)
 
 kotlin {
   jvm()
diff --git a/apollo-execution-subgraph/build.gradle.kts b/apollo-execution-subgraph/build.gradle.kts
@@ -1,10 +1,10 @@
-import com.gradleup.librarian.gradle.librarianModule
+import com.gradleup.librarian.gradle.Librarian
 
 plugins {
   id("org.jetbrains.kotlin.multiplatform")
 }
 
-librarianModule(true)
+Librarian.module(project)
 
 kotlin {
   jvm()
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,8 @@
-import com.gradleup.librarian.gradle.librarianRoot
+import com.gradleup.librarian.gradle.Librarian
 
+plugins {
+    id("base")
+}
 buildscript {
     dependencies {
         classpath(libs.kotlin.gradle.plugin)
@@ -8,9 +11,6 @@ buildscript {
         // workaround for https://github.com/Kotlin/kotlinx.serialization/issues/2803
         classpath(libs.kotlinx.serialization.core)
     }
-    repositories {
-        mavenCentral()
-    }
 }
 
-librarianRoot()
+Librarian.root(project)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -35,7 +35,7 @@ http4k-core = { module = "org.http4k:http4k-core" }
 http4k-realtime-core = { module = "org.http4k:http4k-realtime-core" }
 http4k-server-undertow = { module = "org.http4k:http4k-server-undertow" }
 http4k-server-netty = { module = "org.http4k:http4k-server-netty" }
-librarian-gradle-plugin = "com.gradleup.librarian:librarian-gradle-plugin:0.0.6"
+librarian-gradle-plugin = "com.gradleup.librarian:librarian-gradle-plugin:0.0.7-SNAPSHOT-42fbb338afaad8f4566717a4df6afa4a2dc24e77"
 apollo-execution-runtime = { module = "com.apollographql.execution:apollo-execution-runtime" }
 apollo-execution-subgraph = { module = "com.apollographql.execution:apollo-execution-subgraph" }
 spring-webflux = "org.springframework:spring-webflux:6.1.10"
diff --git a/librarian.root.properties b/librarian.root.properties
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,6 +1,12 @@
 pluginManagement {
   listOf(repositories, dependencyResolutionManagement.repositories).forEach {
     it.mavenCentral()
+    it.exclusiveContent {
+      forRepository { it.maven("https://storage.googleapis.com/gradleup/m2") }
+      filter {
+        includeGroup("com.gradleup.librarian")
+      }
+    }
   }
 }
 
@@ -14,3 +20,4 @@ include(
   "apollo-execution-subgraph",
   "apollo-execution-reporting"
 )
+
