Update librarian and workflows (#191)

* Update librarian and workflows

* Update API dump

* Simplify/rename jobs

Author: BoD

.github/workflows/build-pull-request.yaml

@@ -1,16 +1,14 @@
-name: Build pull request
-
 on: pull_request
 
 env:
   DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
 
 jobs:
-  build-pull-request:
+  check-pull-request:
     runs-on: macos-latest
 
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
       - run: |
-          ./gradlew build
+          ./gradlew build 
           ./gradlew -p tests build

.github/workflows/prepare-release.yaml

@@ -1,5 +1,3 @@
-name: Publish documentation
-
 on:
   push:
     branches: ["main"]

.github/workflows/publish-docs.yaml

@@ -1,5 +1,3 @@
-name: Publish release
-
 on:
   workflow_dispatch:
   push:
@@ -13,11 +11,9 @@ jobs:
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.1.7
       - run: |
-          ./gradlew librarianPublishToMavenCentral
-          gh release create $GITHUB_REF_NAME --title $GITHUB_REF_NAME --verify-tag --notes-from-tag
+          LIBRARIAN_RELEASE=true ./gradlew librarianPublishToMavenCentral
         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 }}
-          GH_TOKEN: ${{ github.token }}
+          LIBRARIAN_SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+          LIBRARIAN_SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+          LIBRARIAN_SIGNING_PRIVATE_KEY: ${{ secrets.SONATYPE_GPG_KEY }}
+          LIBRARIAN_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.SONATYPE_GPG_KEY_PASSWORD }}

.github/workflows/publish-release.yaml

@@ -1,5 +1,3 @@
-name: Publish snapshot
-
 on:
   push:
     branches: [ main ]
@@ -12,7 +10,5 @@ jobs:
       - run: |
           ./gradlew librarianPublishToSnapshots
         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_SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+          LIBRARIAN_SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}

.github/workflows/publish-snapshot.yaml

@@ -6,7 +6,7 @@ okio = "3.9.0"
 atomicfu = "0.23.1" # Must be the same version as the one used by apollo-testing-support or native compilation will fail
 sqldelight = "2.1.0"
 androidx-sqlite = "2.3.1"
-librarian = "0.0.8-SNAPSHOT-cd822254de75426f8f047a50bae467da872cc912"
+librarian = "0.0.10-SNAPSHOT-48478069e3d33d7a116b07674d29ba0a23bded77"
 kotlinx-coroutines = "1.9.0"
 copyWebpackPlugin = "9.1.0"
 sqlJs = "1.8.0"

gradle/libs.versions.toml

@@ -6,6 +6,10 @@ listOf(pluginManagement.repositories, dependencyResolutionManagement.repositorie
     mavenCentral()
     google()
     gradlePluginPortal()
-    maven("https://storage.googleapis.com/gradleup/m2")
+    maven("https://storage.googleapis.com/gradleup/m2") {
+      content {
+        includeGroup("com.gradleup.librarian")
+      }
+    }
   }
 }

gradle/repositories.gradle.kts

@@ -4,8 +4,6 @@ kotlin.compatibility=2.0.21
 kdoc.olderVersions=
 kdoc.artifactId=kdoc
 
-sonatype.backend=S01
-
 pom.groupId=com.apollographql.cache
 pom.version=1.0.0-alpha.4-SNAPSHOT
 pom.description=Apollo Kotlin Normalized Cache

librarian.root.properties

@@ -98,7 +98,7 @@ final class com.apollographql.cache.normalized.sql/SqlNormalizedCache : com.apol
     final suspend fun trim(kotlin/Long, kotlin/Float): kotlin/Long // com.apollographql.cache.normalized.sql/SqlNormalizedCache.trim|trim(kotlin.Long;kotlin.Float){}[0]
 }
 
