Fix use of deprecated buildDir in Android templates/tests/examples (#157560)

gmackall · web-flow · commit b8e56e306345 · 2024-11-06T21:34:23.000Z
Replace deprecated `Project.buildDir` [getter](https://docs.gradle.org/current/javadoc/org/gradle/api/Project.html#getBuildDir()) and [setter](https://docs.gradle.org/current/javadoc/org/gradle/api/Project.html#setBuildDir(java.io.File)) uses.
diff --git a/dev/benchmarks/macrobenchmarks/android/build.gradle b/dev/benchmarks/macrobenchmarks/android/build.gradle
@@ -13,10 +13,12 @@ allprojects {
     }
 }
 
-rootProject.buildDir = '../build'
+Directory newBuildDir = rootProject.layout.buildDirectory.dir("../../build").get()
+rootProject.layout.buildDirectory.value(newBuildDir)
 
 subprojects {
-    project.buildDir = "${rootProject.buildDir}/${project.name}"
+    def newSubprojectBuildDir = newBuildDir.dir(project.name)
+    project.layout.buildDirectory.value(newSubprojectBuildDir)
 }
 subprojects {
     project.evaluationDependsOn(':app')
@@ -30,5 +32,5 @@ subprojects {
 }
 
 tasks.register("clean", Delete) {
-    delete rootProject.buildDir
+    delete rootProject.layout.buildDirectory
 }
diff --git a/dev/benchmarks/microbenchmarks/android/build.gradle b/dev/benchmarks/microbenchmarks/android/build.gradle
@@ -9,10 +9,10 @@ allprojects {
     }
 }
 
-rootProject.buildDir = '../build'
+rootProject.layout.buildDirectory.value(rootProject.layout.buildDirectory.dir("../../build").get())
 
 subprojects {
-    project.buildDir = "${rootProject.buildDir}/${project.name}"
+    project.layout.buildDirectory.value(rootProject.layout.buildDirectory.dir(project.name).get())
 }
 subprojects {
     project.evaluationDependsOn(':app')
@@ -25,5 +25,5 @@ subprojects {
 }
 
 tasks.register("clean", Delete) {
-    delete rootProject.buildDir
+    delete rootProject.layout.buildDirectory
 }
diff --git a/dev/benchmarks/multiple_flutters/android/build.gradle b/dev/benchmarks/multiple_flutters/android/build.gradle
@@ -26,5 +26,5 @@ allprojects {
 }
 
 tasks.register("clean", Delete) {
-    delete rootProject.buildDir
+    delete rootProject.layout.buildDirectory
 }
diff --git a/dev/integration_tests/deferred_components_test/android/build.gradle b/dev/integration_tests/deferred_components_test/android/build.gradle
@@ -34,10 +34,10 @@ project.getTasks().withType(JavaCompile){
     options.compilerArgs << "-Xlint:all" << "-Werror"
 }
 
-rootProject.buildDir = '../build'
+rootProject.layout.buildDirectory.value(rootProject.layout.buildDirectory.dir("../../build").get())
 
 subprojects {
-    project.buildDir = "${rootProject.buildDir}/${project.name}"
+    project.layout.buildDirectory.value(rootProject.layout.buildDirectory.dir(project.name).get())
     project.evaluationDependsOn(':app')
 
     dependencyLocking {
@@ -50,5 +50,5 @@ subprojects {
 }
 
 tasks.register("clean", Delete) {
-    delete rootProject.buildDir
+    delete rootProject.layout.buildDirectory
 }
diff --git a/dev/integration_tests/deferred_components_test/android/component1/build.gradle b/dev/integration_tests/deferred_components_test/android/component1/build.gradle
@@ -28,8 +28,8 @@ android {
 
     sourceSets {
         applicationVariants.all { variant ->
-            main.assets.srcDirs += "${project.buildDir}/intermediates/flutter/${variant.name}/deferred_assets"
-            main.jniLibs.srcDirs += "${project.buildDir}/intermediates/flutter/${variant.name}/deferred_libs"
+            main.assets.srcDirs += "${project.layout.buildDirectory.get()}/intermediates/flutter/${variant.name}/deferred_assets"
+            main.jniLibs.srcDirs += "${project.layout.buildDirectory.get()}/intermediates/flutter/${variant.name}/deferred_libs"
         }
     }
 
diff --git a/dev/integration_tests/gradle_deprecated_settings/android/build.gradle b/dev/integration_tests/gradle_deprecated_settings/android/build.gradle
@@ -29,10 +29,10 @@ allprojects {
     }
 }
 
-rootProject.buildDir = '../build'
+rootProject.layout.buildDirectory.value(rootProject.layout.buildDirectory.dir("../../build").get())
 
 subprojects {
-    project.buildDir = "${rootProject.buildDir}/${project.name}"
+    project.layout.buildDirectory.value(rootProject.layout.buildDirectory.dir(project.name).get())
 }
 subprojects {
     project.evaluationDependsOn(':app')
@@ -46,5 +46,5 @@ subprojects {
 }
 
 tasks.register("clean", Delete) {
-    delete rootProject.buildDir
+    delete rootProject.layout.buildDirectory
 }
diff --git a/dev/integration_tests/module_host_with_custom_build_v2_embedding/build.gradle b/dev/integration_tests/module_host_with_custom_build_v2_embedding/build.gradle
@@ -20,5 +20,5 @@ allprojects {
 }
 
 tasks.register("clean", Delete) {
-    delete rootProject.buildDir
+    delete rootProject.layout.buildDirectory
 }
diff --git a/dev/integration_tests/native_driver_test/android/build.gradle b/dev/integration_tests/native_driver_test/android/build.gradle
@@ -9,14 +9,14 @@ allprojects {
     }
 }
 
-rootProject.buildDir = "../build"
+rootProject.layout.buildDirectory.value(rootProject.layout.buildDirectory.dir("../../build").get())
 subprojects {
-    project.buildDir = "${rootProject.buildDir}/${project.name}"
+    project.layout.buildDirectory.value(rootProject.layout.buildDirectory.dir(project.name).get())
 }
 subprojects {
     project.evaluationDependsOn(":app")
 }
 
 tasks.register("clean", Delete) {
-    delete rootProject.buildDir
+    delete rootProject.layout.buildDirectory
 }
diff --git a/dev/tools/bin/generate_gradle_lockfiles.dart b/dev/tools/bin/generate_gradle_lockfiles.dart
@@ -237,10 +237,10 @@ allprojects {
     }
 }
 
-rootProject.buildDir = '../build'
+rootProject.layout.buildDirectory.value(rootProject.layout.buildDirectory.dir("../../build").get())
 
 subprojects {
-    project.buildDir = "${rootProject.buildDir}/${project.name}"
+    project.layout.buildDirectory.value(rootProject.layout.buildDirectory.dir(project.name).get())
 }
 subprojects {
     project.evaluationDependsOn(':app')
@@ -254,7 +254,7 @@ subprojects {
 }
 
 tasks.register("clean", Delete) {
-    delete rootProject.buildDir
+    delete rootProject.layout.buildDirectory
 }
 ''';
 
diff --git a/dev/tracing_tests/android/build.gradle b/dev/tracing_tests/android/build.gradle
@@ -9,14 +9,14 @@ allprojects {
     }
 }
 
-rootProject.buildDir = '../build'
+rootProject.layout.buildDirectory.value(rootProject.layout.buildDirectory.dir("../../build").get())
 subprojects {
-    project.buildDir = "${rootProject.buildDir}/${project.name}"
+    project.layout.buildDirectory.value(rootProject.layout.buildDirectory.dir(project.name).get())
 }
 subprojects {
     project.evaluationDependsOn(':app')
 }
 
 tasks.register("clean", Delete) {
-    delete rootProject.buildDir
+    delete rootProject.layout.buildDirectory
 }
diff --git a/examples/hello_world/android/build.gradle.kts b/examples/hello_world/android/build.gradle.kts
@@ -13,10 +13,10 @@ allprojects {
     }
 }
 
-rootProject.buildDir = file("../build")
+rootProject.layout.buildDirectory.value(rootProject.layout.buildDirectory.dir("../../build").get())
 
 subprojects {
-    project.buildDir = file("${rootProject.buildDir}/${project.name}")
+    project.layout.buildDirectory.value(rootProject.layout.buildDirectory.dir(project.name).get())
 }
 subprojects {
     project.evaluationDependsOn(":app")
@@ -30,5 +30,5 @@ subprojects {
 }
 
 tasks.register<Delete>("clean") {
-    delete(rootProject.buildDir)
+    delete(rootProject.layout.buildDirectory)
 }
diff --git a/examples/layers/android/build.gradle b/examples/layers/android/build.gradle
@@ -13,10 +13,10 @@ allprojects {
     }
 }
 
-rootProject.buildDir = '../build'
+rootProject.layout.buildDirectory.value(rootProject.layout.buildDirectory.dir("../../build").get())
 
 subprojects {
-    project.buildDir = "${rootProject.buildDir}/${project.name}"
+    project.layout.buildDirectory.value(rootProject.layout.buildDirectory.dir(project.name).get())
 }
 subprojects {
     project.evaluationDependsOn(':app')
@@ -30,5 +30,5 @@ subprojects {
 }
 
 tasks.register("clean", Delete) {
-    delete rootProject.buildDir
+    delete rootProject.layout.buildDirectory
 }
diff --git a/packages/flutter_tools/gradle/module_plugin_loader.gradle b/packages/flutter_tools/gradle/module_plugin_loader.gradle
@@ -30,7 +30,7 @@ gradle.getGradle().projectsLoaded { g ->
                 if (!androidPluginBuildOutputDir.exists()) {
                     androidPluginBuildOutputDir.mkdirs()
                 }
-                subproject.buildDir = androidPluginBuildOutputDir
+                subproject.layout.buildDirectory.fileValue(androidPluginBuildOutputDir)
             }
         }
         def _mainModuleName = binding.variables['mainModuleName']
diff --git a/packages/flutter_tools/gradle/src/main/groovy/flutter.groovy b/packages/flutter_tools/gradle/src/main/groovy/flutter.groovy
@@ -1289,7 +1289,7 @@ class FlutterPlugin implements Plugin<Project> {
                         }
                     }
                     // Copy the native assets created by build.dart and placed in build/native_assets by flutter assemble.
-                    // The `$project.buildDir` is '.android/Flutter/build/' instead of 'build/'.
+                    // The `$project.layout.buildDirectory` is '.android/Flutter/build/' instead of 'build/'.
                     String buildDir = "${getFlutterSourceDirectory()}/build"
                     String nativeAssetsDir = "${buildDir}/native_assets/android/jniLibs/lib"
                     from("${nativeAssetsDir}/${abi}") {
@@ -1416,7 +1416,7 @@ class FlutterPlugin implements Plugin<Project> {
             // This path is not flavor specific and must only be added once.
             // If support for flavors is added to native assets, then they must only be added
             // once per flavor; see https://github.com/dart-lang/native/issues/1359.
-            String nativeAssetsDir = "${project.buildDir}/../native_assets/android/jniLibs/lib/"
+            String nativeAssetsDir = "${project.layout.buildDirectory.get()}/../native_assets/android/jniLibs/lib/"
             project.android.sourceSets.main.jniLibs.srcDir(nativeAssetsDir)
             configurePlugins(project)
             detectLowCompileSdkVersionOrNdkVersion()
diff --git a/packages/flutter_tools/lib/src/android/migrations/top_level_gradle_build_file_migration.dart b/packages/flutter_tools/lib/src/android/migrations/top_level_gradle_build_file_migration.dart
@@ -14,7 +14,7 @@ task clean(type: Delete) {
 
 const String _lazyCleanTaskDeclaration = '''
 tasks.register("clean", Delete) {
-    delete rootProject.buildDir
+    delete rootProject.layout.buildDirectory
 }
 ''';
 
diff --git a/packages/flutter_tools/templates/app_shared/android-java.tmpl/build.gradle.kts.tmpl b/packages/flutter_tools/templates/app_shared/android-java.tmpl/build.gradle.kts.tmpl
@@ -5,14 +5,17 @@ allprojects {
     }
 }
 
-rootProject.buildDir = file("../build")
+val newBuildDir: Directory = rootProject.layout.buildDirectory.dir("../../build").get()
+rootProject.layout.buildDirectory.value(newBuildDir)
+
 subprojects {
-    project.buildDir = file("${rootProject.buildDir}/${project.name}")
+    val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name)
+    project.layout.buildDirectory.value(newSubprojectBuildDir)
 }
 subprojects {
     project.evaluationDependsOn(":app")
 }
 
 tasks.register<Delete>("clean") {
-    delete(rootProject.buildDir)
+    delete(rootProject.layout.buildDirectory)
 }
diff --git a/packages/flutter_tools/templates/app_shared/android-kotlin.tmpl/build.gradle.kts.tmpl b/packages/flutter_tools/templates/app_shared/android-kotlin.tmpl/build.gradle.kts.tmpl
@@ -5,14 +5,17 @@ allprojects {
     }
 }
 
-rootProject.buildDir = file("../build")
+val newBuildDir: Directory = rootProject.layout.buildDirectory.dir("../../build").get()
+rootProject.layout.buildDirectory.value(newBuildDir)
+
 subprojects {
-    project.buildDir = file("${rootProject.buildDir}/${project.name}")
+    val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name)
+    project.layout.buildDirectory.value(newSubprojectBuildDir)
 }
 subprojects {
     project.evaluationDependsOn(":app")
 }
 
 tasks.register<Delete>("clean") {
-    delete(rootProject.buildDir)
+    delete(rootProject.layout.buildDirectory)
 }
diff --git a/packages/flutter_tools/templates/module/android/deferred_component/build.gradle.tmpl b/packages/flutter_tools/templates/module/android/deferred_component/build.gradle.tmpl
@@ -29,8 +29,8 @@ android {
 
     sourceSets {
         applicationVariants.all { variant ->
-            main.assets.srcDirs += "${project.buildDir}/intermediates/flutter/${variant.name}/deferred_assets"
-            main.jniLibs.srcDirs += "${project.buildDir}/intermediates/flutter/${variant.name}/deferred_libs"
+            main.assets.srcDirs += "${project.layout.buildDirectory}/intermediates/flutter/${variant.name}/deferred_assets"
+            main.jniLibs.srcDirs += "${project.layout.buildDirectory}/intermediates/flutter/${variant.name}/deferred_libs"
         }
     }
 
diff --git a/packages/flutter_tools/test/general.shard/android/android_project_migration_test.dart b/packages/flutter_tools/test/general.shard/android/android_project_migration_test.dart
@@ -181,7 +181,7 @@ task clean(type: Delete) {
         expect(bufferLogger.traceText, contains('Migrating "clean" Gradle task to lazy declaration style.'));
         expect(topLevelGradleBuildFile.readAsStringSync(), equals('''
 tasks.register("clean", Delete) {
-    delete rootProject.buildDir
+    delete rootProject.layout.buildDirectory
 }
 '''));
       });
diff --git a/packages/flutter_tools/test/integration.shard/android_gradle_deprecated_plugin_apply_test.dart b/packages/flutter_tools/test/integration.shard/android_gradle_deprecated_plugin_apply_test.dart
@@ -82,16 +82,16 @@ allprojects {
     }
 }
 
-rootProject.buildDir = '../build'
+rootProject.layout.buildDirectory.value(rootProject.layout.buildDirectory.dir("../../build").get())
 subprojects {
-    project.buildDir = "${rootProject.buildDir}/${project.name}"
+    project.layout.buildDirectory.value(rootProject.layout.buildDirectory.dir(project.name).get())
 }
 subprojects {
     project.evaluationDependsOn(':app')
 }
 
 tasks.register("clean", Delete) {
-    delete rootProject.buildDir
+    delete rootProject.layout.buildDirectory
 }
 ''');
   appBuildGradle.writeAsStringSync(r'''
diff --git a/packages/flutter_tools/test/integration.shard/test_data/deferred_components_config.dart b/packages/flutter_tools/test/integration.shard/test_data/deferred_components_config.dart
@@ -83,8 +83,8 @@ class DeferredComponentModule {
 
         sourceSets {
             applicationVariants.all { variant ->
-                main.assets.srcDirs += "${project.buildDir}/intermediates/flutter/${variant.name}/deferred_assets"
-                main.jniLibs.srcDirs += "${project.buildDir}/intermediates/flutter/${variant.name}/deferred_libs"
+                main.assets.srcDirs += "${project.layout.buildDirectory.get()}/intermediates/flutter/${variant.name}/deferred_assets"
+                main.jniLibs.srcDirs += "${project.layout.buildDirectory.get()}/intermediates/flutter/${variant.name}/deferred_libs"
             }
         }
 
diff --git a/packages/flutter_tools/test/integration.shard/test_data/deferred_components_project.dart b/packages/flutter_tools/test/integration.shard/test_data/deferred_components_project.dart
@@ -126,16 +126,16 @@ class BasicDeferredComponentsConfig extends DeferredComponentsConfig {
       }
   }
 
-  rootProject.buildDir = '../build'
+  rootProject.layout.buildDirectory.value(rootProject.layout.buildDirectory.dir("../../build").get())
   subprojects {
-      project.buildDir = "${rootProject.buildDir}/${project.name}"
+      project.layout.buildDirectory.value(rootProject.layout.buildDirectory.dir(project.name).get())
   }
   subprojects {
       project.evaluationDependsOn(':app')
   }
 
   tasks.register("clean", Delete) {
-      delete rootProject.buildDir
+      delete rootProject.layout.buildDirectory
   }
   ''';
 
diff --git a/packages/flutter_tools/test/integration.shard/test_data/plugin_project.dart b/packages/flutter_tools/test/integration.shard/test_data/plugin_project.dart
@@ -36,9 +36,9 @@ allprojects {
         mavenCentral()
     }
 }
-rootProject.buildDir = '../build'
+rootProject.layout.buildDirectory.value(rootProject.layout.buildDirectory.dir("../../build").get())
 subprojects {
-    project.buildDir = "${rootProject.buildDir}/${project.name}"
+    project.layout.buildDirectory.value(rootProject.layout.buildDirectory.dir(project.name).get())
 }
 subprojects {
     project.evaluationDependsOn(':app')
@@ -51,7 +51,7 @@ subprojects {
     }
 }
 tasks.register("clean", Delete) {
-    delete rootProject.buildDir
+    delete rootProject.layout.buildDirectory
 }
 ''';
 

Original file line number	Diff line number	Diff line change
`@@ -13,10 +13,12 @@ allprojects {`
`13`	`13`	`}`
`14`	`14`	`}`
`15`	`15`
`16`		`-rootProject.buildDir = '../build'`
	`16`	`+Directory newBuildDir = rootProject.layout.buildDirectory.dir("../../build").get()`
	`17`	`+rootProject.layout.buildDirectory.value(newBuildDir)`
`17`	`18`
`18`	`19`	`subprojects {`
`19`		`- project.buildDir = "${rootProject.buildDir}/${project.name}"`
	`20`	`+ def newSubprojectBuildDir = newBuildDir.dir(project.name)`
	`21`	`+ project.layout.buildDirectory.value(newSubprojectBuildDir)`
`20`	`22`	`}`
`21`	`23`	`subprojects {`
`22`	`24`	`project.evaluationDependsOn(':app')`
`@@ -30,5 +32,5 @@ subprojects {`
`30`	`32`	`}`
`31`	`33`
`32`	`34`	`tasks.register("clean", Delete) {`
`33`		`- delete rootProject.buildDir`
	`35`	`+ delete rootProject.layout.buildDirectory`
`34`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,10 +9,10 @@ allprojects {`
`9`	`9`	`}`
`10`	`10`	`}`
`11`	`11`
`12`		`-rootProject.buildDir = '../build'`
	`12`	`+rootProject.layout.buildDirectory.value(rootProject.layout.buildDirectory.dir("../../build").get())`
`13`	`13`
`14`	`14`	`subprojects {`
`15`		`- project.buildDir = "${rootProject.buildDir}/${project.name}"`
	`15`	`+ project.layout.buildDirectory.value(rootProject.layout.buildDirectory.dir(project.name).get())`
`16`	`16`	`}`
`17`	`17`	`subprojects {`
`18`	`18`	`project.evaluationDependsOn(':app')`
`@@ -25,5 +25,5 @@ subprojects {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`tasks.register("clean", Delete) {`
`28`		`- delete rootProject.buildDir`
	`28`	`+ delete rootProject.layout.buildDirectory`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,5 +26,5 @@ allprojects {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`tasks.register("clean", Delete) {`
`29`		`- delete rootProject.buildDir`
	`29`	`+ delete rootProject.layout.buildDirectory`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,10 +34,10 @@ project.getTasks().withType(JavaCompile){`
`34`	`34`	`options.compilerArgs << "-Xlint:all" << "-Werror"`
`35`	`35`	`}`
`36`	`36`
`37`		`-rootProject.buildDir = '../build'`
	`37`	`+rootProject.layout.buildDirectory.value(rootProject.layout.buildDirectory.dir("../../build").get())`
`38`	`38`
`39`	`39`	`subprojects {`
`40`		`- project.buildDir = "${rootProject.buildDir}/${project.name}"`
	`40`	`+ project.layout.buildDirectory.value(rootProject.layout.buildDirectory.dir(project.name).get())`
`41`	`41`	`project.evaluationDependsOn(':app')`
`42`	`42`
`43`	`43`	`dependencyLocking {`
`@@ -50,5 +50,5 @@ subprojects {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`tasks.register("clean", Delete) {`
`53`		`- delete rootProject.buildDir`
	`53`	`+ delete rootProject.layout.buildDirectory`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,8 @@ android {`
`28`	`28`
`29`	`29`	`sourceSets {`
`30`	`30`	`applicationVariants.all { variant ->`
`31`		`- main.assets.srcDirs += "${project.buildDir}/intermediates/flutter/${variant.name}/deferred_assets"`
`32`		`- main.jniLibs.srcDirs += "${project.buildDir}/intermediates/flutter/${variant.name}/deferred_libs"`
	`31`	`+ main.assets.srcDirs += "${project.layout.buildDirectory.get()}/intermediates/flutter/${variant.name}/deferred_assets"`
	`32`	`+ main.jniLibs.srcDirs += "${project.layout.buildDirectory.get()}/intermediates/flutter/${variant.name}/deferred_libs"`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -29,10 +29,10 @@ allprojects {`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`
`32`		`-rootProject.buildDir = '../build'`
	`32`	`+rootProject.layout.buildDirectory.value(rootProject.layout.buildDirectory.dir("../../build").get())`
`33`	`33`
`34`	`34`	`subprojects {`
`35`		`- project.buildDir = "${rootProject.buildDir}/${project.name}"`
	`35`	`+ project.layout.buildDirectory.value(rootProject.layout.buildDirectory.dir(project.name).get())`
`36`	`36`	`}`
`37`	`37`	`subprojects {`
`38`	`38`	`project.evaluationDependsOn(':app')`
`@@ -46,5 +46,5 @@ subprojects {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`tasks.register("clean", Delete) {`
`49`		`- delete rootProject.buildDir`
	`49`	`+ delete rootProject.layout.buildDirectory`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,5 @@ allprojects {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`tasks.register("clean", Delete) {`
`23`		`- delete rootProject.buildDir`
	`23`	`+ delete rootProject.layout.buildDirectory`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,14 +9,14 @@ allprojects {`
`9`	`9`	`}`
`10`	`10`	`}`
`11`	`11`
`12`		`-rootProject.buildDir = "../build"`
	`12`	`+rootProject.layout.buildDirectory.value(rootProject.layout.buildDirectory.dir("../../build").get())`
`13`	`13`	`subprojects {`
`14`		`- project.buildDir = "${rootProject.buildDir}/${project.name}"`
	`14`	`+ project.layout.buildDirectory.value(rootProject.layout.buildDirectory.dir(project.name).get())`
`15`	`15`	`}`
`16`	`16`	`subprojects {`
`17`	`17`	`project.evaluationDependsOn(":app")`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`tasks.register("clean", Delete) {`
`21`		`- delete rootProject.buildDir`
	`21`	`+ delete rootProject.layout.buildDirectory`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -237,10 +237,10 @@ allprojects {`
`237`	`237`	`}`
`238`	`238`	`}`
`239`	`239`
`240`		`-rootProject.buildDir = '../build'`
	`240`	`+rootProject.layout.buildDirectory.value(rootProject.layout.buildDirectory.dir("../../build").get())`
`241`	`241`
`242`	`242`	`subprojects {`
`243`		`- project.buildDir = "${rootProject.buildDir}/${project.name}"`
	`243`	`+ project.layout.buildDirectory.value(rootProject.layout.buildDirectory.dir(project.name).get())`
`244`	`244`	`}`
`245`	`245`	`subprojects {`
`246`	`246`	`project.evaluationDependsOn(':app')`
`@@ -254,7 +254,7 @@ subprojects {`
`254`	`254`	`}`
`255`	`255`
`256`	`256`	`tasks.register("clean", Delete) {`
`257`		`- delete rootProject.buildDir`
	`257`	`+ delete rootProject.layout.buildDirectory`
`258`	`258`	`}`
`259`	`259`	`''';`
`260`	`260`