Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 393d22f7 authored by Ricki Hirner's avatar Ricki Hirner Committed by GitHub
Browse files

AGP 9.0: update Hilt, remove Kotlin Android plugin (#1935) 

- Remove `android.builtInKotlin` from `gradle.properties`
- Update Hilt version to 2.59
- Remove Kotlin Android plugin from `libs.versions.toml` and build scripts
parent 5b12ecf6

app/build.gradle.kts

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ plugins { 
    alias(libs.plugins.android.application)

    alias(libs.plugins.compose.compiler)

    alias(libs.plugins.hilt)

    alias(libs.plugins.kotlin.android)

    alias(libs.plugins.kotlin.serialization)

    alias(libs.plugins.ksp)

    alias(libs.plugins.mikepenz.aboutLibraries.android)

build.gradle.kts

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ plugins { 
    alias(libs.plugins.android.application) apply false

    alias(libs.plugins.compose.compiler) apply false

    alias(libs.plugins.hilt) apply false

    alias(libs.plugins.kotlin.android) apply false

    alias(libs.plugins.ksp) apply false



    alias(libs.plugins.mikepenz.aboutLibraries.android) apply false

gradle.properties

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ org.gradle.parallel=true 
android.useAndroidX=true



# Compatibility with AGP 9.0.0

android.builtInKotlin=false

android.newDsl=false



# It's recommended to add these settings to your $GRADLE_USER_HOME/gradle.properties:

gradle/libs.versions.toml

+1 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ conscrypt = "2.5.3" 
dnsjava = "3.6.4"

glance = "1.1.1"

guava = "33.5.0-android"

hilt = "2.58"

hilt = "2.59"

# keep in sync with ksp version

kotlin = "2.2.21"

kotlinx-coroutines = "1.10.2"
@@ -120,7 +120,6 @@ unifiedpush-fcm = { module = "org.unifiedpush.android:embedded-fcm-distributor", 
android-application = { id = "com.android.application", version.ref = "android-agp" }

compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }

kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }

kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }

ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }

mikepenz-aboutLibraries-android = { id = "com.mikepenz.aboutlibraries.plugin.android", version.ref = "mikepenz-aboutLibraries" }