From 813f1cafd7e404fbadae7e731a938ffcd1695e73 Mon Sep 17 00:00:00 2001 From: Juan Nascimento Date: Sat, 6 Jan 2024 11:03:54 -0300 Subject: [PATCH] update: updated kotlin, ksp, kotlinCompiler, coil --- .idea/kotlinc.xml | 2 +- app/build.gradle.kts | 9 +++------ build.gradle.kts | 4 ++-- gradle.properties | 1 - gradle/libs.versions.toml | 2 +- 5 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index f8467b4..e805548 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index c33f769..2342e33 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -43,7 +43,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion = "1.5.3" + kotlinCompilerExtensionVersion = "1.5.5" } @@ -71,10 +71,9 @@ android { kotlinOptions { jvmTarget = "17" } - packagingOptions { + packaging { resources { excludes.add("/META-INF/{AL2.0,LGPL2.1}") - } } @@ -84,7 +83,6 @@ dependencies { val material3 = "1.2.0-alpha05" val navigationVersion = "2.6.0" val composeBom = platform("androidx.compose:compose-bom:2023.08.00") - val coilBom = platform("io.coil-kt:coil-bom:2.4.0") val roomVersion = "2.5.2" @@ -172,8 +170,7 @@ dependencies { implementation("net.engawapg.lib:zoomable:1.5.0-beta1") //Coil - implementation("io.coil-kt:coil-bom") - implementation(coilBom) + implementation(platform("io.coil-kt:coil-bom:2.5.0")) implementation("io.coil-kt:coil-video") implementation("io.coil-kt:coil-gif") implementation("io.coil-kt:coil-svg") diff --git a/build.gradle.kts b/build.gradle.kts index 422ea68..38f20be 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,8 +2,8 @@ plugins { id("com.android.application") version "8.2.0" apply false id("com.android.library") version "8.2.0" apply false - id("org.jetbrains.kotlin.android") version "1.9.10" apply false - id("com.google.devtools.ksp") version "1.9.10-1.0.13" apply false + id("org.jetbrains.kotlin.android") version "1.9.20" apply false + id("com.google.devtools.ksp") version "1.9.20-1.0.14" apply false id("com.google.dagger.hilt.android") version "2.44" apply false alias(libs.plugins.com.android.test) apply false } diff --git a/gradle.properties b/gradle.properties index 28816ff..575c030 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,6 @@ # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true #Tue Sep 05 07:36:04 BRT 2023 -android.defaults.buildfeatures.buildconfig=true android.nonFinalResIds=false android.nonTransitiveRClass=true android.useAndroidX=true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index de2b1d5..ce41783 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] agp = "8.2.0" -kotlin = "1.9.10" +kotlin = "1.9.20" junit = "1.1.5" espresso-core = "3.5.1" uiautomator = "2.3.0-alpha04"