From ddc48610829efadbda450ea3b875938cdfa5fc4f Mon Sep 17 00:00:00 2001
From: odaridavid <20339228+odaridavid@users.noreply.github.com>
Date: Thu, 23 May 2024 08:05:57 +0000
Subject: [PATCH 1/4] Update version catalog

---
 gradle/libs.versions.toml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 1f1c5ff..f9c3db4 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
-about-lib = "11.1.4"
+about-lib = "11.2.0"
 activity-compose = "1.9.0"
-android-gradle-plugin = "8.4.0"
+android-gradle-plugin = "8.4.1"
 androidx-test-rules = "1.5.0"
 androidx-test-runner = "1.5.2"
 chucker = "4.0.0"
@@ -13,8 +13,8 @@ compose-material3 = "1.2.1"
 compose-navigation = "2.7.7"
 core-ktx = "1.5.0"
 core-ktx-version = "1.13.1"
-coroutines = "1.8.0"
-coroutines-test = "1.8.0"
+coroutines = "1.8.1"
+coroutines-test = "1.8.1"
 crashlytics-plugin = "2.9.9"
 datastore = "1.1.1"
 firebase-bom = "33.0.0"
@@ -25,14 +25,14 @@ inappupdate = "2.1.0"
 junit = "4.13.2"
 kotlin = "1.9.22"
 kotlin-serialization = "1.9.22"
-kotlinx-coroutines-android = "1.8.0"
-kotlinx-serialization = "1.6.3"
+kotlinx-coroutines-android = "1.8.1"
+kotlinx-serialization = "1.7.0-RC"
 kotlinx-serialization-converter = "1.0.0"
 leakcanary = "2.14"
-lifecycle-runtime-ktx = "2.8.0-rc01"
-lifecycle-viewmodel-compose = "2.8.0-rc01"
+lifecycle-runtime-ktx = "2.8.0"
+lifecycle-viewmodel-compose = "2.8.0"
 mapsplatform-secrets = "2.0.1"
-mockk = "1.13.10"
+mockk = "1.13.11"
 okhttp = "4.12.0"
 play-services-location = "21.2.0"
 retrofit = "2.11.0"

From 65ec3ad4e43f448de6d4a6bce14ff4db7767616d Mon Sep 17 00:00:00 2001
From: odaridavid <davidkibzodari@gmail.com>
Date: Wed, 29 May 2024 13:38:48 +0200
Subject: [PATCH 2/4] dependency fix

---
 build.gradle.kts          | 2 +-
 gradle/libs.versions.toml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index e4ee6e9..f095bf1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -30,7 +30,7 @@ buildscript {
 
 versionCatalogUpdate {
     pin {
-        versions.addAll("kotlin-android", "kotlin-serialization", "kotlin", "crashlytics-plugin")
+        versions.addAll("kotlin-android", "crashlytics-plugin")
     }
 }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f9c3db4..d9f31fd 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -23,8 +23,8 @@ hilt = "2.51.1"
 hilt-nav-compose = "1.2.0"
 inappupdate = "2.1.0"
 junit = "4.13.2"
-kotlin = "1.9.22"
-kotlin-serialization = "1.9.22"
+kotlin = "2.0.0-RC1"
+kotlin-serialization = "2.0.0-RC1"
 kotlinx-coroutines-android = "1.8.1"
 kotlinx-serialization = "1.7.0-RC"
 kotlinx-serialization-converter = "1.0.0"

From 066ca79d7a4dfd31c0ad434499b4d976876a71ad Mon Sep 17 00:00:00 2001
From: odaridavid <davidkibzodari@gmail.com>
Date: Wed, 29 May 2024 14:21:36 +0200
Subject: [PATCH 3/4] Fix compiler compatibility

---
 app/build.gradle.kts      | 4 +---
 build.gradle.kts          | 1 +
 gradle/libs.versions.toml | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 475b410..0f460bb 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -13,6 +13,7 @@ plugins {
     jacoco
     alias(libs.plugins.firebase.perf.plugin)
     alias(libs.plugins.about.lib.plugin)
+    alias(libs.plugins.compose.compiler)
 }
 
 jacoco {
@@ -161,9 +162,6 @@ android {
         compose = true
         buildConfig = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.9"
-    }
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
diff --git a/build.gradle.kts b/build.gradle.kts
index f095bf1..5ad6cae 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -10,6 +10,7 @@ plugins {
     alias(libs.plugins.kotlinMultiplatform) apply false
     alias(libs.plugins.about.lib.plugin) apply false
     alias(libs.plugins.firebase.perf.plugin) apply false
+    alias(libs.plugins.compose.compiler) apply false
 //    TODO Move some of these to toml file
     id("com.github.ben-manes.versions") version "0.41.0"
     id("nl.littlerobots.version-catalog-update") version "0.8.4"
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d9f31fd..923e33a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -99,6 +99,7 @@ kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref =
 mapsplatform-secrets-gradle-plugin = { id = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin", version.ref = "mapsplatform-secrets" }
 org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 org-jetbrains-kotlin-plugin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin-serialization" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 
 [bundles]
 android-test = [

From 43cb0d9504006509822d9e036112f0ef6026e3f3 Mon Sep 17 00:00:00 2001
From: odaridavid <davidkibzodari@gmail.com>
Date: Wed, 29 May 2024 18:56:55 +0200
Subject: [PATCH 4/4] change kotlin to 2.0.0

---
 gradle/libs.versions.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 923e33a..9e1b9d8 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -23,8 +23,8 @@ hilt = "2.51.1"
 hilt-nav-compose = "1.2.0"
 inappupdate = "2.1.0"
 junit = "4.13.2"
-kotlin = "2.0.0-RC1"
-kotlin-serialization = "2.0.0-RC1"
+kotlin = "2.0.0"
+kotlin-serialization = "2.0.0"
 kotlinx-coroutines-android = "1.8.1"
 kotlinx-serialization = "1.7.0-RC"
 kotlinx-serialization-converter = "1.0.0"