diff --git a/samples/pagination/manual/app/build.gradle.kts b/samples/pagination/manual/app/build.gradle.kts index 2980809f..19056a45 100644 --- a/samples/pagination/manual/app/build.gradle.kts +++ b/samples/pagination/manual/app/build.gradle.kts @@ -3,7 +3,7 @@ fun prop(key: String) = project.findProperty(key).toString() plugins { id("com.android.application") id("org.jetbrains.kotlin.android") - id("com.apollographql.apollo").version("4.1.1") + id("com.apollographql.apollo").version("4.2.0") id("org.jetbrains.kotlin.plugin.compose").version("2.1.10") } @@ -77,7 +77,7 @@ dependencies { implementation("androidx.compose.material3:material3") implementation("com.apollographql.apollo:apollo-runtime") - implementation("com.apollographql.cache:normalized-cache-sqlite-incubating:0.0.8") + implementation("com.apollographql.cache:normalized-cache-sqlite:1.0.0-alpha.1") debugImplementation("androidx.compose.ui:ui-tooling") debugImplementation("androidx.compose.ui:ui-test-manifest") diff --git a/samples/pagination/pagination-support-with-jetpack-paging/app/build.gradle.kts b/samples/pagination/pagination-support-with-jetpack-paging/app/build.gradle.kts index 725fc09c..9a28c5ad 100644 --- a/samples/pagination/pagination-support-with-jetpack-paging/app/build.gradle.kts +++ b/samples/pagination/pagination-support-with-jetpack-paging/app/build.gradle.kts @@ -3,7 +3,7 @@ fun prop(key: String) = project.findProperty(key).toString() plugins { id("com.android.application") id("org.jetbrains.kotlin.android") - id("com.apollographql.apollo").version("4.1.1") + id("com.apollographql.apollo").version("4.2.0") id("org.jetbrains.kotlin.plugin.compose").version("2.1.10") } @@ -77,7 +77,7 @@ dependencies { implementation("androidx.compose.material3:material3") implementation("com.apollographql.apollo:apollo-runtime") - implementation("com.apollographql.cache:normalized-cache-sqlite-incubating:0.0.8") + implementation("com.apollographql.cache:normalized-cache-sqlite:1.0.0-alpha.1") implementation("androidx.paging:paging-runtime-ktx:3.3.6") implementation("androidx.paging:paging-compose:3.3.6") diff --git a/samples/pagination/pagination-support-with-jetpack-paging/app/src/main/kotlin/com/example/apollokotlinpaginationsample/repository/Apollo.kt b/samples/pagination/pagination-support-with-jetpack-paging/app/src/main/kotlin/com/example/apollokotlinpaginationsample/repository/Apollo.kt index b6b9e4e3..5ad5bacc 100644 --- a/samples/pagination/pagination-support-with-jetpack-paging/app/src/main/kotlin/com/example/apollokotlinpaginationsample/repository/Apollo.kt +++ b/samples/pagination/pagination-support-with-jetpack-paging/app/src/main/kotlin/com/example/apollokotlinpaginationsample/repository/Apollo.kt @@ -10,14 +10,13 @@ import androidx.paging.RemoteMediator import com.apollographql.apollo.ApolloClient import com.apollographql.apollo.api.Optional import com.apollographql.apollo.exception.ApolloGraphQLException -import com.apollographql.cache.normalized.ApolloStore import com.apollographql.cache.normalized.FetchPolicy import com.apollographql.cache.normalized.api.ConnectionMetadataGenerator import com.apollographql.cache.normalized.api.ConnectionRecordMerger import com.apollographql.cache.normalized.fetchPolicy import com.apollographql.cache.normalized.memory.MemoryCacheFactory +import com.apollographql.cache.normalized.normalizedCache import com.apollographql.cache.normalized.sql.SqlNormalizedCacheFactory -import com.apollographql.cache.normalized.store import com.apollographql.cache.normalized.watch import com.example.apollokotlinpaginationsample.Application import com.example.apollokotlinpaginationsample.BuildConfig @@ -47,12 +46,10 @@ val apolloClient: ApolloClient by lazy { ) // Normalized cache - .store( - ApolloStore( - normalizedCacheFactory = memoryThenSqlCache, - metadataGenerator = ConnectionMetadataGenerator(Pagination.connectionTypes), - recordMerger = ConnectionRecordMerger - ) + .normalizedCache( + normalizedCacheFactory = memoryThenSqlCache, + metadataGenerator = ConnectionMetadataGenerator(Pagination.connectionTypes), + recordMerger = ConnectionRecordMerger ) .build() diff --git a/samples/pagination/pagination-support/app/build.gradle.kts b/samples/pagination/pagination-support/app/build.gradle.kts index 2980809f..19056a45 100644 --- a/samples/pagination/pagination-support/app/build.gradle.kts +++ b/samples/pagination/pagination-support/app/build.gradle.kts @@ -3,7 +3,7 @@ fun prop(key: String) = project.findProperty(key).toString() plugins { id("com.android.application") id("org.jetbrains.kotlin.android") - id("com.apollographql.apollo").version("4.1.1") + id("com.apollographql.apollo").version("4.2.0") id("org.jetbrains.kotlin.plugin.compose").version("2.1.10") } @@ -77,7 +77,7 @@ dependencies { implementation("androidx.compose.material3:material3") implementation("com.apollographql.apollo:apollo-runtime") - implementation("com.apollographql.cache:normalized-cache-sqlite-incubating:0.0.8") + implementation("com.apollographql.cache:normalized-cache-sqlite:1.0.0-alpha.1") debugImplementation("androidx.compose.ui:ui-tooling") debugImplementation("androidx.compose.ui:ui-test-manifest") diff --git a/samples/pagination/pagination-support/app/src/main/kotlin/com/example/apollokotlinpaginationsample/repository/Apollo.kt b/samples/pagination/pagination-support/app/src/main/kotlin/com/example/apollokotlinpaginationsample/repository/Apollo.kt index a9f01e2c..70f20e6c 100644 --- a/samples/pagination/pagination-support/app/src/main/kotlin/com/example/apollokotlinpaginationsample/repository/Apollo.kt +++ b/samples/pagination/pagination-support/app/src/main/kotlin/com/example/apollokotlinpaginationsample/repository/Apollo.kt @@ -2,16 +2,13 @@ package com.example.apollokotlinpaginationsample.repository import com.apollographql.apollo.ApolloClient import com.apollographql.apollo.api.Optional -import com.apollographql.cache.normalized.ApolloStore import com.apollographql.cache.normalized.FetchPolicy import com.apollographql.cache.normalized.api.ConnectionMetadataGenerator import com.apollographql.cache.normalized.api.ConnectionRecordMerger -import com.apollographql.cache.normalized.api.FieldPolicyCacheResolver -import com.apollographql.cache.normalized.api.TypePolicyCacheKeyGenerator import com.apollographql.cache.normalized.fetchPolicy import com.apollographql.cache.normalized.memory.MemoryCacheFactory +import com.apollographql.cache.normalized.normalizedCache import com.apollographql.cache.normalized.sql.SqlNormalizedCacheFactory -import com.apollographql.cache.normalized.store import com.example.apollokotlinpaginationsample.Application import com.example.apollokotlinpaginationsample.BuildConfig import com.example.apollokotlinpaginationsample.graphql.RepositoryListQuery @@ -37,12 +34,10 @@ val apolloClient: ApolloClient by lazy { ) // Normalized cache - .store( - ApolloStore( - normalizedCacheFactory = memoryThenSqlCache, - metadataGenerator = ConnectionMetadataGenerator(Pagination.connectionTypes), - recordMerger = ConnectionRecordMerger - ) + .normalizedCache( + normalizedCacheFactory = memoryThenSqlCache, + metadataGenerator = ConnectionMetadataGenerator(Pagination.connectionTypes), + recordMerger = ConnectionRecordMerger ) .build()