From 65a0c33007bdb47caa68558746bcce2b10abc702 Mon Sep 17 00:00:00 2001 From: Arty Bishop Date: Fri, 16 Jan 2026 13:45:21 +0000 Subject: [PATCH] Migrated AGP to v9.0.0, tweaked gradle.properties --- app/build.gradle.kts | 3 --- build.gradle.kts | 1 - data/build.gradle.kts | 2 -- gradle.properties | 3 +-- gradle/libs.versions.toml | 7 +++---- 5 files changed, 4 insertions(+), 12 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 2abfa0b2..01d6f275 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -2,7 +2,6 @@ plugins { alias(libs.plugins.android.application) alias(libs.plugins.compose.compiler) alias(libs.plugins.google.ksp) - alias(libs.plugins.kotlin.android) } kotlin { @@ -15,10 +14,8 @@ android { defaultConfig { applicationId = "com.rtbishop.look4sat" minSdk = 24 - targetSdk = 36 versionCode = 400 versionName = "4.0.0" - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } buildFeatures { compose = true diff --git a/build.gradle.kts b/build.gradle.kts index 9e8bce48..642237d4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,7 +3,6 @@ plugins { alias(libs.plugins.android.library) apply false alias(libs.plugins.compose.compiler) apply false alias(libs.plugins.google.ksp) apply false - alias(libs.plugins.kotlin.android) apply false alias(libs.plugins.kotlin.jvm) apply false } diff --git a/data/build.gradle.kts b/data/build.gradle.kts index 94626daa..d71a49c5 100644 --- a/data/build.gradle.kts +++ b/data/build.gradle.kts @@ -1,7 +1,6 @@ plugins { alias(libs.plugins.android.library) alias(libs.plugins.google.ksp) - alias(libs.plugins.kotlin.android) } kotlin { @@ -13,7 +12,6 @@ android { compileSdk = 36 defaultConfig { minSdk = 24 - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } } diff --git a/gradle.properties b/gradle.properties index 05ab4224..965d3071 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,5 @@ # Configure your build environment: http://www.gradle.org/docs/current/userguide/build_environment.html -android.useAndroidX=true -kotlin.code.style=official +android.disallowKotlinSourceSets=false org.gradle.caching=true org.gradle.jvmargs=-Xmx6g -XX:MaxMetaspaceSize=1g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 org.gradle.parallel=true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d26f40ab..444d2515 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,13 +1,13 @@ [versions] -android-gradle-plugin = "8.13.2" -google-ksp = "2.3.0" +android-gradle-plugin = "9.0.0" +google-ksp = "2.3.2" kotlin = "2.3.0" androidx-core-ktx = "1.17.0" androidx-core-splashscreen = "1.2.0" androidx-room = "2.8.4" -compose-bom = "2025.12.01" +compose-bom = "2026.01.00" compose-activity = "1.12.2" compose-lifecycle = "2.10.0" compose-navigation = "2.9.6" @@ -60,7 +60,6 @@ android-application = { id = "com.android.application", version.ref = "android-g android-library = { id = "com.android.library", version.ref = "android-gradle-plugin" } compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } google-ksp = { id = "com.google.devtools.ksp", version.ref = "google-ksp" } -kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } [bundles]