From ca0fe79dfd6861ad4dee6fff1a1d1e365bfe7038 Mon Sep 17 00:00:00 2001 From: Pun Butrach Date: Mon, 2 Feb 2026 00:48:27 +0700 Subject: [PATCH] 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']