From 33ba9cc786a4ca69f84875c183b3a7dff3c33e37 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 18:39:28 +0000 Subject: [PATCH 1/5] Update kotlin --- app/build.gradle.kts | 2 +- build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index bdfd406..486d8d9 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -56,7 +56,7 @@ android { compose = true } composeOptions { - kotlinCompilerExtensionVersion = "1.5.3" + kotlinCompilerExtensionVersion = "1.5.15" } packaging { resources { diff --git a/build.gradle.kts b/build.gradle.kts index fc8e13d..3e9516d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -19,7 +19,7 @@ plugins { id("com.android.application") version "8.1.3" apply false id("com.android.library") version "8.1.3" apply false - id("org.jetbrains.kotlin.android") version "1.9.10" apply false + id("org.jetbrains.kotlin.android") version "2.1.0" apply false } tasks.register("clean", Delete::class) { From 3949af7c8323593f1de0209ca85b613a96414fb4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 9 Dec 2024 10:18:30 +0000 Subject: [PATCH 2/5] Update kotlin (cherry picked from commit 4686bd77c4a476c905d1e6d1ee3105fc1e48b6c4) --- app/build.gradle.kts | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 486d8d9..fcdf15f 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -17,16 +17,17 @@ plugins { id("com.android.application") id("org.jetbrains.kotlin.android") + id("org.jetbrains.kotlin.plugin.serialization") version "2.1.0" } android { namespace = "com.example.marsphotos" - compileSdk = 34 + compileSdk = 35 defaultConfig { applicationId = "com.example.marsphotos" minSdk = 24 - targetSdk = 34 + targetSdk = 35 versionCode = 1 versionName = "1.0" @@ -55,9 +56,6 @@ android { buildFeatures { compose = true } - composeOptions { - kotlinCompilerExtensionVersion = "1.5.15" - } packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" @@ -68,15 +66,29 @@ android { dependencies { // Import the Compose BOM - implementation(platform("androidx.compose:compose-bom:2023.08.00")) - implementation("androidx.activity:activity-compose:1.8.0") + implementation(platform("androidx.compose:compose-bom:2024.11.00")) + implementation("androidx.activity:activity-compose:1.9.3") implementation("androidx.compose.material3:material3") implementation("androidx.compose.ui:ui") implementation("androidx.compose.ui:ui-tooling-preview") - implementation("androidx.core:core-ktx:1.12.0") - implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2") - implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2") - + implementation("androidx.core:core-ktx:1.15.0") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7") + implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7") + + // Retrofit + implementation("com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0") + implementation("com.squareup.retrofit2:retrofit:2.11.0") + implementation("io.coil-kt:coil-compose:2.7.0") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") + + testImplementation("junit:junit:4.13.2") + testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0") + + androidTestImplementation(platform("androidx.compose:compose-bom:2024.11.00")) + androidTestImplementation("androidx.compose.ui:ui-test-junit4") + androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1") + androidTestImplementation("androidx.test.ext:junit:1.2.1") + debugImplementation("androidx.compose.ui:ui-test-manifest") debugImplementation("androidx.compose.ui:ui-tooling") } From 153736adb9788342061d92bde2a8ce2c56a2ce4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Alc=C3=A9rreca?= Date: Mon, 9 Dec 2024 13:11:08 +0000 Subject: [PATCH 3/5] Compose compiler plugin (cherry picked from commit 4e02933d446efd57824138a4a623731248facaa0) --- app/build.gradle.kts | 3 ++- build.gradle.kts | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index fcdf15f..9330e99 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -17,7 +17,8 @@ plugins { id("com.android.application") id("org.jetbrains.kotlin.android") - id("org.jetbrains.kotlin.plugin.serialization") version "2.1.0" + id("org.jetbrains.kotlin.plugin.serialization") + id("org.jetbrains.kotlin.plugin.compose") } android { diff --git a/build.gradle.kts b/build.gradle.kts index 3e9516d..79c74c1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -20,6 +20,8 @@ plugins { id("com.android.application") version "8.1.3" apply false id("com.android.library") version "8.1.3" apply false id("org.jetbrains.kotlin.android") version "2.1.0" apply false + id("org.jetbrains.kotlin.plugin.serialization") version "2.1.0" apply false + id("org.jetbrains.kotlin.plugin.compose") version "2.1.0" apply false } tasks.register("clean", Delete::class) { From e40164c648318ecf3b3f14e471ef7482cf07bc79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Alc=C3=A9rreca?= Date: Mon, 9 Dec 2024 19:21:37 +0000 Subject: [PATCH 4/5] Removes old stuff and Sdk 35 to avoid conflicts --- app/build.gradle.kts | 1 - build.gradle.kts | 1 - 2 files changed, 2 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 9330e99..70d2ab4 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -17,7 +17,6 @@ plugins { id("com.android.application") id("org.jetbrains.kotlin.android") - id("org.jetbrains.kotlin.plugin.serialization") id("org.jetbrains.kotlin.plugin.compose") } diff --git a/build.gradle.kts b/build.gradle.kts index 79c74c1..a9c6daf 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -20,7 +20,6 @@ plugins { id("com.android.application") version "8.1.3" apply false id("com.android.library") version "8.1.3" apply false id("org.jetbrains.kotlin.android") version "2.1.0" apply false - id("org.jetbrains.kotlin.plugin.serialization") version "2.1.0" apply false id("org.jetbrains.kotlin.plugin.compose") version "2.1.0" apply false } From 26c397a51ecac6842a74c5da1c7bc73e1733a0eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20Alc=C3=A9rreca?= Date: Mon, 9 Dec 2024 19:23:38 +0000 Subject: [PATCH 5/5] Reverts changes --- app/build.gradle.kts | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 70d2ab4..da0ea12 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -75,20 +75,6 @@ dependencies { implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.7") implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7") - // Retrofit - implementation("com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0") - implementation("com.squareup.retrofit2:retrofit:2.11.0") - implementation("io.coil-kt:coil-compose:2.7.0") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3") - - testImplementation("junit:junit:4.13.2") - testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.9.0") - - androidTestImplementation(platform("androidx.compose:compose-bom:2024.11.00")) - androidTestImplementation("androidx.compose.ui:ui-test-junit4") - androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1") - androidTestImplementation("androidx.test.ext:junit:1.2.1") - debugImplementation("androidx.compose.ui:ui-test-manifest") debugImplementation("androidx.compose.ui:ui-tooling") }