From a9d7e372a5c405d609a4636dbfbb453aa90da554 Mon Sep 17 00:00:00 2001 From: Pun Butrach Date: Tue, 23 Sep 2025 01:12:11 +0700 Subject: [PATCH] chore: Update dependencies Signed-off-by: Pun Butrach --- build.gradle | 21 +++--- compatLib/build.gradle | 2 +- gradle/libs.versions.toml | 106 +++++++++++++++++------------- systemUI/anim/build.gradle | 2 +- systemUI/common/build.gradle | 2 +- systemUI/log/build.gradle | 4 +- systemUI/plugin/build.gradle | 2 +- systemUI/plugin_core/build.gradle | 2 +- systemUI/shared/build.gradle | 8 +-- systemUI/unfold/build.gradle | 10 +-- systemUI/utils/build.gradle | 2 +- wmshell/build.gradle | 6 +- 12 files changed, 89 insertions(+), 78 deletions(-) diff --git a/build.gradle b/build.gradle index 1828e499f0..10f47c719c 100644 --- a/build.gradle +++ b/build.gradle @@ -8,11 +8,11 @@ plugins { id 'com.android.library' version "8.13.0" apply false id 'com.android.test' version '8.13.0' apply false id 'androidx.baselineprofile' version '1.4.1' - id 'org.jetbrains.kotlin.android' version "2.2.10" - id 'org.jetbrains.kotlin.plugin.compose' version "2.2.10" - id 'org.jetbrains.kotlin.plugin.parcelize' version "2.2.10" - id 'org.jetbrains.kotlin.plugin.serialization' version "2.2.10" - id "com.google.devtools.ksp" version "2.2.10-2.0.2" + id 'org.jetbrains.kotlin.android' version "2.2.10" // Don't ever update to 2.2.20 + id 'org.jetbrains.kotlin.plugin.compose' version "2.2.10" // Don't ever update to 2.2.20 + id 'org.jetbrains.kotlin.plugin.parcelize' version "2.2.10" // Don't ever update to 2.2.20 + id 'org.jetbrains.kotlin.plugin.serialization' version "2.2.10" // Don't ever update to 2.2.20 + id "com.google.devtools.ksp" version "2.2.10-2.0.2" // Don't ever update to 2.2.20 id 'com.google.protobuf' version "0.9.5" id 'app.cash.licensee' version "1.13.0" id 'dev.rikka.tools.refine' version "4.4.0" @@ -32,7 +32,7 @@ tasks.withType(KotlinCompile).configureEach { allprojects { plugins.withType(AndroidBasePlugin).configureEach { android { - buildToolsVersion "36.0.0" + buildToolsVersion "36.1.0" compileSdk 36 defaultConfig { minSdk 26 @@ -95,7 +95,6 @@ allprojects { ext { FRAMEWORK_PREBUILTS_DIR = "$rootDir/prebuilts/libs" - daggerVersion = '2.57.1' addFrameworkJar = { String name -> def frameworkJar = new File(FRAMEWORK_PREBUILTS_DIR, name) @@ -144,7 +143,7 @@ final def ciRunNumber = System.getenv("GITHUB_RUN_NUMBER") ?: "" final def isReleaseBuild = ciBuild && ciRef.contains("beta") final def devReleaseName = ciBuild ? "Dev.(#${ciRunNumber})" : "Dev.(${buildCommit})" final def version = "16" -final def releaseName = "Development 1 Release 0" +final def releaseName = "Development 2 Release 0" final def versionDisplayName = "${version}.${isReleaseBuild ? releaseName : devReleaseName}" final def majorVersion = versionDisplayName.split("\\.")[0] @@ -155,7 +154,7 @@ android { namespace "com.android.launcher3" defaultConfig { /* - * Lawnchair Launcher 16.0 Development 1 Release 0 + * Lawnchair Launcher 16.0 Development 2 Release 0 * see CONTRIBUTING.md#versioning-scheme */ versionCode 16_00_00_01_00 @@ -438,8 +437,8 @@ dependencies { implementation libs.compose.material3.windowSizeClass ksp libs.dagger.compiler - implementation libs.hilt.android - ksp libs.hilt.compiler + implementation libs.dagger.hilt.android + ksp libs.dagger.hilt.compiler implementation libs.bundles.room ksp libs.room.compiler diff --git a/compatLib/build.gradle b/compatLib/build.gradle index ad26c9022d..1b8ec620d6 100644 --- a/compatLib/build.gradle +++ b/compatLib/build.gradle @@ -3,7 +3,7 @@ plugins { } android { - buildToolsVersion "36.0.0" + buildToolsVersion "36.1.0" namespace "app.lawnchair.compatlib" buildFeatures { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 38da51ad8c..557165b521 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,32 +1,24 @@ [versions] -# From variables in original build.gradle accompanist = "0.37.3" -benchmarkMacroJunit4 = "1.4.1" -coreAnimation = "1.0.0" -coreKtx = "1.17.0" -error_prone_annotations = "2.41.0" -espressoCore = "3.7.0" -junit = "1.3.0" -kotlinStdlibJdk7 = "2.2.10" -opto = "1.0.18" -protocVersion = "4.32.1" -retrofit = "3.0.0" -room = "2.8.0" - -# Individual dependency versions activityCompose = "1.11.0" -airbnbLottie = "6.6.7" +airbnbLottie = "6.6.9" androidDesugar = "2.1.5" +benchmarkMacroJunit4 = "1.4.1" coil = "2.7.0" -composeBom = "2025.09.00" compose = "1.9.1" +composeBom = "2025.09.00" composeMaterial = "1.9.1" composeMaterial3 = "1.5.0-alpha04" composeMaterialIcons = "1.7.8" +concurrentFutures = "1.3.0" constraintlayout = "2.2.1" +coreAnimation = "1.0.0" +coreKtx = "1.17.0" dagger = "2.57.1" datastore = "1.1.7" dynamicanimation = "1.1.0" +errorProneAnnotations = "2.42.0" +espressoCore = "3.7.0" fuzzywuzzy = "1.4.0" googleMaterial = "1.13.0" graphicsCore = "1.0.3" @@ -34,31 +26,41 @@ graphicsPath = "1.0.1" graphicsShapes = "1.1.0-rc01" hokoBlur = "1.5.5" javaxInject = "1" +junit = "1.3.0" kdrag0nColorkt = "1.0.5" +kotlinStdlibJdk7 = "2.2.10" kotlinxCoroutines = "1.10.2" kotlinxSerialization = "1.9.0" libsu = "6.0.0" -lifecycle = "2.9.3" +lifecycle = "2.9.4" materialMotionCompose = "2.0.1" navigationCompose = "2.9.4" okhttp = "5.1.0" +opto = "1.0.18" palette = "1.0.0" persianDate = "1.7.1" preference = "1.2.1" profileinstaller = "1.4.1" +protocVersion = "4.32.1" recyclerview = "1.4.0" reorderable = "2.5.1" restrictionBypass = "2.2" +retrofit = "3.0.0" rikkaRefine = "4.4.0" +room = "2.8.0" slice = "1.1.0-alpha02" smartspacer = "1.1.2" uiautomator = "2.3.0" window = "1.4.0" [libraries] -# AndroidX +accompanist-adaptive = { group = "com.google.accompanist", name = "accompanist-adaptive", version.ref = "accompanist" } +accompanist-drawablepainter = { group = "com.google.accompanist", name = "accompanist-drawablepainter", version.ref = "accompanist" } +accompanist-permissions = { group = "com.google.accompanist", name = "accompanist-permissions", version.ref = "accompanist" } + androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" } androidx-benchmark-macro-junit4 = { module = "androidx.benchmark:benchmark-macro-junit4", version.ref = "benchmarkMacroJunit4" } +androidx-concurrent-futures = { module = "androidx.concurrent:concurrent-futures", version.ref = "concurrentFutures" } androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" } androidx-core-animation = { module = "androidx.core:core-animation", version.ref = "coreAnimation" } androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "coreKtx" } @@ -69,6 +71,7 @@ androidx-graphics-core = { group = "androidx.graphics", name = "graphics-core", androidx-graphics-path = { group = "androidx.graphics", name = "graphics-path", version.ref = "graphicsPath" } androidx-graphics-shapes = { group = "androidx.graphics", name = "graphics-shapes", version.ref = "graphicsShapes" } androidx-junit = { module = "androidx.test.ext:junit", version.ref = "junit" } +androidx-lifecycle-common = { module = "androidx.lifecycle:lifecycle-common", version.ref = "lifecycle" } androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "lifecycle" } androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigationCompose" } androidx-palette-ktx = { group = "androidx.palette", name = "palette-ktx", version.ref = "palette" } @@ -79,7 +82,6 @@ androidx-slice-core = { group = "androidx.slice", name = "slice-core", version.r androidx-uiautomator = { module = "androidx.test.uiautomator:uiautomator", version.ref = "uiautomator" } androidx-window = { group = "androidx.window", name = "window", version.ref = "window" } -# Compose compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" } compose-foundation = { group = "androidx.compose.foundation", name = "foundation", version.ref = "compose" } compose-material = { group = "androidx.compose.material", name = "material", version.ref = "composeMaterial" } @@ -89,49 +91,40 @@ compose-material3-windowSizeClass = { group = "androidx.compose.material3", name compose-runtime-livedata = { group = "androidx.compose.runtime", name = "runtime-livedata", version.ref = "compose" } compose-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "compose" } compose-ui-google-fonts = { group = "androidx.compose.ui", name = "ui-text-google-fonts", version.ref = "compose" } +compose-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics", version.ref = "compose"} compose-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "compose" } compose-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview", version.ref = "compose" } compose-ui-util = { group = "androidx.compose.ui", name = "ui-util", version.ref = "compose" } -compose-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics", version.ref = "compose"} -# Dagger & Hilt dagger-compiler = { group = "com.google.dagger", name = "dagger-compiler", version.ref = "dagger" } -error_prone_annotations = { module = "com.google.errorprone:error_prone_annotations", version.ref = "error_prone_annotations" } -hilt-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "dagger" } -hilt-compiler = { group = "com.google.dagger", name = "hilt-compiler", version.ref = "dagger" } +dagger-hilt-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "dagger" } +dagger-hilt-compiler = { group = "com.google.dagger", name = "hilt-compiler", version.ref = "dagger" } -# Accompanist -accompanist-adaptive = { group = "com.google.accompanist", name = "accompanist-adaptive", version.ref = "accompanist" } -accompanist-drawablepainter = { group = "com.google.accompanist", name = "accompanist-drawablepainter", version.ref = "accompanist" } -accompanist-permissions = { group = "com.google.accompanist", name = "accompanist-permissions", version.ref = "accompanist" } +google-errorprone-annotations = { module = "com.google.errorprone:error_prone_annotations", version.ref = "errorProneAnnotations" } +google-material = { group = "com.google.android.material", name = "material", version.ref = "googleMaterial" } -# Opto kotlin-stdlib-jdk7 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk7", version.ref = "kotlinStdlibJdk7" } -opto-core = { group = "com.patrykmichalik.opto", name = "core", version.ref = "opto" } +kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "kotlinxCoroutines" } +kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinxSerialization" } + opto-compose = { group = "com.patrykmichalik.opto", name = "compose", version.ref = "opto" } +opto-core = { group = "com.patrykmichalik.opto", name = "core", version.ref = "opto" } opto-domain = { group = "com.patrykmichalik.opto", name = "domain", version.ref = "opto" } -# Retrofit & OkHttp protobuf-javalite = { module = "com.google.protobuf:protobuf-javalite", version.ref = "protocVersion" } -retrofit-core = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" } -retrofit-converter-kotlinx = { group = "com.squareup.retrofit2", name = "converter-kotlinx-serialization", version.ref = "retrofit" } -okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp" } -# Room +retrofit-converter-kotlinx = { group = "com.squareup.retrofit2", name = "converter-kotlinx-serialization", version.ref = "retrofit" } +retrofit-core = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" } +squareup-okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp" } + room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = "room" } room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "room" } room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "room" } -# KotlinX -kotlinx-coroutines-android = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-android", version.ref = "kotlinxCoroutines" } -kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinxSerialization" } - -# Other -android-desugarJdkLibs = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "androidDesugar" } airbnb-lottie = { group = "com.airbnb.android", name = "lottie", version.ref = "airbnbLottie" } +android-desugarJdkLibs = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "androidDesugar" } chickenhook-restrictionbypass = { group = "com.github.ChickenHook", name = "RestrictionBypass", version.ref = "restrictionBypass" } coil-compose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coil" } -google-material = { group = "com.google.android.material", name = "material", version.ref = "googleMaterial" } hoko-blur = { group = "io.github.hokofly", name = "hoko-blur", version.ref = "hokoBlur" } javax-inject = { group = "javax.inject", name = "javax.inject", version.ref = "javaxInject" } kdrag0n-colorkt = { group = "dev.kdrag0n", name = "colorkt", version.ref = "kdrag0nColorkt" } @@ -146,8 +139,27 @@ smartspacer-sdk = { group = "com.kieronquinn.smartspacer", name = "sdk-client", xdrop-fuzzywuzzy = { group = "me.xdrop", name = "fuzzywuzzy", version.ref = "fuzzywuzzy" } [bundles] -accompanist = ["accompanist-adaptive", "accompanist-drawablepainter", "accompanist-permissions"] -graphics = ["androidx-graphics-core", "androidx-graphics-path", "androidx-graphics-shapes"] -opto = ["opto-domain", "opto-core", "opto-compose"] -retrofit = ["retrofit-core", "retrofit-converter-kotlinx", "okhttp"] -room = ["room-runtime", "room-ktx"] +accompanist = [ + "accompanist-adaptive", + "accompanist-drawablepainter", + "accompanist-permissions", +] +graphics = [ + "androidx-graphics-core", + "androidx-graphics-path", + "androidx-graphics-shapes", +] +opto = [ + "opto-domain", + "opto-core", + "opto-compose", +] +retrofit = [ + "retrofit-core", + "retrofit-converter-kotlinx", + "squareup-okhttp", +] +room = [ + "room-runtime", + "room-ktx", +] diff --git a/systemUI/anim/build.gradle b/systemUI/anim/build.gradle index 8001f2c25f..9f90d2a926 100644 --- a/systemUI/anim/build.gradle +++ b/systemUI/anim/build.gradle @@ -17,7 +17,7 @@ compileOnlyCommonJars() // TODO: Pull out surfaceeffects outside of src and have separate build files there. android { - buildToolsVersion "36.0.0" + buildToolsVersion "36.1.0" namespace "com.android.systemui.animation" buildFeatures { aidl true diff --git a/systemUI/common/build.gradle b/systemUI/common/build.gradle index 4659cdde29..7f798f659f 100644 --- a/systemUI/common/build.gradle +++ b/systemUI/common/build.gradle @@ -4,7 +4,7 @@ plugins { } android { - buildToolsVersion "36.0.0" + buildToolsVersion "36.1.0" namespace "com.android.systemui.common" sourceSets { diff --git a/systemUI/log/build.gradle b/systemUI/log/build.gradle index 622d76533d..652d6f2115 100644 --- a/systemUI/log/build.gradle +++ b/systemUI/log/build.gradle @@ -4,7 +4,7 @@ plugins { } android { - buildToolsVersion "36.0.0" + buildToolsVersion "36.1.0" namespace "com.android.systemui.log" buildFeatures { aidl true @@ -24,5 +24,5 @@ compileOnlyCommonJars() dependencies { compileOnly projects.plugincore compileOnly projects.common - implementation libs.error.prone.annotations + implementation libs.google.errorprone.annotations } diff --git a/systemUI/plugin/build.gradle b/systemUI/plugin/build.gradle index e8ac2741e9..d550eba8cd 100644 --- a/systemUI/plugin/build.gradle +++ b/systemUI/plugin/build.gradle @@ -4,7 +4,7 @@ plugins { } android { - buildToolsVersion "36.0.0" + buildToolsVersion "36.1.0" namespace "com.android.systemui.plugins" buildFeatures { aidl true diff --git a/systemUI/plugin_core/build.gradle b/systemUI/plugin_core/build.gradle index fb0bc60676..637ebe5ff6 100644 --- a/systemUI/plugin_core/build.gradle +++ b/systemUI/plugin_core/build.gradle @@ -4,7 +4,7 @@ plugins { } android { - buildToolsVersion "36.0.0" + buildToolsVersion "36.1.0" namespace "com.android.systemui.plugin_core" buildFeatures { aidl true diff --git a/systemUI/shared/build.gradle b/systemUI/shared/build.gradle index 8c06124a55..1336a0a2f9 100644 --- a/systemUI/shared/build.gradle +++ b/systemUI/shared/build.gradle @@ -17,7 +17,7 @@ tasks.withType(KotlinCompile).configureEach { compileOnlyCommonJars() android { - buildToolsVersion "36.0.0" + buildToolsVersion "36.1.0" namespace "com.android.systemui.shared" buildFeatures { aidl true @@ -48,8 +48,8 @@ dependencies { compileOnly projects.animationlib compileOnly projects.utils - implementation "com.google.dagger:hilt-android:$daggerVersion" - ksp "com.google.dagger:hilt-compiler:$daggerVersion" + implementation libs.dagger.hilt.android + ksp libs.dagger.hilt.compiler - implementation "androidx.concurrent:concurrent-futures:1.3.0" + implementation libs.androidx.concurrent.futures } diff --git a/systemUI/unfold/build.gradle b/systemUI/unfold/build.gradle index f107f67bae..bcd7b48a08 100644 --- a/systemUI/unfold/build.gradle +++ b/systemUI/unfold/build.gradle @@ -5,7 +5,7 @@ plugins { } android { - buildToolsVersion "36.0.0" + buildToolsVersion "36.1.0" namespace "com.android.systemui.unfold" buildFeatures { aidl true @@ -25,11 +25,11 @@ addFrameworkJar('framework-16.jar') compileOnlyCommonJars() dependencies { - implementation "com.google.dagger:hilt-android:$daggerVersion" - ksp "com.google.dagger:hilt-compiler:$daggerVersion" + implementation libs.dagger.hilt.android + ksp libs.dagger.hilt.compiler - implementation "androidx.concurrent:concurrent-futures:1.3.0" - implementation "androidx.lifecycle:lifecycle-common:2.9.4" + implementation libs.androidx.concurrent.futures + implementation libs.androidx.lifecycle.common compileOnly projects.androidxLib } diff --git a/systemUI/utils/build.gradle b/systemUI/utils/build.gradle index beffdf1a41..27eb9a70a3 100644 --- a/systemUI/utils/build.gradle +++ b/systemUI/utils/build.gradle @@ -4,7 +4,7 @@ plugins { } android { - buildToolsVersion "36.0.0" + buildToolsVersion "36.1.0" namespace "com.android.systemui.utils" sourceSets { main { diff --git a/wmshell/build.gradle b/wmshell/build.gradle index 444ebfe086..427ff3120b 100644 --- a/wmshell/build.gradle +++ b/wmshell/build.gradle @@ -17,7 +17,7 @@ tasks.withType(KotlinCompile).configureEach { compileOnlyCommonJars() android { - buildToolsVersion "36.0.0" + buildToolsVersion "36.1.0" namespace "com.android.wm.shell" buildFeatures { aidl true @@ -36,8 +36,8 @@ addFrameworkJar('framework-16.jar') compileOnlyCommonJars() dependencies { - implementation libs.hilt.android - ksp libs.hilt.compiler + implementation libs.dagger.hilt.android + ksp libs.dagger.hilt.compiler implementation libs.androidx.core.animation implementation libs.androidx.dynamicanimation implementation projects.iconloaderlib