From da1352c2ff57e82541d2db3652aa2ed02e008438 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Miguel=20Rubio?= <andres@dhis2.org>
Date: Fri, 15 Dec 2023 13:07:12 +0100
Subject: [PATCH] [ANDROAPP-5801] Update gradle to 8.2.0, kotlin to 1.9.21,
 compose to 1.5.11 (#167)

---
 android/build.gradle.kts      | 2 +-
 common/build.gradle.kts       | 3 +--
 designsystem/build.gradle.kts | 4 +---
 gradle.properties             | 6 +++---
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/android/build.gradle.kts b/android/build.gradle.kts
index 90ee6abfc..34451bd69 100644
--- a/android/build.gradle.kts
+++ b/android/build.gradle.kts
@@ -10,7 +10,7 @@ kotlin {
         val androidMain by getting {
             dependencies {
                 implementation(project(":common"))
-                implementation("androidx.activity:activity-compose:1.7.2")
+                implementation("androidx.activity:activity-compose:1.8.2")
             }
         }
     }
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
index 21b8d24b6..c5712b250 100644
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -29,7 +29,7 @@ kotlin {
         val androidMain by getting {
             dependencies {
                 api("androidx.appcompat:appcompat:1.6.1")
-                api("androidx.core:core-ktx:1.10.1")
+                api("androidx.core:core-ktx:1.12.0")
             }
         }
         val androidUnitTest by getting {
@@ -56,7 +56,6 @@ android {
 
     defaultConfig {
         minSdk = (findProperty("android.minSdk") as String).toInt()
-        targetSdk = (findProperty("android.targetSdk") as String).toInt()
     }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
diff --git a/designsystem/build.gradle.kts b/designsystem/build.gradle.kts
index 3e282eb0c..6df4694fe 100644
--- a/designsystem/build.gradle.kts
+++ b/designsystem/build.gradle.kts
@@ -30,10 +30,9 @@ kotlin {
 
         val androidMain by getting {
             dependencies {
-                api("androidx.activity:activity-compose:1.7.2")
+                api("androidx.activity:activity-compose:1.8.2")
                 api("androidx.appcompat:appcompat:1.6.1")
                 api("androidx.core:core-ktx:1.12.0")
-                implementation("androidx.compose.material3:material3:1.1.2")
                 implementation("com.google.zxing:core:3.5.2")
             }
         }
@@ -64,7 +63,6 @@ android {
 
     defaultConfig {
         minSdk = (findProperty("android.minSdk") as String).toInt()
-        targetSdk = (findProperty("android.targetSdk") as String).toInt()
     }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
diff --git a/gradle.properties b/gradle.properties
index da4426402..e80150033 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,6 +21,6 @@ android.targetSdk=34
 android.minSdk=21
 
 #Versions
-kotlin.version=1.9.10
-agp.version=8.1.2
-compose.version=1.5.10
\ No newline at end of file
+kotlin.version=1.9.21
+agp.version=8.2.0
+compose.version=1.5.11
\ No newline at end of file