aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-11 06:44:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Avoid srcDirs deprecations

Browse Source 
Signed-off-by: Pun Butrach <pun.butrach@gmail.com>
This commit is contained in:
Pun Butrach
2026-02-02 00:48:27 +07:00
parent d151057337
commit ca0fe79dfd
15 changed files with 34 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build.gradle
View File

@@ -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 // 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'] 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' manifest.srcFile 'AndroidManifest-common.xml'
proto { proto {
@@ -323,7 +323,7 @@ android {
lawn { lawn {
java.srcDirs = ['src_flags', 'src_shortcuts_overrides', 'lawnchair/src', 'tests/shared'] 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'] aidl.srcDirs = ['lawnchair/aidl']
res.srcDirs = ['lawnchair/res', 'platform_frameworks_libs_systemui/animationlib/res'] res.srcDirs = ['lawnchair/res', 'platform_frameworks_libs_systemui/animationlib/res']
manifest.srcFile "lawnchair/AndroidManifest.xml" manifest.srcFile "lawnchair/AndroidManifest.xml"
@@ -358,7 +358,7 @@ android {
withQuickstep { withQuickstep {
res.srcDirs = ['quickstep/res', 'quickstep/recents_ui_overrides/res'] res.srcDirs = ['quickstep/res', 'quickstep/recents_ui_overrides/res']
java.srcDirs = ['quickstep/src', 'quickstep/dagger', 'quickstep/recents_ui_overrides/src', 'quickstep/src_protolog'] 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" manifest.srcFile "quickstep/AndroidManifest.xml"
} }
} }

2
concurrent/build.gradle
View File

@@ -8,7 +8,7 @@ android {
sourceSets { sourceSets {
main { main {
java.srcDirs = ['src'] java.srcDirs = ['src']
kotlin.srcDirs = ['src'] kotlin.directories.add('src')
} }
} }
} }

2
flags/build.gradle
View File

@@ -7,7 +7,7 @@ android {
sourceSets { sourceSets {
main { main {
java.srcDirs = ['src'] java.srcDirs = ['src']
kotlin.srcDirs = ['src'] kotlin.directories.add('src')
} }
} }
} }

30
modules/widgetpicker/build.gradle.kts
View File

@@ -32,28 +32,32 @@ android {
} }
sourceSets { sourceSets {
named("main") { named("main") {
java.srcDirs("src") java.directories.add("src")
kotlin.srcDirs("src") kotlin.directories.add("src")
manifest.srcFile("AndroidManifest.xml") manifest.srcFile("AndroidManifest.xml")
res.srcDirs("res") res.directories.add("res")
} }
named("androidTest") { named("androidTest") {
java.srcDirs( java.directories.addAll(
"tests/multivalentScreenshotTests/src", listOf(
"tests/multivalentTestsForDevice/src", "tests/multivalentScreenshotTests/src",
"tests/multivalentTestsForDevice/src",
)
) )
kotlin.srcDirs( kotlin.directories.addAll(
"tests/multivalentScreenshotTests/src", listOf(
"tests/multivalentTestsForDevice/src", "tests/multivalentScreenshotTests/src",
"tests/multivalentTestsForDevice/src",
)
) )
manifest.srcFile("tests/AndroidManifest.xml") manifest.srcFile("tests/AndroidManifest.xml")
} }
named("test") { named("test") {
java.srcDirs("tests/multivalentTests/src") java.directories.add("tests/multivalentTests/src")
kotlin.srcDirs("tests/multivalentTests/src") kotlin.directories.add("tests/multivalentTests/src")
resources.srcDirs("tests/config") resources.directories.add("tests/config")
manifest.srcFile("tests/AndroidManifest.xml") manifest.srcFile("tests/AndroidManifest.xml")
res.srcDirs("tests/multivalentScreenshotTests/res") res.directories.add("tests/multivalentScreenshotTests/res")
} }
} }

2
platform_frameworks_libs_systemui

Submodule platform_frameworks_libs_systemui updated: 2fa2fca4ca...6938485bd0

2
systemUI/animation/build.gradle
View File

@@ -12,7 +12,7 @@ android {
sourceSets { sourceSets {
main { main {
java.srcDirs = ['src'] java.srcDirs = ['src']
kotlin.srcDirs = ['src'] kotlin.directories.add('src')
aidl.srcDirs = ['src'] aidl.srcDirs = ['src']
manifest.srcFile 'AndroidManifest.xml' manifest.srcFile 'AndroidManifest.xml'
res.srcDirs = ['res'] res.srcDirs = ['res']

2
systemUI/common/build.gradle
View File

@@ -9,7 +9,7 @@ android {
sourceSets { sourceSets {
main { main {
java.srcDirs = ['src'] java.srcDirs = ['src']
kotlin.srcDirs = ['src'] kotlin.directories.add('src')
manifest.srcFile 'AndroidManifest.xml' manifest.srcFile 'AndroidManifest.xml'
} }
} }

2
systemUI/log/build.gradle
View File

@@ -11,7 +11,7 @@ android {
sourceSets { sourceSets {
main { main {
java.srcDirs = ['src'] java.srcDirs = ['src']
kotlin.srcDirs = ['src'] kotlin.directories.add('src')
aidl.srcDirs = ['src'] aidl.srcDirs = ['src']
manifest.srcFile 'AndroidManifest.xml' manifest.srcFile 'AndroidManifest.xml'
} }

2
systemUI/plugin/build.gradle
View File

@@ -11,7 +11,7 @@ android {
sourceSets { sourceSets {
main { main {
java.srcDirs = ['src'] java.srcDirs = ['src']
kotlin.srcDirs = ['src'] kotlin.directories.add('src')
aidl.srcDirs = ['src'] aidl.srcDirs = ['src']
manifest.srcFile 'AndroidManifest.xml' manifest.srcFile 'AndroidManifest.xml'
res.srcDirs = ['res'] res.srcDirs = ['res']

2
systemUI/plugin_core/build.gradle
View File

@@ -11,7 +11,7 @@ android {
sourceSets { sourceSets {
main { main {
java.srcDirs = ['src'] java.srcDirs = ['src']
kotlin.srcDirs = ['src'] kotlin.directories.add('src')
aidl.srcDirs = ['src'] aidl.srcDirs = ['src']
manifest.srcFile 'AndroidManifest.xml' manifest.srcFile 'AndroidManifest.xml'
} }

2
systemUI/shared/build.gradle
View File

@@ -12,7 +12,7 @@ android {
sourceSets { sourceSets {
main { main {
java.srcDirs = ['src'] java.srcDirs = ['src']
kotlin.srcDirs = ['src'] kotlin.directories.add('src')
aidl.srcDirs = ['src'] aidl.srcDirs = ['src']
manifest.srcFile 'AndroidManifest.xml' manifest.srcFile 'AndroidManifest.xml'
res.srcDirs = ['res'] res.srcDirs = ['res']

2
systemUI/unfold/build.gradle
View File

@@ -12,7 +12,7 @@ android {
sourceSets { sourceSets {
main { main {
java.srcDirs = ['src'] java.srcDirs = ['src']
kotlin.srcDirs = ['src'] kotlin.directories.add('src')
aidl.srcDirs = ['src'] aidl.srcDirs = ['src']
} }
} }

2
systemUI/utils/build.gradle
View File

@@ -8,7 +8,7 @@ android {
sourceSets { sourceSets {
main { main {
java.srcDirs = ['src'] java.srcDirs = ['src']
kotlin.srcDirs = ['src'] kotlin.directories.add('src')
} }
} }
} }

4
systemUI/viewcapture/build.gradle
View File

@@ -13,13 +13,13 @@ android {
sourceSets { sourceSets {
main { main {
java.srcDirs = ['src'] java.srcDirs = ['src']
kotlin.srcDirs = ['src'] kotlin.directories.add('src')
manifest.srcFile 'AndroidManifest.xml' manifest.srcFile 'AndroidManifest.xml'
proto.srcDirs = ['src'] proto.srcDirs = ['src']
} }
androidTest { androidTest {
java.srcDirs = ["tests"] java.srcDirs = ["tests"]
kotlin.srcDirs = ['tests'] kotlin.directories.add('tests')
manifest.srcFile "tests/AndroidManifest.xml" manifest.srcFile "tests/AndroidManifest.xml"
} }
} }

2
wmshell/build.gradle
View File

@@ -12,7 +12,7 @@ android {
sourceSets { sourceSets {
main { main {
java.srcDirs = ['shared/src'] java.srcDirs = ['shared/src']
kotlin.srcDirs = ['shared/src'] kotlin.directories.add('shared/src')
aidl.srcDirs = ['shared/src'] aidl.srcDirs = ['shared/src']
manifest.srcFile 'AndroidManifest.xml' manifest.srcFile 'AndroidManifest.xml'
res.srcDirs = ['shared', 'shared/res'] res.srcDirs = ['shared', 'shared/res']