From d4549069b85c27db99a18458601ee6e56285b3b6 Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Sat, 16 Aug 2025 16:34:03 +0200 Subject: [PATCH] modernize gradle scripts --- app/app/build.gradle.kts | 7 +++- app/ui/build.gradle.kts | 37 ++++++++++--------- core/base/build.gradle.kts | 8 +++- core/compat/build.gradle.kts | 8 +++- core/crashreporter/build.gradle.kts | 8 +++- core/devicepose/build.gradle.kts | 8 +++- core/i18n/build.gradle.kts | 8 +++- core/ktx/build.gradle.kts | 8 +++- core/permissions/build.gradle.kts | 8 +++- core/preferences/build.gradle.kts | 8 +++- core/profiles/build.gradle.kts | 8 +++- core/shared/build.gradle.kts | 8 +++- data/applications/build.gradle.kts | 8 +++- data/appshortcuts/build.gradle.kts | 8 +++- data/calculator/build.gradle.kts | 8 +++- data/calendar/build.gradle.kts | 8 +++- data/contacts/build.gradle.kts | 8 +++- data/currencies/build.gradle.kts | 8 +++- data/customattrs/build.gradle.kts | 8 +++- data/database/build.gradle.kts | 8 +++- data/files/build.gradle.kts | 8 +++- data/locations/build.gradle.kts | 9 +++-- data/notifications/build.gradle.kts | 8 +++- data/plugins/build.gradle.kts | 8 +++- data/search-actions/build.gradle.kts | 8 +++- data/searchable/build.gradle.kts | 8 +++- data/themes/build.gradle.kts | 8 +++- data/unitconverter/build.gradle.kts | 8 +++- data/weather/build.gradle.kts | 8 +++- data/websites/build.gradle.kts | 8 +++- data/widgets/build.gradle.kts | 8 +++- data/wikipedia/build.gradle.kts | 8 +++- gradle/libs.versions.toml | 6 +-- libs/address-formatter/build.gradle.kts | 8 +++- .../material-color-utilities/build.gradle.kts | 8 +++- libs/nextcloud/build.gradle.kts | 8 +++- libs/owncloud/build.gradle.kts | 8 +++- libs/tinypinyin/build.gradle.kts | 8 +++- libs/webdav/build.gradle.kts | 8 +++- plugins/sdk/build.gradle.kts | 10 +++-- services/accounts/build.gradle.kts | 8 +++- services/backup/build.gradle.kts | 8 +++- services/badges/build.gradle.kts | 8 +++- services/favorites/build.gradle.kts | 8 +++- services/global-actions/build.gradle.kts | 8 +++- services/icons/build.gradle.kts | 8 +++- services/music/build.gradle.kts | 8 +++- services/plugins/build.gradle.kts | 8 +++- services/search/build.gradle.kts | 8 +++- services/tags/build.gradle.kts | 8 +++- services/widgets/build.gradle.kts | 8 +++- 51 files changed, 316 insertions(+), 121 deletions(-) diff --git a/app/app/build.gradle.kts b/app/app/build.gradle.kts index a0be9c8e3..fa0d0b0be 100644 --- a/app/app/build.gradle.kts +++ b/app/app/build.gradle.kts @@ -1,6 +1,7 @@ import android.annotation.SuppressLint import java.time.LocalDate import java.time.format.DateTimeFormatter +import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { alias(libs.plugins.android.application) @@ -89,8 +90,10 @@ android { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } lint { diff --git a/app/ui/build.gradle.kts b/app/ui/build.gradle.kts index 8fb5005dd..c49ad156b 100644 --- a/app/ui/build.gradle.kts +++ b/app/ui/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -37,27 +39,25 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" - freeCompilerArgs = listOf( - "-opt-in=androidx.compose.ui.ExperimentalComposeUiApi", - "-opt-in=androidx.compose.foundation.ExperimentalFoundationApi", - "-opt-in=androidx.compose.ui.text.ExperimentalTextApi", - "-opt-in=androidx.compose.ui.unit.ExperimentalUnitApi", - "-opt-in=androidx.compose.foundation.layout.ExperimentalLayoutApi", - "-opt-in=androidx.compose.material.ExperimentalMaterialApi", - "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api", - "-opt-in=androidx.compose.material3.ExperimentalMaterial3ExpressiveApi", - "-opt-in=androidx.compose.animation.graphics.ExperimentalAnimationGraphicsApi", - "-opt-in=androidx.compose.animation.ExperimentalAnimationApi", - "-opt-in=com.google.accompanist.pager.ExperimentalPagerApi", - "-opt-in=androidx.compose.animation.ExperimentalSharedTransitionApi", - "-Xwhen-guards", - ) + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + optIn.add("androidx.compose.ui.ExperimentalComposeUiApi") + optIn.add("androidx.compose.foundation.ExperimentalFoundationApi") + optIn.add("androidx.compose.ui.text.ExperimentalTextApi") + optIn.add("androidx.compose.ui.unit.ExperimentalUnitApi") + optIn.add("androidx.compose.foundation.layout.ExperimentalLayoutApi") + optIn.add("androidx.compose.material.ExperimentalMaterialApi") + optIn.add("androidx.compose.material3.ExperimentalMaterial3Api") + optIn.add("androidx.compose.material3.ExperimentalMaterial3ExpressiveApi") + optIn.add("androidx.compose.animation.graphics.ExperimentalAnimationGraphicsApi") + optIn.add("androidx.compose.animation.ExperimentalAnimationApi") + optIn.add("com.google.accompanist.pager.ExperimentalPagerApi") + optIn.add("androidx.compose.animation.ExperimentalSharedTransitionApi") + } } buildFeatures { - // Enables Jetpack Compose for this module compose = true viewBinding = true } @@ -68,6 +68,7 @@ android { namespace = "de.mm20.launcher2.ui" } + dependencies { implementation(libs.bundles.kotlin) diff --git a/core/base/build.gradle.kts b/core/base/build.gradle.kts index 9e12caa77..bb2c24ead 100644 --- a/core/base/build.gradle.kts +++ b/core/base/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -32,8 +34,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.base" } diff --git a/core/compat/build.gradle.kts b/core/compat/build.gradle.kts index fc180bf7c..8a56e43f1 100644 --- a/core/compat/build.gradle.kts +++ b/core/compat/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -27,8 +29,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.compat" } diff --git a/core/crashreporter/build.gradle.kts b/core/crashreporter/build.gradle.kts index 401db6ee9..4a7c1630d 100644 --- a/core/crashreporter/build.gradle.kts +++ b/core/crashreporter/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -27,8 +29,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.crashreporter" } diff --git a/core/devicepose/build.gradle.kts b/core/devicepose/build.gradle.kts index 63aecfb31..e13b03147 100644 --- a/core/devicepose/build.gradle.kts +++ b/core/devicepose/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -27,8 +29,10 @@ android { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } } diff --git a/core/i18n/build.gradle.kts b/core/i18n/build.gradle.kts index 3ebd2cc89..00a40e73b 100644 --- a/core/i18n/build.gradle.kts +++ b/core/i18n/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -27,8 +29,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.i18n" } diff --git a/core/ktx/build.gradle.kts b/core/ktx/build.gradle.kts index b2d0fd49a..e77b6c423 100644 --- a/core/ktx/build.gradle.kts +++ b/core/ktx/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -27,8 +29,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.ktx" } diff --git a/core/permissions/build.gradle.kts b/core/permissions/build.gradle.kts index e361fd8f9..9034b3597 100644 --- a/core/permissions/build.gradle.kts +++ b/core/permissions/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -27,8 +29,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.permissions" } diff --git a/core/preferences/build.gradle.kts b/core/preferences/build.gradle.kts index 979b749c4..7fa188aee 100644 --- a/core/preferences/build.gradle.kts +++ b/core/preferences/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -28,8 +30,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.preferences" } diff --git a/core/profiles/build.gradle.kts b/core/profiles/build.gradle.kts index 4c0f73296..0f1c853ac 100644 --- a/core/profiles/build.gradle.kts +++ b/core/profiles/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -32,8 +34,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.profiles" } diff --git a/core/shared/build.gradle.kts b/core/shared/build.gradle.kts index 0428bfd00..311508bfd 100644 --- a/core/shared/build.gradle.kts +++ b/core/shared/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -35,8 +37,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.shared" diff --git a/data/applications/build.gradle.kts b/data/applications/build.gradle.kts index 4914e8ab4..4fc48d276 100644 --- a/data/applications/build.gradle.kts +++ b/data/applications/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -27,8 +29,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.applications" } diff --git a/data/appshortcuts/build.gradle.kts b/data/appshortcuts/build.gradle.kts index 99d4665d5..cbecc1215 100644 --- a/data/appshortcuts/build.gradle.kts +++ b/data/appshortcuts/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -27,8 +29,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.appshortcuts" } diff --git a/data/calculator/build.gradle.kts b/data/calculator/build.gradle.kts index 44c351e4c..f5bee60af 100644 --- a/data/calculator/build.gradle.kts +++ b/data/calculator/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -27,8 +29,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.calculator" } diff --git a/data/calendar/build.gradle.kts b/data/calendar/build.gradle.kts index e399a1298..48908b471 100644 --- a/data/calendar/build.gradle.kts +++ b/data/calendar/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -28,8 +30,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.calendar" } diff --git a/data/contacts/build.gradle.kts b/data/contacts/build.gradle.kts index 1e66927cb..f73a11166 100644 --- a/data/contacts/build.gradle.kts +++ b/data/contacts/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -27,8 +29,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.contacts" } diff --git a/data/currencies/build.gradle.kts b/data/currencies/build.gradle.kts index c75bc7768..a040309a9 100644 --- a/data/currencies/build.gradle.kts +++ b/data/currencies/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -27,8 +29,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.currencies" } diff --git a/data/customattrs/build.gradle.kts b/data/customattrs/build.gradle.kts index bd5011a73..dffdb93eb 100644 --- a/data/customattrs/build.gradle.kts +++ b/data/customattrs/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -27,8 +29,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.data.customattrs" } diff --git a/data/database/build.gradle.kts b/data/database/build.gradle.kts index 87ce30923..ab19b7631 100644 --- a/data/database/build.gradle.kts +++ b/data/database/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -35,8 +37,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.database" } diff --git a/data/files/build.gradle.kts b/data/files/build.gradle.kts index 5b127e642..2f4659fd8 100644 --- a/data/files/build.gradle.kts +++ b/data/files/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -28,8 +30,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.files" } diff --git a/data/locations/build.gradle.kts b/data/locations/build.gradle.kts index 6ef81d72d..95236a00c 100644 --- a/data/locations/build.gradle.kts +++ b/data/locations/build.gradle.kts @@ -1,4 +1,5 @@ -@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove once KTIJ-19369 is fixed +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -29,8 +30,10 @@ android { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } } diff --git a/data/notifications/build.gradle.kts b/data/notifications/build.gradle.kts index dd2b37aa4..64fb1a3fe 100644 --- a/data/notifications/build.gradle.kts +++ b/data/notifications/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -27,8 +29,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.notifications" } diff --git a/data/plugins/build.gradle.kts b/data/plugins/build.gradle.kts index 75b4db099..919554790 100644 --- a/data/plugins/build.gradle.kts +++ b/data/plugins/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -27,8 +29,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.data.plugins" } diff --git a/data/search-actions/build.gradle.kts b/data/search-actions/build.gradle.kts index 6350bb681..36fc3d700 100644 --- a/data/search-actions/build.gradle.kts +++ b/data/search-actions/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -27,8 +29,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.searchactions" } diff --git a/data/searchable/build.gradle.kts b/data/searchable/build.gradle.kts index 6dbab0707..7dc3c4049 100644 --- a/data/searchable/build.gradle.kts +++ b/data/searchable/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -27,8 +29,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.favorites" } diff --git a/data/themes/build.gradle.kts b/data/themes/build.gradle.kts index 09b727909..d79068340 100644 --- a/data/themes/build.gradle.kts +++ b/data/themes/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -28,8 +30,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.themes" } diff --git a/data/unitconverter/build.gradle.kts b/data/unitconverter/build.gradle.kts index 80311490b..0605375f7 100644 --- a/data/unitconverter/build.gradle.kts +++ b/data/unitconverter/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -27,8 +29,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.unitconverter" } diff --git a/data/weather/build.gradle.kts b/data/weather/build.gradle.kts index f18e8e2a8..261ae3ff9 100644 --- a/data/weather/build.gradle.kts +++ b/data/weather/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -28,8 +30,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.weather" } diff --git a/data/websites/build.gradle.kts b/data/websites/build.gradle.kts index 679c11e40..d5f473fbc 100644 --- a/data/websites/build.gradle.kts +++ b/data/websites/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -27,8 +29,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.websites" } diff --git a/data/widgets/build.gradle.kts b/data/widgets/build.gradle.kts index b0c7c1957..24a32d9f2 100644 --- a/data/widgets/build.gradle.kts +++ b/data/widgets/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -28,8 +30,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.widgets" } diff --git a/data/wikipedia/build.gradle.kts b/data/wikipedia/build.gradle.kts index c0de7174d..a842162dd 100644 --- a/data/wikipedia/build.gradle.kts +++ b/data/wikipedia/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -27,8 +29,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.wikipedia" } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d790fe765..02b633dcb 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -10,7 +10,7 @@ pluginSdk = "2.2.0" gradle = "8.1.2" android-gradle-plugin = "8.12.0" -ksp-gradle-plugin = "2.1.21-2.0.1" +ksp-gradle-plugin = "2.2.10-2.0.2" kotlin = "2.2.10" kotlinx-coroutines = "1.10.2" @@ -19,8 +19,8 @@ kotlinx-serialization = "1.9.0" jetbrains-markdown = "0.7.3" -androidx-compose = "1.9.0-alpha04" -androidx-compose-material3 = "1.4.0-alpha15" +androidx-compose = "1.9.0-beta03" +androidx-compose-material3 = "1.5.0-alpha02" androidx-compose-materialicons = "1.7.8" androidx-lifecycle = "2.9.1" androidx-core = "1.17.0" diff --git a/libs/address-formatter/build.gradle.kts b/libs/address-formatter/build.gradle.kts index 0e93de6e7..afd8e23ce 100644 --- a/libs/address-formatter/build.gradle.kts +++ b/libs/address-formatter/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -28,8 +30,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.addressformatter" } diff --git a/libs/material-color-utilities/build.gradle.kts b/libs/material-color-utilities/build.gradle.kts index a790c26fe..d720fc7c3 100644 --- a/libs/material-color-utilities/build.gradle.kts +++ b/libs/material-color-utilities/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -27,8 +29,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.lib.materialcolorutilities" } diff --git a/libs/nextcloud/build.gradle.kts b/libs/nextcloud/build.gradle.kts index 30e8ff2d4..5e340532c 100644 --- a/libs/nextcloud/build.gradle.kts +++ b/libs/nextcloud/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -33,8 +35,10 @@ android { compose = true } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.nextcloud" } diff --git a/libs/owncloud/build.gradle.kts b/libs/owncloud/build.gradle.kts index 364f01e16..11795a707 100644 --- a/libs/owncloud/build.gradle.kts +++ b/libs/owncloud/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -29,8 +31,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } buildFeatures { diff --git a/libs/tinypinyin/build.gradle.kts b/libs/tinypinyin/build.gradle.kts index fc5fbdc2f..39f0437c7 100644 --- a/libs/tinypinyin/build.gradle.kts +++ b/libs/tinypinyin/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -27,8 +29,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.lib.tinypinyin" } diff --git a/libs/webdav/build.gradle.kts b/libs/webdav/build.gradle.kts index 2102c9f7c..1e81d2f67 100644 --- a/libs/webdav/build.gradle.kts +++ b/libs/webdav/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -27,8 +29,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.webdav" } diff --git a/plugins/sdk/build.gradle.kts b/plugins/sdk/build.gradle.kts index e22a74fd6..ce1e21753 100644 --- a/plugins/sdk/build.gradle.kts +++ b/plugins/sdk/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -39,8 +41,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.sdk" @@ -111,7 +115,7 @@ publishing { if (ghUser == "MM2-0") { maven { name = "GitHubPackages" - url = uri("https://maven.pkg.github.com/MM2-0/Kvaesitso") + url = uri("https.maven.pkg.github.com/MM2-0/Kvaesitso") credentials { username = project.findProperty("gpr.user") as String? ?: System.getenv("USERNAME") diff --git a/services/accounts/build.gradle.kts b/services/accounts/build.gradle.kts index b1741d127..6960a07f2 100644 --- a/services/accounts/build.gradle.kts +++ b/services/accounts/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -27,8 +29,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.accounts" } diff --git a/services/backup/build.gradle.kts b/services/backup/build.gradle.kts index 226628b99..4b5c5306e 100644 --- a/services/backup/build.gradle.kts +++ b/services/backup/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -27,8 +29,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.backup" } diff --git a/services/badges/build.gradle.kts b/services/badges/build.gradle.kts index 2d7fc9a5b..fe7b6cbb0 100644 --- a/services/badges/build.gradle.kts +++ b/services/badges/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -28,8 +30,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.badges" } diff --git a/services/favorites/build.gradle.kts b/services/favorites/build.gradle.kts index 4e772398a..0fc18c421 100644 --- a/services/favorites/build.gradle.kts +++ b/services/favorites/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -27,8 +29,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.services.favorites" } diff --git a/services/global-actions/build.gradle.kts b/services/global-actions/build.gradle.kts index 91ca810a0..bbf5e8a70 100644 --- a/services/global-actions/build.gradle.kts +++ b/services/global-actions/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -27,8 +29,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.globalactions" } diff --git a/services/icons/build.gradle.kts b/services/icons/build.gradle.kts index 7716ed169..7358e183a 100644 --- a/services/icons/build.gradle.kts +++ b/services/icons/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -27,8 +29,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.icons" } diff --git a/services/music/build.gradle.kts b/services/music/build.gradle.kts index 1b1f72dfe..e0e96be5d 100644 --- a/services/music/build.gradle.kts +++ b/services/music/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -27,8 +29,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.music" } diff --git a/services/plugins/build.gradle.kts b/services/plugins/build.gradle.kts index 19a65ed63..ab6a94d29 100644 --- a/services/plugins/build.gradle.kts +++ b/services/plugins/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -27,8 +29,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.services.plugins" } diff --git a/services/search/build.gradle.kts b/services/search/build.gradle.kts index e24d97722..403d170b8 100644 --- a/services/search/build.gradle.kts +++ b/services/search/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -27,8 +29,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.search" } diff --git a/services/tags/build.gradle.kts b/services/tags/build.gradle.kts index 2e48ad6c7..b5e24afae 100644 --- a/services/tags/build.gradle.kts +++ b/services/tags/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -27,8 +29,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.services.tags" } diff --git a/services/widgets/build.gradle.kts b/services/widgets/build.gradle.kts index 253d3ee15..d6fb16bf4 100644 --- a/services/widgets/build.gradle.kts +++ b/services/widgets/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.library) alias(libs.plugins.kotlin.android) @@ -27,8 +29,10 @@ android { targetCompatibility = JavaVersion.VERSION_1_8 } - kotlinOptions { - jvmTarget = "1.8" + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_1_8) + } } namespace = "de.mm20.launcher2.services.widgets" }