Merge pull request #1086 from paug/add-2024-api

Add 2024 API
paug · Apr 8, 2024 · 2b0277c · 2b0277c
2 parents dc31e70 + e271e50
commit 2b0277c
Show file tree

Hide file tree

Showing 30 changed files with 1,421 additions and 4,927 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,11 +1,3 @@
-@Suppress("DSL_SCOPE_VIOLATION")
-plugins {
-}
-
-tasks.register("clean", Delete::class) {
-    delete(rootProject.buildDir)
-}
-
 tasks.register("setupCredentials") {
     fun File.writeEnv(name:String) {
         parentFile.mkdirs()

diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
@@ -9,13 +9,10 @@ dependencyResolutionManagement {
 pluginManagement {
     listOf(repositories, dependencyResolutionManagement.repositories).forEach {
         it.apply {
-            // For Apollo Kotlin snapshots
-            maven {
-                url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
-            }
             mavenCentral()
             google()
             gradlePluginPortal()
+            maven("https://storage.googleapis.com/martin-maven/m2/")
         }
     }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@ accompanist = "0.30.0"
 activity-compose = "1.7.0"
 androidx-lifecycle = "2.6.1"
 androidx-datastore = "1.1.0-alpha01"
-apollo = "4.0.0-SNAPSHOT"
+apollo = "4.0.0-fork.0"
 compose = "1.4.0"
 compose-compiler = "1.4.4-dev-k1.8.20-f6ae19e64ff"
 compose-material-3 = "1.0.1"
@@ -150,7 +150,8 @@ wear-compose-navigation = "androidx.wear.compose:compose-navigation:1.2.0-alpha0
 wire-runtime = "com.squareup.wire:wire-runtime:4.5.3"
 xoxo = "net.mbonnin.xoxo:xoxo:0.3"
 napier = "io.github.aakira:napier:2.6.1"
-
+apollo-execution-ktor = {module = "com.apollographql.apollo3:apollo-execution-ktor", version.ref = "apollo"}
+apollo-ksp-incubating = {module = "com.apollographql.apollo3:apollo-ksp-incubating", version.ref = "apollo"}
 [bundles]
 multiplatform-settings = ["multiplatform-settings", "multiplatform-settings-coroutines"]
 apollo = ["apollo-normalized-cache-in-memory", "apollo-normalized-cache-sqlite", "apollo-adapters"]
diff --git a/service-graphql/README.md b/service-graphql/README.md
diff --git a/service-graphql/build.gradle.kts b/service-graphql/build.gradle.kts
diff --git a/service-graphql/index.yaml b/service-graphql/index.yaml
diff --git a/service-graphql/src/main/appengine/app.yaml b/service-graphql/src/main/appengine/app.yaml
diff --git a/service-graphql/src/main/kotlin/am/backend/CacheControlInstrumentation.kt b/service-graphql/src/main/kotlin/am/backend/CacheControlInstrumentation.kt