diff --git a/app/build.gradle.kts b/app/build.gradle.kts index bdfd406..da0ea12 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.compose") } 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.3" - } packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" @@ -68,15 +66,15 @@ 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") + debugImplementation("androidx.compose.ui:ui-test-manifest") debugImplementation("androidx.compose.ui:ui-tooling") } diff --git a/build.gradle.kts b/build.gradle.kts index fc8e13d..a9c6daf 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -19,7 +19,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 "1.9.10" apply false + id("org.jetbrains.kotlin.android") version "2.1.0" apply false + id("org.jetbrains.kotlin.plugin.compose") version "2.1.0" apply false } tasks.register("clean", Delete::class) {