From ac2e3ee7597ba23be01076892dd337a2510d241e Mon Sep 17 00:00:00 2001 From: prajwalch Date: Mon, 16 Mar 2026 17:02:10 +0545 Subject: [PATCH] chore: Upgrade agp to `v9` including hilt Signed-off-by: prajwalch --- app/build.gradle.kts | 22 +++++++++++----------- build.gradle.kts | 1 - gradle/libs.versions.toml | 5 ++--- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 09d945da..e3cbab8f 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,6 +1,5 @@ plugins { alias(libs.plugins.android.application) - alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.compose) alias(libs.plugins.kotlin.serialization) alias(libs.plugins.ksp) @@ -10,7 +9,12 @@ plugins { android { namespace = "com.prajwalch.torrentsearch" - compileSdk = 36 + + compileSdk { + version = release(36) { + minorApiLevel = 1 + } + } defaultConfig { applicationId = "com.prajwalch.torrentsearch" @@ -26,6 +30,7 @@ android { release { isMinifyEnabled = true isShrinkResources = true + proguardFiles( getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro" @@ -43,12 +48,6 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlin { - compilerOptions { - jvmToolchain(17) - } - } - buildFeatures { compose = true buildConfig = true @@ -65,9 +64,10 @@ android { generateLocaleConfig = true } - room { - schemaDirectory("$projectDir/schemas") - } +} + +room { + schemaDirectory("$projectDir/schemas") } dependencies { diff --git a/build.gradle.kts b/build.gradle.kts index 8c7d7df9..56c36828 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { alias(libs.plugins.android.application) apply false - alias(libs.plugins.kotlin.android) apply false alias(libs.plugins.kotlin.compose) apply false alias(libs.plugins.ksp) apply false alias(libs.plugins.androidx.room) apply false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fb970c8b..e567cf18 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,12 +1,12 @@ [versions] activityCompose = "1.13.0" -agp = "8.13.2" +agp = "9.1.0" composeBom = "2026.03.00" coreKtx = "1.18.0" coreSplashscreen = "1.2.0" datastorePreferences = "1.2.1" espressoCore = "3.7.0" -hilt = "2.58" +hilt = "2.59.2" hiltNavigationCompose = "1.3.0" jsoup = "1.22.1" junit = "4.13.2" @@ -56,7 +56,6 @@ lazycolumnscrollbar = { module = "com.github.nanihadesuka:LazyColumnScrollbar", android-application = { id = "com.android.application", version.ref = "agp" } androidx-room = { id = "androidx.room", version.ref = "room" } hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" } -kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5b016693..59ef4fc1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Thu Mar 20 19:31:48 NPT 2025 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists \ No newline at end of file