Skip to content

Commit c19be33

Browse files
authored
Update dependencies (#9)
1 parent cfe2e71 commit c19be33

File tree

13 files changed

+652
-3127
lines changed

13 files changed

+652
-3127
lines changed

normalized-cache/browser/js/app/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ kotlin {
5050

5151
// Apollo
5252
implementation("com.apollographql.apollo:apollo-runtime")
53-
implementation("com.apollographql.cache:normalized-cache-sqlite:1.0.0-alpha.4")
53+
implementation("com.apollographql.cache:normalized-cache-sqlite:1.0.0-alpha.7")
5454

5555
// sqlite.js / SQLDelight
5656
implementation("app.cash.sqldelight:web-worker-driver:2.1.0")
@@ -71,8 +71,8 @@ apollo {
7171
packageName.set("com.example.browsersample.graphql")
7272

7373
@OptIn(ApolloExperimental::class)
74-
plugin("com.apollographql.cache:normalized-cache-apollo-compiler-plugin:1.0.0-alpha.4") {
75-
argument("packageName", packageName.get())
74+
plugin("com.apollographql.cache:normalized-cache-apollo-compiler-plugin:1.0.0-alpha.7") {
75+
argument("com.apollographql.cache.packageName", packageName.get())
7676
}
7777

7878
introspection {
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
2-
kotlin("multiplatform").version("2.2.0").apply(false)
2+
kotlin("multiplatform").version("2.2.20").apply(false)
33
id("org.jetbrains.compose").version("1.8.0").apply(false)
4-
kotlin("plugin.compose").version("2.2.0").apply(false)
5-
id("com.apollographql.apollo").version("4.3.1").apply(false)
4+
kotlin("plugin.compose").version("2.2.20").apply(false)
5+
id("com.apollographql.apollo").version("4.3.3").apply(false)
66
}

normalized-cache/browser/js/kotlin-js-store/yarn.lock

Lines changed: 558 additions & 320 deletions
Large diffs are not rendered by default.

normalized-cache/browser/wasmJs/app/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ kotlin {
5454

5555
// Apollo
5656
implementation("com.apollographql.apollo:apollo-runtime")
57-
implementation("com.apollographql.cache:normalized-cache-sqlite:1.0.0-alpha.4")
57+
implementation("com.apollographql.cache:normalized-cache-sqlite:1.0.0-alpha.7")
5858

5959
// sqlite.js / SQLDelight
6060
implementation("app.cash.sqldelight:web-worker-driver:2.1.0")
@@ -76,8 +76,8 @@ apollo {
7676
packageName.set("com.example.browsersample.graphql")
7777

7878
@OptIn(ApolloExperimental::class)
79-
plugin("com.apollographql.cache:normalized-cache-apollo-compiler-plugin:1.0.0-alpha.4") {
80-
argument("packageName", packageName.get())
79+
plugin("com.apollographql.cache:normalized-cache-apollo-compiler-plugin:1.0.0-alpha.7") {
80+
argument("com.apollographql.cache.packageName", packageName.get())
8181
}
8282

8383
introspection {

normalized-cache/browser/wasmJs/app/src/wasmJsMain/kotlin/com/example/browsersample/repository/Apollo.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ val apolloClient: ApolloClient by lazy {
4747
.build()
4848
}
4949

50+
@OptIn(ExperimentalWasmJsInterop::class)
5051
fun jsWorker(): Worker = js("""new Worker(new URL("sqljs.opfs.worker.js", import.meta.url))""")
5152

5253
suspend fun fetchAndMergeNextPage() {
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
2-
kotlin("multiplatform").version("2.2.0").apply(false)
2+
kotlin("multiplatform").version("2.2.20").apply(false)
33
id("org.jetbrains.compose").version("1.8.0").apply(false)
4-
kotlin("plugin.compose").version("2.2.0").apply(false)
5-
id("com.apollographql.apollo").version("4.3.1").apply(false)
4+
kotlin("plugin.compose").version("2.2.20").apply(false)
5+
id("com.apollographql.apollo").version("4.3.3").apply(false)
66
}

normalized-cache/browser/wasmJs/kotlin-js-store/wasm/yarn.lock

Lines changed: 20 additions & 2749 deletions
Large diffs are not rendered by default.

normalized-cache/pagination/manual/app/build.gradle.kts

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
@file:OptIn(ApolloExperimental::class)
22

33
import com.apollographql.apollo.annotations.ApolloExperimental
4+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
45

56
fun prop(key: String) = project.findProperty(key).toString()
67

78
plugins {
89
id("com.android.application")
910
id("org.jetbrains.kotlin.android")
10-
id("com.apollographql.apollo").version("4.3.1")
11-
id("org.jetbrains.kotlin.plugin.compose").version("2.2.0")
11+
id("com.apollographql.apollo")
12+
id("org.jetbrains.kotlin.plugin.compose")
1213
}
1314

1415
android {
@@ -45,10 +46,6 @@ android {
4546
targetCompatibility = JavaVersion.VERSION_1_8
4647
}
4748

48-
kotlinOptions {
49-
jvmTarget = "1.8"
50-
}
51-
5249
buildFeatures {
5350
compose = true
5451
buildConfig = true
@@ -61,12 +58,18 @@ android {
6158
}
6259
}
6360

61+
kotlin {
62+
compilerOptions {
63+
jvmTarget.set(JvmTarget.JVM_1_8)
64+
}
65+
}
66+
6467
apollo {
6568
service("main") {
6669
packageName.set("com.example.apollokotlinpaginationsample.graphql")
6770

68-
plugin("com.apollographql.cache:normalized-cache-apollo-compiler-plugin:1.0.0-alpha.4") {
69-
argument("packageName", packageName.get())
71+
plugin("com.apollographql.cache:normalized-cache-apollo-compiler-plugin:1.0.0-alpha.7") {
72+
argument("com.apollographql.cache.packageName", packageName.get())
7073
}
7174

7275
introspection {
@@ -78,17 +81,17 @@ apollo {
7881
}
7982

8083
dependencies {
81-
implementation("androidx.core:core-ktx:1.16.0")
82-
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.1")
83-
implementation("androidx.activity:activity-compose:1.10.1")
84-
implementation(platform("androidx.compose:compose-bom:2025.06.01"))
84+
implementation("androidx.core:core-ktx:1.17.0")
85+
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.4")
86+
implementation("androidx.activity:activity-compose:1.11.0")
87+
implementation(platform("androidx.compose:compose-bom:2025.10.00"))
8588
implementation("androidx.compose.ui:ui")
8689
implementation("androidx.compose.ui:ui-graphics")
8790
implementation("androidx.compose.ui:ui-tooling-preview")
8891
implementation("androidx.compose.material3:material3")
8992

9093
implementation("com.apollographql.apollo:apollo-runtime")
91-
implementation("com.apollographql.cache:normalized-cache-sqlite:1.0.0-alpha.4")
94+
implementation("com.apollographql.cache:normalized-cache-sqlite:1.0.0-alpha.7")
9295
implementation("com.apollographql.apollo:apollo-debug-server")
9396

9497
debugImplementation("androidx.compose.ui:ui-tooling")
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
plugins {
3-
id("com.android.application") version "8.11.0" apply false
4-
id("org.jetbrains.kotlin.android") version "2.2.0" apply false
3+
id("com.android.application").version("8.13.0").apply(false)
4+
id("org.jetbrains.kotlin.android").version("2.2.20").apply(false)
5+
id("com.apollographql.apollo").version("4.3.3").apply(false)
6+
id("org.jetbrains.kotlin.plugin.compose").version("2.2.20").apply(false)
57
}

normalized-cache/pagination/pagination-support-with-jetpack-paging/app/build.gradle.kts

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
@file:OptIn(ApolloExperimental::class)
22

33
import com.apollographql.apollo.annotations.ApolloExperimental
4+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
45

56
fun prop(key: String) = project.findProperty(key).toString()
67

78
plugins {
89
id("com.android.application")
910
id("org.jetbrains.kotlin.android")
10-
id("com.apollographql.apollo").version("4.3.1")
11-
id("org.jetbrains.kotlin.plugin.compose").version("2.2.0")
11+
id("com.apollographql.apollo")
12+
id("org.jetbrains.kotlin.plugin.compose")
1213
}
1314

1415
android {
@@ -45,10 +46,6 @@ android {
4546
targetCompatibility = JavaVersion.VERSION_1_8
4647
}
4748

48-
kotlinOptions {
49-
jvmTarget = "1.8"
50-
}
51-
5249
buildFeatures {
5350
compose = true
5451
buildConfig = true
@@ -61,12 +58,18 @@ android {
6158
}
6259
}
6360

61+
kotlin {
62+
compilerOptions {
63+
jvmTarget.set(JvmTarget.JVM_1_8)
64+
}
65+
}
66+
6467
apollo {
6568
service("main") {
6669
packageName.set("com.example.apollokotlinpaginationsample.graphql")
6770

68-
plugin("com.apollographql.cache:normalized-cache-apollo-compiler-plugin:1.0.0-alpha.4") {
69-
argument("packageName", packageName.get())
71+
plugin("com.apollographql.cache:normalized-cache-apollo-compiler-plugin:1.0.0-alpha.7") {
72+
argument("com.apollographql.cache.packageName", packageName.get())
7073
}
7174

7275
introspection {
@@ -78,18 +81,18 @@ apollo {
7881
}
7982

8083
dependencies {
81-
implementation("androidx.core:core-ktx:1.16.0")
82-
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.1")
83-
implementation("androidx.activity:activity-compose:1.10.1")
84-
implementation(platform("androidx.compose:compose-bom:2025.06.01"))
84+
implementation("androidx.core:core-ktx:1.17.0")
85+
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.9.4")
86+
implementation("androidx.activity:activity-compose:1.11.0")
87+
implementation(platform("androidx.compose:compose-bom:2025.10.00"))
8588
implementation("androidx.compose.ui:ui")
8689
implementation("androidx.compose.ui:ui-graphics")
8790
implementation("androidx.compose.ui:ui-tooling-preview")
8891
implementation("androidx.compose.material3:material3")
89-
implementation("com.apollographql.apollo:apollo-debug-server")
9092

9193
implementation("com.apollographql.apollo:apollo-runtime")
92-
implementation("com.apollographql.cache:normalized-cache-sqlite:1.0.0-alpha.4")
94+
implementation("com.apollographql.cache:normalized-cache-sqlite:1.0.0-alpha.7")
95+
implementation("com.apollographql.apollo:apollo-debug-server")
9396

9497
implementation("androidx.paging:paging-runtime-ktx:3.3.6")
9598
implementation("androidx.paging:paging-compose:3.3.6")

0 commit comments

Comments
 (0)