From af9bec1bc7d7e6462487b6154268d781e3ea403e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 1 Feb 2026 13:39:19 +0000 Subject: [PATCH 01/16] fix(deps): update protobuf monorepo to v4.33.5 (#6333) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index bad925266d..6447d48726 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,7 +7,7 @@ androidx-room = "2.8.4" androidx-lifecycle = "2.10.0" accompanist = "0.37.3" opto = "1.0.18" -protobuf = "4.33.4" +protobuf = "4.33.5" retrofit = "3.0.0" dagger = "2.59" libsu = "6.0.0" From d2ed19b23708c5cc6be68495f7e4cb99d4f73a49 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 1 Feb 2026 13:39:36 +0000 Subject: [PATCH 02/16] fix(deps): update dependency androidx.compose:compose-bom to v2026.01.01 (#6329) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6447d48726..b42a4fd5d0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -65,7 +65,7 @@ androidx-uiautomator = "androidx.test.uiautomator:uiautomator:2.3.0" androidx-window = "androidx.window:window:1.5.1" # Compose -compose-bom = "androidx.compose:compose-bom:2026.01.00" +compose-bom = "androidx.compose:compose-bom:2026.01.01" compose-foundation = { module = "androidx.compose.foundation:foundation" } compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout" } compose-material-icons = "androidx.compose.material:material-icons-extended:1.7.8" From f84b704d41718d9a6f9d3d2a4462683c56a2a3e6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 1 Feb 2026 13:39:40 +0000 Subject: [PATCH 03/16] fix(deps): update dependency androidx.compose.material3:material3 to v1.5.0-alpha13 (#6330) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b42a4fd5d0..75b02b5b71 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -69,7 +69,7 @@ compose-bom = "androidx.compose:compose-bom:2026.01.01" compose-foundation = { module = "androidx.compose.foundation:foundation" } compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout" } compose-material-icons = "androidx.compose.material:material-icons-extended:1.7.8" -compose-material3 = "androidx.compose.material3:material3:1.5.0-alpha12" +compose-material3 = "androidx.compose.material3:material3:1.5.0-alpha13" compose-material3-windowSizeClass = { module = "androidx.compose.material3:material3-window-size-class" } compose-runtime-livedata = { module = "androidx.compose.runtime:runtime-livedata" } compose-ui = { module = "androidx.compose.ui:ui" } From d7fb1cbba635ea76eb75523dc4ed81c2c97a7011 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 1 Feb 2026 13:39:41 +0000 Subject: [PATCH 04/16] fix(deps): update dependency androidx.navigation:navigation-compose to v2.9.7 (#6331) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 75b02b5b71..5ff04c7820 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -53,7 +53,7 @@ androidx-graphics-shapes = "androidx.graphics:graphics-shapes:1.1.0" androidx-junit = "androidx.test.ext:junit:1.3.0" androidx-lifecycle-common = { module = "androidx.lifecycle:lifecycle-common", version.ref = "androidx-lifecycle" } androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" } -androidx-navigation-compose = "androidx.navigation:navigation-compose:2.9.6" +androidx-navigation-compose = "androidx.navigation:navigation-compose:2.9.7" androidx-palette-ktx = "androidx.palette:palette-ktx:1.0.0" androidx-preference-ktx = "androidx.preference:preference-ktx:1.2.1" androidx-profileinstaller = "androidx.profileinstaller:profileinstaller:1.4.1" From a4f4ef2518812690ba927f859a785e5c697b08ef Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 1 Feb 2026 13:39:47 +0000 Subject: [PATCH 05/16] fix(deps): update dependency net.bytebuddy:byte-buddy-agent to v1.18.4 (#6302) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5ff04c7820..6b5923cc7f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -152,7 +152,7 @@ junit = { group = "junit", name = "junit", version.ref = "junitVersion" } mockito-kotlin = { group = "org.mockito.kotlin", name = "mockito-kotlin", version.ref = "mockitoKotlin" } mockito-robolectric = { group = "org.mockito", name = "mockito-core", version.ref = "mockito" } mockito-robolectric-bytebuddy = "net.bytebuddy:byte-buddy:1.18.4" -mockito-robolectric-bytebuddy-agent = "net.bytebuddy:byte-buddy-agent:1.15.11" +mockito-robolectric-bytebuddy-agent = "net.bytebuddy:byte-buddy-agent:1.18.4" [bundles] accompanist = ["accompanist-adaptive", "accompanist-drawablepainter", "accompanist-permissions"] From d15105733719b06c380adb4259fe5451d6ca0432 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 1 Feb 2026 13:39:50 +0000 Subject: [PATCH 06/16] fix(deps): update dependency androidx.activity:activity-compose to v1.12.3 (#6334) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6b5923cc7f..b3500f2cdb 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -38,7 +38,7 @@ diffplug-spotless = "com.diffplug.spotless:8.2.1" [libraries] # AndroidX -androidx-activity-compose = "androidx.activity:activity-compose:1.12.2" +androidx-activity-compose = "androidx.activity:activity-compose:1.12.3" androidx-benchmark-macro-junit4 = "androidx.benchmark:benchmark-macro-junit4:1.4.1" androidx-concurrent-futures = "androidx.concurrent:concurrent-futures:1.3.0" androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.2.1" From ca0fe79dfd6861ad4dee6fff1a1d1e365bfe7038 Mon Sep 17 00:00:00 2001 From: Pun Butrach Date: Mon, 2 Feb 2026 00:48:27 +0700 Subject: [PATCH 07/16] build: Avoid srcDirs deprecations Signed-off-by: Pun Butrach --- build.gradle | 6 +++--- concurrent/build.gradle | 2 +- flags/build.gradle | 2 +- modules/widgetpicker/build.gradle.kts | 30 +++++++++++++++------------ platform_frameworks_libs_systemui | 2 +- systemUI/animation/build.gradle | 2 +- systemUI/common/build.gradle | 2 +- systemUI/log/build.gradle | 2 +- systemUI/plugin/build.gradle | 2 +- systemUI/plugin_core/build.gradle | 2 +- systemUI/shared/build.gradle | 2 +- systemUI/unfold/build.gradle | 2 +- systemUI/utils/build.gradle | 2 +- systemUI/viewcapture/build.gradle | 4 ++-- wmshell/build.gradle | 2 +- 15 files changed, 34 insertions(+), 30 deletions(-) diff --git a/build.gradle b/build.gradle index 21b53a2e6e..2ca98153aa 100644 --- a/build.gradle +++ b/build.gradle @@ -313,7 +313,7 @@ android { // Lawnchair-TODO: Don't include Compose Disabled, but there's has to be another way of making this NOT long java.srcDirs = ['src', 'src_plugins', 'compose/facade/core', 'compose/facade/enabled', 'compose/features'] - kotlin.srcDirs = ['src', 'src_plugins', 'compose/facade/core', 'compose/facade/enabled', 'compose/features'] + kotlin.directories.addAll('src', 'src_plugins', 'compose/facade/core', 'compose/facade/enabled', 'compose/features') manifest.srcFile 'AndroidManifest-common.xml' proto { @@ -323,7 +323,7 @@ android { lawn { java.srcDirs = ['src_flags', 'src_shortcuts_overrides', 'lawnchair/src', 'tests/shared'] - kotlin.srcDirs = ['src_flags', 'src_shortcuts_overrides', 'lawnchair/src', 'tests/shared'] + kotlin.directories.addAll('src_flags', 'src_shortcuts_overrides', 'lawnchair/src', 'tests/shared') aidl.srcDirs = ['lawnchair/aidl'] res.srcDirs = ['lawnchair/res', 'platform_frameworks_libs_systemui/animationlib/res'] manifest.srcFile "lawnchair/AndroidManifest.xml" @@ -358,7 +358,7 @@ android { withQuickstep { res.srcDirs = ['quickstep/res', 'quickstep/recents_ui_overrides/res'] java.srcDirs = ['quickstep/src', 'quickstep/dagger', 'quickstep/recents_ui_overrides/src', 'quickstep/src_protolog'] - kotlin.srcDirs = ['quickstep/src', 'quickstep/dagger', 'quickstep/recents_ui_overrides/src', 'quickstep/src_protolog'] + kotlin.directories.addAll('quickstep/src', 'quickstep/dagger', 'quickstep/recents_ui_overrides/src', 'quickstep/src_protolog') manifest.srcFile "quickstep/AndroidManifest.xml" } } diff --git a/concurrent/build.gradle b/concurrent/build.gradle index 4915c3a3eb..8f609de711 100644 --- a/concurrent/build.gradle +++ b/concurrent/build.gradle @@ -8,7 +8,7 @@ android { sourceSets { main { java.srcDirs = ['src'] - kotlin.srcDirs = ['src'] + kotlin.directories.add('src') } } } diff --git a/flags/build.gradle b/flags/build.gradle index 7cdb8f89b7..932b6889b1 100644 --- a/flags/build.gradle +++ b/flags/build.gradle @@ -7,7 +7,7 @@ android { sourceSets { main { java.srcDirs = ['src'] - kotlin.srcDirs = ['src'] + kotlin.directories.add('src') } } } diff --git a/modules/widgetpicker/build.gradle.kts b/modules/widgetpicker/build.gradle.kts index ebef90e46a..5dcd1fcb42 100644 --- a/modules/widgetpicker/build.gradle.kts +++ b/modules/widgetpicker/build.gradle.kts @@ -32,28 +32,32 @@ android { } sourceSets { named("main") { - java.srcDirs("src") - kotlin.srcDirs("src") + java.directories.add("src") + kotlin.directories.add("src") manifest.srcFile("AndroidManifest.xml") - res.srcDirs("res") + res.directories.add("res") } named("androidTest") { - java.srcDirs( - "tests/multivalentScreenshotTests/src", - "tests/multivalentTestsForDevice/src", + java.directories.addAll( + listOf( + "tests/multivalentScreenshotTests/src", + "tests/multivalentTestsForDevice/src", + ) ) - kotlin.srcDirs( - "tests/multivalentScreenshotTests/src", - "tests/multivalentTestsForDevice/src", + kotlin.directories.addAll( + listOf( + "tests/multivalentScreenshotTests/src", + "tests/multivalentTestsForDevice/src", + ) ) manifest.srcFile("tests/AndroidManifest.xml") } named("test") { - java.srcDirs("tests/multivalentTests/src") - kotlin.srcDirs("tests/multivalentTests/src") - resources.srcDirs("tests/config") + java.directories.add("tests/multivalentTests/src") + kotlin.directories.add("tests/multivalentTests/src") + resources.directories.add("tests/config") manifest.srcFile("tests/AndroidManifest.xml") - res.srcDirs("tests/multivalentScreenshotTests/res") + res.directories.add("tests/multivalentScreenshotTests/res") } } diff --git a/platform_frameworks_libs_systemui b/platform_frameworks_libs_systemui index 2fa2fca4ca..6938485bd0 160000 --- a/platform_frameworks_libs_systemui +++ b/platform_frameworks_libs_systemui @@ -1 +1 @@ -Subproject commit 2fa2fca4caa1d5979244b7653d8db01e52e382af +Subproject commit 6938485bd045f3b5a821ac3b2d98706a30b14e1f diff --git a/systemUI/animation/build.gradle b/systemUI/animation/build.gradle index 4384397681..34123c04ec 100644 --- a/systemUI/animation/build.gradle +++ b/systemUI/animation/build.gradle @@ -12,7 +12,7 @@ android { sourceSets { main { java.srcDirs = ['src'] - kotlin.srcDirs = ['src'] + kotlin.directories.add('src') aidl.srcDirs = ['src'] manifest.srcFile 'AndroidManifest.xml' res.srcDirs = ['res'] diff --git a/systemUI/common/build.gradle b/systemUI/common/build.gradle index fcce98a345..5b4deda4ef 100644 --- a/systemUI/common/build.gradle +++ b/systemUI/common/build.gradle @@ -9,7 +9,7 @@ android { sourceSets { main { java.srcDirs = ['src'] - kotlin.srcDirs = ['src'] + kotlin.directories.add('src') manifest.srcFile 'AndroidManifest.xml' } } diff --git a/systemUI/log/build.gradle b/systemUI/log/build.gradle index 246ee5091d..544e845eb0 100644 --- a/systemUI/log/build.gradle +++ b/systemUI/log/build.gradle @@ -11,7 +11,7 @@ android { sourceSets { main { java.srcDirs = ['src'] - kotlin.srcDirs = ['src'] + kotlin.directories.add('src') aidl.srcDirs = ['src'] manifest.srcFile 'AndroidManifest.xml' } diff --git a/systemUI/plugin/build.gradle b/systemUI/plugin/build.gradle index 5184827eae..fc3a7daf44 100644 --- a/systemUI/plugin/build.gradle +++ b/systemUI/plugin/build.gradle @@ -11,7 +11,7 @@ android { sourceSets { main { java.srcDirs = ['src'] - kotlin.srcDirs = ['src'] + kotlin.directories.add('src') aidl.srcDirs = ['src'] manifest.srcFile 'AndroidManifest.xml' res.srcDirs = ['res'] diff --git a/systemUI/plugin_core/build.gradle b/systemUI/plugin_core/build.gradle index 625f8f955c..87d7d1dc42 100644 --- a/systemUI/plugin_core/build.gradle +++ b/systemUI/plugin_core/build.gradle @@ -11,7 +11,7 @@ android { sourceSets { main { java.srcDirs = ['src'] - kotlin.srcDirs = ['src'] + kotlin.directories.add('src') aidl.srcDirs = ['src'] manifest.srcFile 'AndroidManifest.xml' } diff --git a/systemUI/shared/build.gradle b/systemUI/shared/build.gradle index 65308fffa9..cb35face3b 100644 --- a/systemUI/shared/build.gradle +++ b/systemUI/shared/build.gradle @@ -12,7 +12,7 @@ android { sourceSets { main { java.srcDirs = ['src'] - kotlin.srcDirs = ['src'] + kotlin.directories.add('src') aidl.srcDirs = ['src'] manifest.srcFile 'AndroidManifest.xml' res.srcDirs = ['res'] diff --git a/systemUI/unfold/build.gradle b/systemUI/unfold/build.gradle index 61c70475f5..b9a00a222a 100644 --- a/systemUI/unfold/build.gradle +++ b/systemUI/unfold/build.gradle @@ -12,7 +12,7 @@ android { sourceSets { main { java.srcDirs = ['src'] - kotlin.srcDirs = ['src'] + kotlin.directories.add('src') aidl.srcDirs = ['src'] } } diff --git a/systemUI/utils/build.gradle b/systemUI/utils/build.gradle index 02183ba0d9..fb53a944fc 100644 --- a/systemUI/utils/build.gradle +++ b/systemUI/utils/build.gradle @@ -8,7 +8,7 @@ android { sourceSets { main { java.srcDirs = ['src'] - kotlin.srcDirs = ['src'] + kotlin.directories.add('src') } } } diff --git a/systemUI/viewcapture/build.gradle b/systemUI/viewcapture/build.gradle index 0ae6b877f3..a7cc597d4e 100644 --- a/systemUI/viewcapture/build.gradle +++ b/systemUI/viewcapture/build.gradle @@ -13,13 +13,13 @@ android { sourceSets { main { java.srcDirs = ['src'] - kotlin.srcDirs = ['src'] + kotlin.directories.add('src') manifest.srcFile 'AndroidManifest.xml' proto.srcDirs = ['src'] } androidTest { java.srcDirs = ["tests"] - kotlin.srcDirs = ['tests'] + kotlin.directories.add('tests') manifest.srcFile "tests/AndroidManifest.xml" } } diff --git a/wmshell/build.gradle b/wmshell/build.gradle index 343038a739..83d3929d67 100644 --- a/wmshell/build.gradle +++ b/wmshell/build.gradle @@ -12,7 +12,7 @@ android { sourceSets { main { java.srcDirs = ['shared/src'] - kotlin.srcDirs = ['shared/src'] + kotlin.directories.add('shared/src') aidl.srcDirs = ['shared/src'] manifest.srcFile 'AndroidManifest.xml' res.srcDirs = ['shared', 'shared/res'] From dd7bfbbdc069cadcdaeb4cabbf2ab59208b63ec1 Mon Sep 17 00:00:00 2001 From: Pun Butrach Date: Mon, 2 Feb 2026 00:51:33 +0700 Subject: [PATCH 08/16] docs: Fully phase out development of 15-dev branch Signed-off-by: Pun Butrach --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1c651f2780..52f6cce5bd 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ > [!WARNING] > This branch contains major changes from the rebase of Launcher3, including breaking changes and refactors that can cause Lawnchair to break. > -> If you wish to contribute, read our [contributing guidelines](CONTRIBUTING.md). Note that this branch will undergo many changes as we slowly refactor our codebase, so the `16-dev` branch may be particularly unfriendly to new contributors. It is still possible to submit changes to `15-dev`, but new feature development will be focused on this branch. +> If you wish to contribute, read our [contributing guidelines](CONTRIBUTING.md). Note that this branch will undergo many changes as we slowly refactor our codebase, so the `16-dev` branch may be particularly unfriendly to new contributors. **It is now not possible to submit changes to `15-dev`, new feature development will be focused on this branch.** > > For regular users, we recommend staying on `15-dev` for stability purposes. From e855a89aa11479ef9ba23e0473d7c4387b73f85b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 2 Feb 2026 10:04:52 +0800 Subject: [PATCH 09/16] fix(deps): update dependency org.mockito.kotlin:mockito-kotlin to v6 (#6305) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b3500f2cdb..2465274f9b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -16,7 +16,7 @@ refine = "4.4.0" guava = "33.5.0-android" junitVersion = "4.13.2" mockito = "5.21.0" -mockitoKotlin = "5.4.0" +mockitoKotlin = "6.2.3" truth = "1.4.5" testRules = "1.7.0" testRunner = "1.7.0" From 0396eb28373ac7df5d50ed1eab5f7f4bf52301a2 Mon Sep 17 00:00:00 2001 From: Zongle Wang Date: Mon, 2 Feb 2026 10:10:28 +0800 Subject: [PATCH 10/16] Modify TODO comment for android.newDsl Update TODO comment with a link to the relevant pull request. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index e3126b5582..eb0eca6ee6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,5 +9,5 @@ org.gradle.parallel=true org.gradle.configuration-cache=true org.gradle.configuration-cache.parallel=true -# Lawnchair-TODO(Cleanup): Remove these flags once all configuration and plugins support DSL +# TODO: https://github.com/LawnchairLauncher/lawnchair/pull/6277 android.newDsl=false From 97f69b58db4b2ad4b54926ad9a0eb1ac6c005d7b Mon Sep 17 00:00:00 2001 From: Goooler Date: Mon, 2 Feb 2026 10:08:46 +0800 Subject: [PATCH 11/16] Remove unnecessary removal for protobuf configuration --- build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/build.gradle b/build.gradle index 2ca98153aa..1de8dc13bf 100644 --- a/build.gradle +++ b/build.gradle @@ -57,7 +57,6 @@ allprojects { generateProtoTasks { all().configureEach { task -> task.builtins { - remove java java { option "lite" } From cc987bfdd1f8fab9ac87da0639525da77503adb8 Mon Sep 17 00:00:00 2001 From: Goooler Date: Mon, 2 Feb 2026 10:19:03 +0800 Subject: [PATCH 12/16] Remove kotlin-stdlib-jdk7 dependencies --- gradle/libs.versions.toml | 1 - platform_frameworks_libs_systemui | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2465274f9b..d1fb42e32c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -111,7 +111,6 @@ room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = " # Kotlin kotlin-androidExtensionRuntime = { module = "org.jetbrains.kotlin:kotlin-android-extensions-runtime", version.ref = "kotlin" } kotlin-parcelizeRuntime = { module = "org.jetbrains.kotlin:kotlin-parcelize-runtime", version.ref = "kotlin" } -kotlin-stdlib-jdk7 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk7", version.ref = "kotlin" } # KotlinX kotlinx-coroutines-android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2" kotlinx-coroutines-test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2" diff --git a/platform_frameworks_libs_systemui b/platform_frameworks_libs_systemui index 6938485bd0..4104075a35 160000 --- a/platform_frameworks_libs_systemui +++ b/platform_frameworks_libs_systemui @@ -1 +1 @@ -Subproject commit 6938485bd045f3b5a821ac3b2d98706a30b14e1f +Subproject commit 4104075a356b02f71c9cbc3aa16e68435387c570 From ff88c755c26d9aa3ea4d7967500eee07f90f285f Mon Sep 17 00:00:00 2001 From: Goooler Date: Mon, 2 Feb 2026 10:36:24 +0800 Subject: [PATCH 13/16] Revert "Fix duplicate class kotlinx.android.parcel.* found" This reverts commit 199ee3a77ed57efa34fd31cef1aea13337c89a17. --- build.gradle | 9 --------- gradle/libs.versions.toml | 3 --- 2 files changed, 12 deletions(-) diff --git a/build.gradle b/build.gradle index 1de8dc13bf..fbe01398b0 100644 --- a/build.gradle +++ b/build.gradle @@ -83,15 +83,6 @@ allprojects { } } - configurations.configureEach { - resolutionStrategy.eachDependency { - // Fix duplicate class kotlinx.android.parcel.* found in these 2 dependencies. - if (requested.module == libs.kotlin.androidExtensionRuntime.get().module) { - useTarget(libs.kotlin.parcelizeRuntime) - } - } - } - ext { FRAMEWORK_PREBUILTS_DIR = "$rootDir/prebuilts/libs" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d1fb42e32c..c3939383fb 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -108,9 +108,6 @@ room-compiler = { group = "androidx.room", name = "room-compiler", version.ref = room-ktx = { group = "androidx.room", name = "room-ktx", version.ref = "androidx-room" } room-runtime = { group = "androidx.room", name = "room-runtime", version.ref = "androidx-room" } -# Kotlin -kotlin-androidExtensionRuntime = { module = "org.jetbrains.kotlin:kotlin-android-extensions-runtime", version.ref = "kotlin" } -kotlin-parcelizeRuntime = { module = "org.jetbrains.kotlin:kotlin-parcelize-runtime", version.ref = "kotlin" } # KotlinX kotlinx-coroutines-android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2" kotlinx-coroutines-test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2" From 6e88467a1837d8666d4d09d0b2fdd97b83ec8eb1 Mon Sep 17 00:00:00 2001 From: Goooler Date: Mon, 2 Feb 2026 10:39:22 +0800 Subject: [PATCH 14/16] Revert "Improve build performance by enabling R8 parallelism (#5682)" This reverts commit 3450fbaf --- gradle.properties | 3 --- 1 file changed, 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index eb0eca6ee6..51a8909456 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,3 @@ -# Improve build performance by enabling R8 parallelism. -android.r8.maxWorkers=4 - kotlin.code.style=official org.gradle.caching=true From cc70e1bde95dc146657dc03f745d42e1ff982713 Mon Sep 17 00:00:00 2001 From: Goooler Date: Mon, 2 Feb 2026 10:53:30 +0800 Subject: [PATCH 15/16] Tweak org.gradle.jvmargs flags --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 51a8909456..442bf4bd0b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ kotlin.code.style=official org.gradle.caching=true -org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=1g -Dfile.encoding=UTF-8 -XX:+UseParallelGC +org.gradle.jvmargs=-Xmx4g -Dfile.encoding=UTF-8 org.gradle.parallel=true org.gradle.configuration-cache=true org.gradle.configuration-cache.parallel=true From e4483eb3fecb0a8815a431379ccc53525cfcc2d5 Mon Sep 17 00:00:00 2001 From: Goooler Date: Mon, 2 Feb 2026 10:56:58 +0800 Subject: [PATCH 16/16] Track Ktlint updates --- build.gradle | 2 +- gradle/libs.versions.toml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index fbe01398b0..f242466e63 100644 --- a/build.gradle +++ b/build.gradle @@ -497,7 +497,7 @@ spotless { } kotlin { target("lawnchair/src/**/*.kt") - ktlint("1.8.0").customRuleSets([ + ktlint(libs.ktlint.get().version).customRuleSets([ libs.composeRules.get().toString() ]).editorConfigOverride([ "ktlint_compose_compositionlocal-allowlist": "disabled", diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c3939383fb..1cef9de297 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -139,6 +139,8 @@ rikka-refine-runtime = { group = "dev.rikka.tools.refine", name = "runtime", ver smartspacer-sdk = "com.kieronquinn.smartspacer:sdk-client:1.1.2" xdrop-fuzzywuzzy = "me.xdrop:fuzzywuzzy:1.4.0" errorprone-annotations = "com.google.errorprone:error_prone_annotations:2.46.0" +# Dummy to get renovate updates, the version is used in rootProject build.gradle with spotless. +ktlint = "com.pinterest.ktlint:ktlint-cli:1.8.0" composeRules = "io.nlopez.compose.rules:ktlint:0.5.3" google-guava = { group = "com.google.guava", name = "guava", version.ref = "guava" }