From 3a97bc79ad4597fe41c0d30790db2b12c6c41f5c Mon Sep 17 00:00:00 2001 From: birdbird <6892457-bird.bird@users.noreply.gitlab.com> Date: Thu, 27 Aug 2026 21:21:47 +0000 Subject: [PATCH] Remove legacy Kotlin and multidex config --- core/domain/build.gradle | 2 +- core/subsonic-api/build.gradle | 2 +- gradle.properties | 3 --- gradle/libs.versions.toml | 2 -- gradle_scripts/android-module-bootstrap.gradle | 8 +++----- ultrasonic/build.gradle | 10 +++------- .../src/main/kotlin/org/moire/ultrasonic/app/UApp.kt | 4 ++-- 7 files changed, 10 insertions(+), 21 deletions(-) diff --git a/core/domain/build.gradle b/core/domain/build.gradle index b5e81edb..a8c1ffee 100644 --- a/core/domain/build.gradle +++ b/core/domain/build.gradle @@ -2,7 +2,7 @@ plugins { alias libs.plugins.ksp } -apply from: bootstrap.androidModule +apply from: rootProject.ext.bootstrap.androidModule dependencies { implementation libs.core diff --git a/core/subsonic-api/build.gradle b/core/subsonic-api/build.gradle index 483a5206..5a8cc97b 100644 --- a/core/subsonic-api/build.gradle +++ b/core/subsonic-api/build.gradle @@ -2,7 +2,7 @@ plugins { alias libs.plugins.ksp } -apply from: bootstrap.kotlinModule +apply from: rootProject.ext.bootstrap.kotlinModule dependencies { api libs.retrofit diff --git a/gradle.properties b/gradle.properties index b5aec006..5fc57f04 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,6 +23,3 @@ org.gradle.unsafe.configuration-cache=true # TODO Renable on day (check that Retrofit, Jackson, and Imageloader are working) android.enableR8.fullMode=true -android.builtInKotlin=false -android.newDsl=false - diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index aaefa6c6..abd8df15 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -15,7 +15,6 @@ media3 = "1.10.1" materialDesign = "1.14.0" constraintLayout = "2.2.2" -multidex = "2.0.1" room = "2.8.4" kotlin = "2.4.10" ksp = "2.3.11" @@ -54,7 +53,6 @@ car = { module = "androidx.car.app:app", version.ref = "andr core = { module = "androidx.core:core-ktx", version.ref = "androidxcore" } testCore = { module = "androidx.test:core-ktx", version.ref = "androidxTestCore" } design = { module = "com.google.android.material:material", version.ref = "materialDesign" } -multidex = { module = "androidx.multidex:multidex", version.ref = "multidex" } documentfile = { module = "androidx.documentfile:documentfile", version.ref = "documentfile" } constraintLayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintLayout" } room = { module = "androidx.room:room-compiler", version.ref = "room" } diff --git a/gradle_scripts/android-module-bootstrap.gradle b/gradle_scripts/android-module-bootstrap.gradle index f653827c..c41829e0 100644 --- a/gradle_scripts/android-module-bootstrap.gradle +++ b/gradle_scripts/android-module-bootstrap.gradle @@ -2,17 +2,16 @@ * This module provides a base for for submodules which depend on the Android runtime */ apply plugin: 'com.android.library' -apply plugin: 'org.jetbrains.kotlin.android' apply from: "${project.rootDir}/gradle_scripts/code_quality.gradle" apply plugin: 'com.google.devtools.ksp' android { - compileSdkVersion versions.compileSdk + compileSdkVersion rootProject.ext.versions.compileSdk defaultConfig { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - minSdkVersion versions.minSdk - targetSdkVersion versions.targetSdk + minSdkVersion rootProject.ext.versions.minSdk + targetSdkVersion rootProject.ext.versions.targetSdk } compileOptions { @@ -56,4 +55,3 @@ dependencies { testRuntimeOnly libs.junitVintage } - diff --git a/ultrasonic/build.gradle b/ultrasonic/build.gradle index 592b2aea..dcc2dfa3 100644 --- a/ultrasonic/build.gradle +++ b/ultrasonic/build.gradle @@ -3,7 +3,6 @@ plugins { } apply plugin: 'com.android.application' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: "androidx.navigation.safeargs.kotlin" apply from: "../gradle_scripts/code_quality.gradle" @@ -24,15 +23,15 @@ def getGitCommitHash() { } android { - compileSdkVersion versions.compileSdk + compileSdkVersion rootProject.ext.versions.compileSdk defaultConfig { applicationId "org.moire.ultrasonic" versionCode 131 versionName "4.9.0" - minSdkVersion versions.minSdk - targetSdkVersion versions.targetSdk + minSdkVersion rootProject.ext.versions.minSdk + targetSdkVersion rootProject.ext.versions.targetSdk resourceConfigurations += ['cs', 'de', 'en', 'es', 'fr', 'gl', 'hu', 'it', 'ja', 'nb-rNO', 'nl', 'pl', 'pt', 'pt-rBR', 'ru', 'zh-rCN', 'zh-rTW'] buildConfigField 'String', 'GIT_COMMIT', '""' } @@ -54,7 +53,6 @@ android { } debug { minifyEnabled = false - multiDexEnabled = true applicationIdSuffix = '.debug' enableUnitTestCoverage = true enableAndroidTestCoverage = true @@ -120,7 +118,6 @@ dependencies { implementation libs.core implementation libs.testCore implementation libs.design - implementation libs.multidex implementation libs.roomRuntime implementation libs.roomKtx implementation libs.viewModelKtx @@ -171,4 +168,3 @@ dependencies { implementation libs.timber } - diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/app/UApp.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/app/UApp.kt index 644aff81..bb452f37 100644 --- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/app/UApp.kt +++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/app/UApp.kt @@ -1,6 +1,7 @@ package org.moire.ultrasonic.app import android.app.ActivityManager +import android.app.Application import android.content.Context import android.content.pm.ApplicationInfo import android.os.Build @@ -8,7 +9,6 @@ import android.os.StrictMode import android.os.StrictMode.ThreadPolicy import android.os.StrictMode.VmPolicy import androidx.core.content.ContextCompat -import androidx.multidex.MultiDexApplication import coil3.ImageLoader import coil3.SingletonImageLoader import coil3.memory.MemoryCache @@ -43,7 +43,7 @@ import timber.log.Timber.DebugTree */ class UApp : - MultiDexApplication(), + Application(), SingletonImageLoader.Factory { private var ioScope = CoroutineScope(Dispatchers.IO)