Skip to content

Use 1.0.0-alpha.1 in samples #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 29, 2025
Merged

Use 1.0.0-alpha.1 in samples #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions samples/pagination/manual/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}

Expand Down Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions samples/pagination/pagination-support-with-jetpack-paging/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}

Expand Down Expand Up @@ -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")
Expand Down
13 changes: 5 additions & 8 deletions ...-paging/app/src/main/kotlin/com/example/apollokotlinpaginationsample/repository/Apollo.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions samples/pagination/pagination-support/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}

Expand Down Expand Up @@ -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")
Expand Down
15 changes: 5 additions & 10 deletions ...support/app/src/main/kotlin/com/example/apollokotlinpaginationsample/repository/Apollo.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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()
Expand Down