From f5d760729db543799f01141d42e9b5011aa7b459 Mon Sep 17 00:00:00 2001
From: John O'Reilly <oreillyj@gmail.com>
Date: Mon, 8 Jul 2024 20:06:04 +0100
Subject: [PATCH] Apollo 4.0.0-rc.1 + other dependency updates

---
 build.gradle.kts                              |  1 +
 gradle/libs.versions.toml                     | 20 +++++++++----------
 shared/build.gradle.kts                       |  8 ++++----
 .../mortycomposekmm/shared/MortyRepository.kt |  6 +++---
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index f2774c0..97c88c3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.android.library) apply false
     alias(libs.plugins.ksp) apply false
     alias(libs.plugins.kotlinMultiplatform) apply false
     alias(libs.plugins.apollo) apply(false)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8e0c22a..086dd1e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,17 +1,17 @@
 [versions]
 kotlin = "2.0.0"
-ksp = "2.0.0-1.0.21"
-kotlinx-coroutines = "1.8.1"
+ksp = "2.0.0-1.0.22"
+kotlinx-coroutines = "1.9.0-RC"
 
 androidGradlePlugin = "8.1.4"
 koin = "3.5.6"
 koinCompose = "3.5.6"
-apollo = "4.0.0-beta.6"
+apollo = "4.0.0-rc.1"
 kmpNativeCoroutines = "1.0.0-ALPHA-31"
 kmpObservableViewModel = "1.0.0-BETA-3"
 
 androidxActivity = "1.9.0"
-androidxComposeBom = "2024.05.00"
+androidxComposeBom = "2024.06.00"
 androidxPaging = "3.3.0"
 androidxNavigationCompose = "2.7.7"
 accompanist = "0.30.1"
@@ -54,11 +54,11 @@ koin-androidx-compose = { module = "io.insert-koin:koin-androidx-compose", versi
 koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin" }
 koin-test = { module = "io.insert-koin:koin-test", version.ref = "koin" }
 
-apollo-runtime = { group = "com.apollographql.apollo3", name = "apollo-runtime", version.ref = "apollo" }
-apollo-normalized-cache = { group = "com.apollographql.apollo3", name = "apollo-normalized-cache", version.ref = "apollo" }
-apollo-normalized-cache-sqlite = { group = "com.apollographql.apollo3", name = "apollo-normalized-cache-sqlite", version.ref = "apollo" }
-apollo-mockserver = { group = "com.apollographql.apollo3", name = "apollo-mockserver", version.ref = "apollo" }
-apollo-testing-support = { group = "com.apollographql.apollo3", name = "apollo-testing-support", version.ref = "apollo" }
+apollo-runtime = { group = "com.apollographql.apollo", name = "apollo-runtime", version.ref = "apollo" }
+apollo-normalized-cache = { group = "com.apollographql.apollo", name = "apollo-normalized-cache", version.ref = "apollo" }
+apollo-normalized-cache-sqlite = { group = "com.apollographql.apollo", name = "apollo-normalized-cache-sqlite", version.ref = "apollo" }
+apollo-mockserver = { group = "com.apollographql.apollo", name = "apollo-mockserver", version.ref = "apollo" }
+apollo-testing-support = { group = "com.apollographql.apollo", name = "apollo-testing-support", version.ref = "apollo" }
 
 kmpObservableViewModel = { module = "com.rickclephas.kmp:kmp-observableviewmodel-core", version.ref = "kmpObservableViewModel" }
 
@@ -70,6 +70,6 @@ android-application = { id = "com.android.application", version.ref = "androidGr
 android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
-apollo = { id = "com.apollographql.apollo3", version.ref = "apollo" }
+apollo = { id = "com.apollographql.apollo", version.ref = "apollo" }
 kmpNativeCoroutines = { id = "com.rickclephas.kmp.nativecoroutines", version.ref = "kmpNativeCoroutines" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
\ No newline at end of file
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
index 2f8a9a9..a78d3b6 100644
--- a/shared/build.gradle.kts
+++ b/shared/build.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
-    kotlin("multiplatform")
-    id("com.android.library")
-    id("com.apollographql.apollo3")
-    id("com.google.devtools.ksp")
+    alias(libs.plugins.kotlinMultiplatform)
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.apollo)
+    alias(libs.plugins.ksp)
     alias(libs.plugins.kmpNativeCoroutines)
 }
 
diff --git a/shared/src/commonMain/kotlin/dev/johnoreilly/mortycomposekmm/shared/MortyRepository.kt b/shared/src/commonMain/kotlin/dev/johnoreilly/mortycomposekmm/shared/MortyRepository.kt
index f885b05..b893346 100644
--- a/shared/src/commonMain/kotlin/dev/johnoreilly/mortycomposekmm/shared/MortyRepository.kt
+++ b/shared/src/commonMain/kotlin/dev/johnoreilly/mortycomposekmm/shared/MortyRepository.kt
@@ -1,8 +1,8 @@
 package dev.johnoreilly.mortycomposekmm.shared
 
-import com.apollographql.apollo3.ApolloClient
-import com.apollographql.apollo3.cache.normalized.api.MemoryCacheFactory
-import com.apollographql.apollo3.cache.normalized.normalizedCache
+import com.apollographql.apollo.ApolloClient
+import com.apollographql.apollo.cache.normalized.api.MemoryCacheFactory
+import com.apollographql.apollo.cache.normalized.normalizedCache
 import dev.johnoreilly.mortycomposekmm.GetCharacterQuery
 import dev.johnoreilly.mortycomposekmm.GetCharactersQuery
 import dev.johnoreilly.mortycomposekmm.GetEpisodeQuery