Merge pull request #1664 from joreilly/bump-apollo-cache

Bump Apollo Cache to 1.0.0-beta.0

Author: joreilly

gradle/libs.versions.toml

@@ -12,7 +12,7 @@ activity-compose = "1.11.0"
 androidx-lifecycle = "2.9.4"
 androidx-datastore = "1.1.7"
 apollo = "4.3.3"
-apollo-cache = "1.0.0-alpha.6"
+apollo-cache = "1.0.0-beta.0"
 compose = "1.9.2"
 compose-hot-reload = "1.0.0-beta09"
 composeLifecyleRuntime="2.9.4"

shared/build.gradle.kts

@@ -238,7 +238,7 @@ apollo {
         }
 
         plugin(libs.apollo.normalized.cache.compiler.plugin.get()) {
-            argument("packageName", packageName.get())
+            argument("com.apollographql.cache.packageName", packageName.get())
         }
     }
 }

shared/src/commonMain/graphql/extra.graphqls

@@ -1,11 +1,8 @@
 extend schema
+@link(url: "https://specs.apollo.dev/kotlin_labs/v0.3")
 @link(
-    url: "https://specs.apollo.dev/kotlin_labs/v0.3",
-    import: ["@typePolicy", "@fieldPolicy"]
-)
-@link(
-    url: "https://specs.apollo.dev/cache/v0.1",
-    import: ["@cacheControl", "@cacheControlField"]
+    url: "https://specs.apollo.dev/cache/v0.3",
+    import: ["@typePolicy", "@fieldPolicy", "@cacheControl", "@cacheControlField"]
 )
 
 extend type Venue

shared/src/commonMain/kotlin/dev/johnoreilly/confetti/ApolloClientCache.kt

@@ -10,13 +10,9 @@ import com.apollographql.apollo.exception.ApolloException
 import com.apollographql.apollo.exception.ApolloHttpException
 import com.apollographql.apollo.interceptor.ApolloInterceptor
 import com.apollographql.apollo.interceptor.ApolloInterceptorChain
-import com.apollographql.cache.normalized.api.CacheControlCacheResolver
-import com.apollographql.cache.normalized.api.SchemaCoordinatesMaxAgeProvider
 import com.apollographql.cache.normalized.apolloStore
 import com.apollographql.cache.normalized.maxStale
-import com.apollographql.cache.normalized.normalizedCache
-import com.apollographql.cache.normalized.storeReceivedDate
-import dev.johnoreilly.confetti.cache.Cache
+import dev.johnoreilly.confetti.cache.Cache.cache
 import dev.johnoreilly.confetti.di.getNormalizedCacheFactory
 import dev.johnoreilly.confetti.utils.registerApolloDebugServer
 import dev.johnoreilly.confetti.utils.unregisterApolloDebugServer
@@ -121,18 +117,11 @@ class ApolloClientCache : KoinComponent {
 //                }
 //            )
             .addHttpHeader("conference", conference)
-            .normalizedCache(
+            .cache(
                 normalizedCacheFactory,
                 enableOptimisticUpdates = true,
                 writeToCacheAsynchronously = writeToCacheAsynchronously,
-                cacheResolver = CacheControlCacheResolver(
-                    SchemaCoordinatesMaxAgeProvider(
-                        maxAges = Cache.maxAges,
-                        defaultMaxAge = Duration.INFINITE,
-                    )
-                ),
             )
-            .storeReceivedDate(true)
             .maxStale(Duration.INFINITE)
             .autoPersistedQueries()
             .addInterceptor(tokenProviderInterceptor)