diff --git a/app/build.gradle.kts b/app/build.gradle.kts index ad9d18e4b..d85ea83a4 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -7,12 +7,12 @@ @file:OptIn(KspExperimental::class) +import com.android.build.api.dsl.ApplicationExtension import com.google.devtools.ksp.KspExperimental import java.util.Properties plugins { alias(libs.plugins.android.application) - alias(libs.plugins.jetbrains.kotlin.android) alias(libs.plugins.jetbrains.kotlin.compose) alias(libs.plugins.jetbrains.kotlin.parcelize) alias(libs.plugins.jetbrains.kotlin.serialization) @@ -48,7 +48,7 @@ kotlin { } } -android { +configure { namespace = "com.aurora.store" compileSdk = 36 diff --git a/build.gradle.kts b/build.gradle.kts index 810cdf068..1c9d267b7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,9 +5,15 @@ * SPDX-License-Identifier: GPL-3.0-or-later */ +buildscript { + dependencies { + // https://developer.android.com/build/releases/agp-9-0-0-release-notes#runtime-dependency-on-kotlin-gradle-plugin-upgrade + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${libs.versions.kotlin.get()}") + } +} + plugins { alias(libs.plugins.android.application) apply false - alias(libs.plugins.jetbrains.kotlin.android) apply false alias(libs.plugins.jetbrains.kotlin.compose) apply false alias(libs.plugins.jetbrains.kotlin.parcelize) apply false alias(libs.plugins.jetbrains.kotlin.serialization) apply false diff --git a/gradle.properties b/gradle.properties index 8bad2bce4..9c4aa1b63 100644 --- a/gradle.properties +++ b/gradle.properties @@ -28,3 +28,6 @@ kotlin.code.style=official android.enableR8.fullMode=false # https://docs.gradle.org/current/userguide/configuration_cache.html org.gradle.configuration-cache=true + +android.usesSdkInManifest.disallowed=false +android.r8.strictFullModeForKeepRules=false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0fff3a9d8..92755783e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,7 +7,7 @@ [versions] activity = "1.12.2" agCoreservice = "13.3.1.300" -androidGradlePlugin = "8.13.2" +androidGradlePlugin = "9.0.0" adaptive = "1.3.0-alpha06" androidx-hilt = "1.3.0" androidx-junit = "1.3.0" @@ -20,10 +20,10 @@ epoxy = "5.2.0" espresso = "3.7.0" gplayapi = "3.5.7" hiddenapibypass = "6.1" -hilt = "2.58" +hilt = "2.59" junit = "4.13.2" kotlin = "2.3.0" -ksp = "2.3.4" +ksp = "2.3.5" ktlint = "14.0.1" leakcanary = "2.14" libsu = "6.0.0" @@ -115,7 +115,6 @@ androidx-navigation = { id = "androidx.navigation.safeargs.kotlin", version.ref google-ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } hilt-android-plugin = { id = "com.google.dagger.hilt.android", version.ref = "hilt" } ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" } -jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } jetbrains-kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } jetbrains-kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" } jetbrains-kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }