Remove legacy Kotlin and multidex config

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

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

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
-

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" }

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
 }
 
-

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
 }
-

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)