-final const val com.apollographql.cache.normalized.sql/VERSION // com.apollographql.cache.normalized.sql/VERSION|{}VERSION[0]
+final val com.apollographql.cache.normalized.sql/VERSION // com.apollographql.cache.normalized.sql/VERSION|{}VERSION[0]
     final fun <get-VERSION>(): kotlin/String // com.apollographql.cache.normalized.sql/VERSION.<get-VERSION>|<get-VERSION>(){}[0]
 
 final fun com.apollographql.cache.normalized.sql/SqlNormalizedCacheFactory(app.cash.sqldelight.db/SqlDriver): com.apollographql.cache.normalized.api/NormalizedCacheFactory // com.apollographql.cache.normalized.sql/SqlNormalizedCacheFactory|SqlNormalizedCacheFactory(app.cash.sqldelight.db.SqlDriver){}[0]

normalized-cache-sqlite/api/normalized-cache-sqlite.klib.api

@@ -578,9 +578,6 @@ final object com.apollographql.cache.normalized.api/EmptyMetadataGenerator : com
     final fun metadataForObject(kotlin/Any?, com.apollographql.cache.normalized.api/MetadataGeneratorContext): kotlin.collections/Map<kotlin/String, kotlin/Any?> // com.apollographql.cache.normalized.api/EmptyMetadataGenerator.metadataForObject|metadataForObject(kotlin.Any?;com.apollographql.cache.normalized.api.MetadataGeneratorContext){}[0]
 }
 
-final const val com.apollographql.cache.normalized/VERSION // com.apollographql.cache.normalized/VERSION|{}VERSION[0]
-    final fun <get-VERSION>(): kotlin/String // com.apollographql.cache.normalized/VERSION.<get-VERSION>|<get-VERSION>(){}[0]
-
 final val com.apollographql.cache.normalized.api/ConnectionRecordMerger // com.apollographql.cache.normalized.api/ConnectionRecordMerger|{}ConnectionRecordMerger[0]
     final fun <get-ConnectionRecordMerger>(): com.apollographql.cache.normalized.api/FieldRecordMerger // com.apollographql.cache.normalized.api/ConnectionRecordMerger.<get-ConnectionRecordMerger>|<get-ConnectionRecordMerger>(){}[0]
 final val com.apollographql.cache.normalized.api/DefaultMaxAgeProvider // com.apollographql.cache.normalized.api/DefaultMaxAgeProvider|{}DefaultMaxAgeProvider[0]
@@ -599,6 +596,8 @@ final val com.apollographql.cache.normalized/NetworkFirstInterceptor // com.apol
     final fun <get-NetworkFirstInterceptor>(): com.apollographql.apollo.interceptor/ApolloInterceptor // com.apollographql.cache.normalized/NetworkFirstInterceptor.<get-NetworkFirstInterceptor>|<get-NetworkFirstInterceptor>(){}[0]
 final val com.apollographql.cache.normalized/NetworkOnlyInterceptor // com.apollographql.cache.normalized/NetworkOnlyInterceptor|{}NetworkOnlyInterceptor[0]
     final fun <get-NetworkOnlyInterceptor>(): com.apollographql.apollo.interceptor/ApolloInterceptor // com.apollographql.cache.normalized/NetworkOnlyInterceptor.<get-NetworkOnlyInterceptor>|<get-NetworkOnlyInterceptor>(){}[0]
+final val com.apollographql.cache.normalized/VERSION // com.apollographql.cache.normalized/VERSION|{}VERSION[0]
+    final fun <get-VERSION>(): kotlin/String // com.apollographql.cache.normalized/VERSION.<get-VERSION>|<get-VERSION>(){}[0]
 final val com.apollographql.cache.normalized/apolloStore // com.apollographql.cache.normalized/apolloStore|@com.apollographql.apollo.ApolloClient{}apolloStore[0]
     final fun (com.apollographql.apollo/ApolloClient).<get-apolloStore>(): com.apollographql.cache.normalized/ApolloStore // com.apollographql.cache.normalized/apolloStore.<get-apolloStore>|<get-apolloStore>@com.apollographql.apollo.ApolloClient(){}[0]
 final val com.apollographql.cache.normalized/cacheHeaders // com.apollographql.cache.normalized/cacheHeaders|@com.apollographql.apollo.api.ApolloResponse<0:0>{0§<com.apollographql.apollo.api.Operation.Data>}cacheHeaders[0]