diff --git a/app/app/build.gradle.kts b/app/app/build.gradle.kts index 27c29cc8a..ae9abe1cc 100644 --- a/app/app/build.gradle.kts +++ b/app/app/build.gradle.kts @@ -89,12 +89,12 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } diff --git a/app/ui/build.gradle.kts b/app/ui/build.gradle.kts index 104ac406a..f8f4580c9 100644 --- a/app/ui/build.gradle.kts +++ b/app/ui/build.gradle.kts @@ -38,13 +38,13 @@ android { } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) optIn.add("androidx.compose.ui.ExperimentalComposeUiApi") optIn.add("androidx.compose.foundation.ExperimentalFoundationApi") optIn.add("androidx.compose.ui.text.ExperimentalTextApi") diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/component/Toolbar.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/component/Toolbar.kt index f310bc30c..a10cdbb44 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/component/Toolbar.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/component/Toolbar.kt @@ -148,7 +148,7 @@ fun ColumnScope.OverflowMenuItems(items: List, onDismiss: () -> U leadingIcon = { Icon(painterResource(action.icon), null) }, - trailingIcon = { + trailingContent = { Icon(painterResource(R.drawable.arrow_right_24px), null) }, shape = when { diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/CustomizeSearchableSheet.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/CustomizeSearchableSheet.kt index 10875b446..5cc6faf28 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/CustomizeSearchableSheet.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/sheets/CustomizeSearchableSheet.kt @@ -15,11 +15,12 @@ import androidx.compose.foundation.layout.size import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material3.DropdownMenuItem +import androidx.compose.material3.ExposedDropdownMenu +import androidx.compose.material3.ExposedDropdownMenuAnchorType import androidx.compose.material3.ExposedDropdownMenuBox import androidx.compose.material3.ExposedDropdownMenuDefaults import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.MenuAnchorType import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -156,7 +157,7 @@ fun CustomizeSearchableSheet( OutlinedTextField( modifier = Modifier .fillMaxWidth() - .menuAnchor(MenuAnchorType.PrimaryNotEditable), + .menuAnchor(ExposedDropdownMenuAnchorType.PrimaryNotEditable), value = when (visibility) { VisibilityLevel.Default -> { when (searchable) { diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/hiddenitems/HiddenItemsSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/hiddenitems/HiddenItemsSettingsScreen.kt index c7a66662e..194e5d413 100644 --- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/hiddenitems/HiddenItemsSettingsScreen.kt +++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/hiddenitems/HiddenItemsSettingsScreen.kt @@ -219,7 +219,7 @@ private fun VisibilityDropdown( DropdownMenuGroup( shapes = MenuDefaults.groupShapes(), ) { - MenuDefaults.Label { + MenuDefaults.DropdownMenuGroupLabel { Text( text = stringResource(R.string.customize_item_visibility), ) diff --git a/core/base/build.gradle.kts b/core/base/build.gradle.kts index 671758ba4..d445c41c8 100644 --- a/core/base/build.gradle.kts +++ b/core/base/build.gradle.kts @@ -33,13 +33,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.base" diff --git a/core/compat/build.gradle.kts b/core/compat/build.gradle.kts index 8957094ad..ed91f42a5 100644 --- a/core/compat/build.gradle.kts +++ b/core/compat/build.gradle.kts @@ -28,13 +28,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.compat" diff --git a/core/crashreporter/build.gradle.kts b/core/crashreporter/build.gradle.kts index f00f78291..cd1095ac9 100644 --- a/core/crashreporter/build.gradle.kts +++ b/core/crashreporter/build.gradle.kts @@ -28,13 +28,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.crashreporter" diff --git a/core/devicepose/build.gradle.kts b/core/devicepose/build.gradle.kts index dd0ecce90..120efac1d 100644 --- a/core/devicepose/build.gradle.kts +++ b/core/devicepose/build.gradle.kts @@ -29,12 +29,12 @@ android { } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } } diff --git a/core/i18n/build.gradle.kts b/core/i18n/build.gradle.kts index 9c8d556f3..e5b1d9d7a 100644 --- a/core/i18n/build.gradle.kts +++ b/core/i18n/build.gradle.kts @@ -28,13 +28,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.i18n" diff --git a/core/ktx/build.gradle.kts b/core/ktx/build.gradle.kts index 2a20584cb..2bf652476 100644 --- a/core/ktx/build.gradle.kts +++ b/core/ktx/build.gradle.kts @@ -28,13 +28,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.ktx" diff --git a/core/permissions/build.gradle.kts b/core/permissions/build.gradle.kts index 6cc05d930..045d3631f 100644 --- a/core/permissions/build.gradle.kts +++ b/core/permissions/build.gradle.kts @@ -28,13 +28,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.permissions" diff --git a/core/preferences/build.gradle.kts b/core/preferences/build.gradle.kts index 08de9f4e5..0514c64a6 100644 --- a/core/preferences/build.gradle.kts +++ b/core/preferences/build.gradle.kts @@ -29,13 +29,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.preferences" diff --git a/core/profiles/build.gradle.kts b/core/profiles/build.gradle.kts index cc1e4b934..7651dfc4a 100644 --- a/core/profiles/build.gradle.kts +++ b/core/profiles/build.gradle.kts @@ -33,13 +33,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.profiles" diff --git a/core/shared/build.gradle.kts b/core/shared/build.gradle.kts index 47e295871..d1868e3ad 100644 --- a/core/shared/build.gradle.kts +++ b/core/shared/build.gradle.kts @@ -36,13 +36,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.shared" diff --git a/data/applications/build.gradle.kts b/data/applications/build.gradle.kts index 9d5b96aed..bc7f40611 100644 --- a/data/applications/build.gradle.kts +++ b/data/applications/build.gradle.kts @@ -28,13 +28,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.applications" diff --git a/data/appshortcuts/build.gradle.kts b/data/appshortcuts/build.gradle.kts index ef85dbbab..583593dd5 100644 --- a/data/appshortcuts/build.gradle.kts +++ b/data/appshortcuts/build.gradle.kts @@ -28,13 +28,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.appshortcuts" diff --git a/data/calculator/build.gradle.kts b/data/calculator/build.gradle.kts index 3ce0853e7..124c837e4 100644 --- a/data/calculator/build.gradle.kts +++ b/data/calculator/build.gradle.kts @@ -28,13 +28,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.calculator" diff --git a/data/calendar/build.gradle.kts b/data/calendar/build.gradle.kts index cd9c290c3..bb7edb54d 100644 --- a/data/calendar/build.gradle.kts +++ b/data/calendar/build.gradle.kts @@ -29,13 +29,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.calendar" diff --git a/data/contacts/build.gradle.kts b/data/contacts/build.gradle.kts index a6c8fef04..2fcd2fb5c 100644 --- a/data/contacts/build.gradle.kts +++ b/data/contacts/build.gradle.kts @@ -28,13 +28,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.contacts" diff --git a/data/currencies/build.gradle.kts b/data/currencies/build.gradle.kts index ea8fde11c..c9921a564 100644 --- a/data/currencies/build.gradle.kts +++ b/data/currencies/build.gradle.kts @@ -28,13 +28,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.currencies" diff --git a/data/customattrs/build.gradle.kts b/data/customattrs/build.gradle.kts index d054e6691..1d0e20d8b 100644 --- a/data/customattrs/build.gradle.kts +++ b/data/customattrs/build.gradle.kts @@ -28,13 +28,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.data.customattrs" diff --git a/data/database/build.gradle.kts b/data/database/build.gradle.kts index 905e3c84c..6d2c14468 100644 --- a/data/database/build.gradle.kts +++ b/data/database/build.gradle.kts @@ -36,13 +36,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.database" diff --git a/data/files/build.gradle.kts b/data/files/build.gradle.kts index c4a43f34e..22fde9cb3 100644 --- a/data/files/build.gradle.kts +++ b/data/files/build.gradle.kts @@ -29,13 +29,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.files" diff --git a/data/i18n/build.gradle.kts b/data/i18n/build.gradle.kts index 9b8c7d11b..34bdd6f2c 100644 --- a/data/i18n/build.gradle.kts +++ b/data/i18n/build.gradle.kts @@ -29,13 +29,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.data.i18n" diff --git a/data/locations/build.gradle.kts b/data/locations/build.gradle.kts index 69efb4a18..407d40333 100644 --- a/data/locations/build.gradle.kts +++ b/data/locations/build.gradle.kts @@ -30,12 +30,12 @@ android { } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } } diff --git a/data/notifications/build.gradle.kts b/data/notifications/build.gradle.kts index 138fcd19e..c06279852 100644 --- a/data/notifications/build.gradle.kts +++ b/data/notifications/build.gradle.kts @@ -28,13 +28,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.notifications" diff --git a/data/plugins/build.gradle.kts b/data/plugins/build.gradle.kts index 1f3cbf540..c0525fa03 100644 --- a/data/plugins/build.gradle.kts +++ b/data/plugins/build.gradle.kts @@ -28,13 +28,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.data.plugins" diff --git a/data/search-actions/build.gradle.kts b/data/search-actions/build.gradle.kts index 6a3957cd3..6fe61ef42 100644 --- a/data/search-actions/build.gradle.kts +++ b/data/search-actions/build.gradle.kts @@ -28,13 +28,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.searchactions" diff --git a/data/searchable/build.gradle.kts b/data/searchable/build.gradle.kts index 334d49f9a..7332cfe58 100644 --- a/data/searchable/build.gradle.kts +++ b/data/searchable/build.gradle.kts @@ -28,13 +28,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.favorites" diff --git a/data/themes/build.gradle.kts b/data/themes/build.gradle.kts index b48ab0389..d1f3ff1d3 100644 --- a/data/themes/build.gradle.kts +++ b/data/themes/build.gradle.kts @@ -29,13 +29,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.themes" diff --git a/data/unitconverter/build.gradle.kts b/data/unitconverter/build.gradle.kts index 1985bb666..db62ad3cc 100644 --- a/data/unitconverter/build.gradle.kts +++ b/data/unitconverter/build.gradle.kts @@ -28,13 +28,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.unitconverter" diff --git a/data/weather/build.gradle.kts b/data/weather/build.gradle.kts index 634b2e554..f31185336 100644 --- a/data/weather/build.gradle.kts +++ b/data/weather/build.gradle.kts @@ -29,13 +29,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.weather" diff --git a/data/websites/build.gradle.kts b/data/websites/build.gradle.kts index 9ec804222..e897ef126 100644 --- a/data/websites/build.gradle.kts +++ b/data/websites/build.gradle.kts @@ -28,13 +28,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.websites" diff --git a/data/widgets/build.gradle.kts b/data/widgets/build.gradle.kts index bfa6e53f1..ac185874d 100644 --- a/data/widgets/build.gradle.kts +++ b/data/widgets/build.gradle.kts @@ -29,13 +29,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.widgets" diff --git a/data/wikipedia/build.gradle.kts b/data/wikipedia/build.gradle.kts index c4e282ea4..51d1af3fa 100644 --- a/data/wikipedia/build.gradle.kts +++ b/data/wikipedia/build.gradle.kts @@ -29,13 +29,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.wikipedia" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ccbbd4809..5579131fe 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,38 +9,38 @@ targetSdk = "36" pluginSdk = "2.3.0" -android-gradle-plugin = "9.2.1" +android-gradle-plugin = "9.3.1" ksp-gradle-plugin = "2.3.4" -kotlin = "2.3.21" +kotlin = "2.4.10" kotlinx-coroutines = "1.11.0" -kotlinx-immutable = "0.4.0" +kotlinx-immutable = "0.5.1" kotlinx-serialization = "1.11.0" -jetbrains-markdown = "0.7.3" +jetbrains-markdown = "0.7.8" -androidx-compose = "1.12.0-alpha02" -androidx-compose-material3 = "1.5.0-alpha19" -androidx-compose-material3adaptive = "1.3.0-beta01" -androidx-lifecycle = "2.10.0" -androidx-core = "1.18.0" -androidx-appcompat = "1.7.1" +androidx-compose = "1.13.0-alpha01" +androidx-compose-material3 = "1.5.0-alpha26" +androidx-compose-material3adaptive = "1.3.0" +androidx-lifecycle = "2.11.0" +androidx-core = "1.19.0" +androidx-appcompat = "1.8.0" androidx-activity = "1.13.0" -androidx-navigation3 = "1.1.1" +androidx-navigation3 = "1.1.6" # Careful, 2.10.0 seems to require some fixes, or jobs aren't executed androidx-work = "2.11.2" androidx-browser = "1.10.0" androidx-palette = "1.0.0" androidx-room = "2.8.4" -androidx-constraint-layout = "1.1.1" +androidx-constraint-layout = "1.1.2" androidx-emojipicker = "1.6.0" accompanist = "0.36.0" haze = "1.7.2" coil = "2.7.0" -koin = "4.2.1" -ktor = "3.4.3" +koin = "4.2.2" +ktor = "3.5.2" junit = "4.13.2" junitVersion = "1.2.1" espressoCore = "3.6.1" @@ -115,7 +115,7 @@ coil-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coi leakcanary = { group = "com.squareup.leakcanary", name = "leakcanary", version = "2.10" } suncalc = { group = "org.shredzone.commons", name = "commons-suncalc", version = "3.11" } -jsoup = { group = "org.jsoup", name = "jsoup", version = "1.22.2" } +jsoup = { group = "org.jsoup", name = "jsoup", version = "1.23.1" } commons-text = { group = "org.apache.commons", name = "commons-text", version = "1.15.0" } stringsimilarity = { group = "com.aallam.similarity", name = "string-similarity-kotlin", version = "0.1.0" } @@ -131,7 +131,7 @@ androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-co osmopeninghours = { group = "de.westnordost", name = "osm-opening-hours", version.ref = "osmOpeningHours" } -smartspacer = { group = "com.kieronquinn.smartspacer", name = "sdk-client", version = "1.1.2" } +smartspacer = { group = "com.kieronquinn.smartspacer", name = "sdk-client", version = "1.2" } [bundles] kotlin = ["kotlin-stdlib", "kotlinx-coroutines-core", "kotlinx-coroutines-android", "kotlinx-collections-immutable", "kotlinx-serialization-json"] diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7a156c4aa..05b60b4c4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ -#Fri May 08 20:51:19 CEST 2026 +#Wed Aug 12 22:06:16 CEST 2026 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip +distributionSha256Sum=553c78f50dafcd54d65b9a444649057857469edf836431389695608536d6b746 +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/address-formatter/build.gradle.kts b/libs/address-formatter/build.gradle.kts index c4c0dc926..c9bb60998 100644 --- a/libs/address-formatter/build.gradle.kts +++ b/libs/address-formatter/build.gradle.kts @@ -29,13 +29,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.addressformatter" diff --git a/libs/material-color-utilities/build.gradle.kts b/libs/material-color-utilities/build.gradle.kts index ea36ea790..eefc3ba92 100644 --- a/libs/material-color-utilities/build.gradle.kts +++ b/libs/material-color-utilities/build.gradle.kts @@ -28,13 +28,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.lib.materialcolorutilities" diff --git a/libs/nextcloud/build.gradle.kts b/libs/nextcloud/build.gradle.kts index 844e607d6..0f20d6009 100644 --- a/libs/nextcloud/build.gradle.kts +++ b/libs/nextcloud/build.gradle.kts @@ -30,8 +30,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } buildFeatures { @@ -40,7 +40,7 @@ android { kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.nextcloud" diff --git a/libs/owncloud/build.gradle.kts b/libs/owncloud/build.gradle.kts index f07904b53..ec858c525 100644 --- a/libs/owncloud/build.gradle.kts +++ b/libs/owncloud/build.gradle.kts @@ -30,13 +30,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } diff --git a/libs/webdav/build.gradle.kts b/libs/webdav/build.gradle.kts index f67744a61..115ee5f21 100644 --- a/libs/webdav/build.gradle.kts +++ b/libs/webdav/build.gradle.kts @@ -28,13 +28,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.webdav" diff --git a/plugins/sdk/build.gradle.kts b/plugins/sdk/build.gradle.kts index fbc1014b1..0874d92cf 100644 --- a/plugins/sdk/build.gradle.kts +++ b/plugins/sdk/build.gradle.kts @@ -40,13 +40,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.sdk" diff --git a/services/accounts/build.gradle.kts b/services/accounts/build.gradle.kts index 8dacd8d36..a814ec7bf 100644 --- a/services/accounts/build.gradle.kts +++ b/services/accounts/build.gradle.kts @@ -28,13 +28,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.accounts" diff --git a/services/backup/build.gradle.kts b/services/backup/build.gradle.kts index 92d09d331..506b76a8b 100644 --- a/services/backup/build.gradle.kts +++ b/services/backup/build.gradle.kts @@ -28,13 +28,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.backup" diff --git a/services/badges/build.gradle.kts b/services/badges/build.gradle.kts index 2e34fda1e..5d6f0a276 100644 --- a/services/badges/build.gradle.kts +++ b/services/badges/build.gradle.kts @@ -29,13 +29,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.badges" diff --git a/services/badges/src/main/java/de/mm20/launcher2/badges/Badge.kt b/services/badges/src/main/java/de/mm20/launcher2/badges/Badge.kt index 36d7ce488..d79b1b710 100644 --- a/services/badges/src/main/java/de/mm20/launcher2/badges/Badge.kt +++ b/services/badges/src/main/java/de/mm20/launcher2/badges/Badge.kt @@ -3,7 +3,6 @@ package de.mm20.launcher2.badges import android.graphics.drawable.Drawable import android.util.Log import androidx.annotation.DrawableRes -import androidx.compose.ui.graphics.vector.ImageVector sealed interface BadgeIcon { @JvmInline diff --git a/services/favorites/build.gradle.kts b/services/favorites/build.gradle.kts index ce55f6f63..cb112f333 100644 --- a/services/favorites/build.gradle.kts +++ b/services/favorites/build.gradle.kts @@ -28,13 +28,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.services.favorites" diff --git a/services/feed/build.gradle.kts b/services/feed/build.gradle.kts index 7914dc1a2..2cc194bf4 100644 --- a/services/feed/build.gradle.kts +++ b/services/feed/build.gradle.kts @@ -29,13 +29,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } diff --git a/services/global-actions/build.gradle.kts b/services/global-actions/build.gradle.kts index 62a086664..791b3e621 100644 --- a/services/global-actions/build.gradle.kts +++ b/services/global-actions/build.gradle.kts @@ -28,13 +28,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.globalactions" diff --git a/services/icons/build.gradle.kts b/services/icons/build.gradle.kts index f4019898d..f06d78091 100644 --- a/services/icons/build.gradle.kts +++ b/services/icons/build.gradle.kts @@ -28,13 +28,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.icons" diff --git a/services/music/build.gradle.kts b/services/music/build.gradle.kts index fb2220927..078cfa1ff 100644 --- a/services/music/build.gradle.kts +++ b/services/music/build.gradle.kts @@ -28,13 +28,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.music" diff --git a/services/plugins/build.gradle.kts b/services/plugins/build.gradle.kts index 9c85f1b8b..8ce3fbb33 100644 --- a/services/plugins/build.gradle.kts +++ b/services/plugins/build.gradle.kts @@ -28,13 +28,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.services.plugins" diff --git a/services/search/build.gradle.kts b/services/search/build.gradle.kts index d4a0536c1..8145bfb3e 100644 --- a/services/search/build.gradle.kts +++ b/services/search/build.gradle.kts @@ -28,13 +28,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.search" diff --git a/services/tags/build.gradle.kts b/services/tags/build.gradle.kts index 4f1cd96ce..81aadd4c4 100644 --- a/services/tags/build.gradle.kts +++ b/services/tags/build.gradle.kts @@ -28,13 +28,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.services.tags" diff --git a/services/widgets/build.gradle.kts b/services/widgets/build.gradle.kts index 241c24b5e..fe0c0b2be 100644 --- a/services/widgets/build.gradle.kts +++ b/services/widgets/build.gradle.kts @@ -28,13 +28,13 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_1_8) + jvmTarget.set(JvmTarget.JVM_11) } } namespace = "de.mm20.launcher2.services.widgets"