build: Avoid srcDirs deprecations

Signed-off-by: Pun Butrach <pun.butrach@gmail.com>

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"
         }
     }

concurrent/build.gradle

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

flags/build.gradle

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

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")
         }
     }
 

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']

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'
         }
     }

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'
         }

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']

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'
         }

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']

systemUI/unfold/build.gradle

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

systemUI/utils/build.gradle

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

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"
         }
     }

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']