-
Notifications
You must be signed in to change notification settings - Fork 29.8k
Fix use of deprecated buildDir in Android templates/tests/examples
#157560
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
|
hey @gmackall ,i guess allprojects {
repositories {
google()
mavenCentral()
}
}
rootProject.layout.buildDirectory.set(file("../build"))
subprojects {
project.layout.buildDirectory.set(file("${rootProject.layout.buildDirectory.dir("/${project.name}").get()}"))
}
subprojects {
project.evaluationDependsOn(":app")
}
tasks.register<Delete>("clean") {
delete(rootProject.layout.buildDirectory)
}
yep it works locally . |
| } | ||
|
|
||
| rootProject.buildDir = '../build' | ||
| Directory newBuildDir = rootProject.layout.buildDirectory.dir("../../build").get() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The change to use Directory.dir makes this start off as a child directory, so we need one more ../
| } | ||
|
|
||
| rootProject.buildDir = file("../build") | ||
| val newBuildDir: Directory = rootProject.layout.buildDirectory.dir("../../build").get() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I made the templates be slightly more readable than the version in tests/the lockfile generation script.
The latter version is sort of forced to be one line, so that it can conveniently be the same for Kotlin/Groovy (as def/val force to be Groovy/Kotlin specific), so that the lockfile generation script can be agnostic between the Groovy/Kotlin dsl while we still use both
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I made the templates be slightly more readable than the version in tests/the lockfile generation script.
The latter version is sort of forced to be one line, so that it can conveniently be the same for Kotlin/Groovy (as
def/valforce to be Groovy/Kotlin specific), so that the lockfile generation script can be agnostic between the Groovy/Kotlin dsl while we still use both
One thing to consider: multiple files have the same content. Why not unify their usage?
I ended up going with a slightly different syntax, as the |
buildDir in Android templatesbuildDir in Android templates and tests
buildDir in Android templates and testsbuildDir in Android templates/tests/examples
buildDir in Android templates/tests/examplesbuildDir in Android templates/tests/examples
If i recall i tried it with a new project that uses kotlin (build.gradle.kts) |
|
I'll close #157468 then |
bartekpacia
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nice small thingie:)
flutter/flutter@73546b3...c8510f2 2024-11-08 engine-flutter-autoroll@skia.org Roll Flutter Engine from 44d788f4651b to a08bd5a07c2a (3 revisions) (flutter/flutter#158375) 2024-11-08 tessertaha@gmail.com Add ability to override `NavigationDestination.label` padding for `NavigationBar` (flutter/flutter#158260) 2024-11-08 stuartmorgan@google.com Add flutter/package code generation instructions (flutter/flutter#158326) 2024-11-08 engine-flutter-autoroll@skia.org Roll Flutter Engine from 8e19915c19fc to 44d788f4651b (3 revisions) (flutter/flutter#158362) 2024-11-08 engine-flutter-autoroll@skia.org Roll Flutter Engine from bcb281cde579 to 8e19915c19fc (4 revisions) (flutter/flutter#158354) 2024-11-07 rmolivares@renzo-olivares.dev Make `_SelectableRegionSelectionContainerDelegate` public (flutter/flutter#147080) 2024-11-07 jason-simmons@users.noreply.github.com Manual roll Flutter Engine from 371c86fb6b49 to bcb281cde579 (flutter/flutter#158346) 2024-11-07 katelovett@google.com Add clarification on review timelines in PR template (flutter/flutter#158345) 2024-11-07 bkonyi@google.com Increase Java heap limit to 8GB for plugin integration tests using deferred components (flutter/flutter#158330) 2024-11-07 137456488+flutter-pub-roller-bot@users.noreply.github.com Roll pub packages (flutter/flutter#158337) 2024-11-07 engine-flutter-autoroll@skia.org Roll Flutter Engine from ac50b20ae5c9 to 371c86fb6b49 (5 revisions) (flutter/flutter#158336) 2024-11-07 matanlurey@users.noreply.github.com Fix a breakage caused by the test being unskipped. (flutter/flutter#158335) 2024-11-07 engine-flutter-autoroll@skia.org Roll Flutter Engine from 8a963cfc134c to ac50b20ae5c9 (1 revision) (flutter/flutter#158308) 2024-11-07 matanlurey@users.noreply.github.com `Plugin.isDevDependency` if exclusively in `dev_dependencies` (flutter/flutter#157462) 2024-11-07 stuartmorgan@google.com Add recently imported packages to issue template (flutter/flutter#158324) 2024-11-07 engine-flutter-autoroll@skia.org Roll Flutter Engine from 076688d95818 to 8a963cfc134c (1 revision) (flutter/flutter#158304) 2024-11-07 engine-flutter-autoroll@skia.org Roll Flutter Engine from 94dac953a95f to 076688d95818 (2 revisions) (flutter/flutter#158303) 2024-11-07 polinach@google.com Make leak tracking bots blocking. (flutter/flutter#157866) 2024-11-07 engine-flutter-autoroll@skia.org Roll Flutter Engine from b36ca3319825 to 94dac953a95f (1 revision) (flutter/flutter#158297) 2024-11-06 engine-flutter-autoroll@skia.org Roll Flutter Engine from 58ac1dadd69d to b36ca3319825 (9 revisions) (flutter/flutter#158295) 2024-11-06 5593189+p-salmon@users.noreply.github.com Added cusor control properties to CupertinoSearchTextField and tests (flutter/flutter#158240) 2024-11-06 bkonyi@google.com Fix flakiness in hot_reload_test.dart (flutter/flutter#158271) 2024-11-06 34871572+gmackall@users.noreply.github.com Fix use of deprecated `buildDir` in Android templates/tests/examples (flutter/flutter#157560) 2024-11-06 engine-flutter-autoroll@skia.org Roll Flutter Engine from f03f11300a9d to 58ac1dadd69d (5 revisions) (flutter/flutter#158283) 2024-11-06 137456488+flutter-pub-roller-bot@users.noreply.github.com Roll pub packages (flutter/flutter#158281) 2024-11-06 magder@google.com Delete firebase_android_embedding_v2_smoke_test (flutter/flutter#158223) 2024-11-06 yjbanov@google.com [web] fix --ab option for web benchmarks (flutter/flutter#154574) 2024-11-06 47866232+chunhtai@users.noreply.github.com excluding website-cms from critical pr triage (flutter/flutter#158220) 2024-11-06 32538273+ValentinVignal@users.noreply.github.com Add test for `image.frame_builder.0.dart` (flutter/flutter#158247) 2024-11-06 engine-flutter-autoroll@skia.org Roll Packages from 7219431 to bb5a258 (6 revisions) (flutter/flutter#158267) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages Please CC camillesimon@google.com,stuartmorgan@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
Replace deprecated
Project.buildDirgetter and setter uses.Deprecation notice in Gradle docs
Pre-launch Checklist
///).If you need help, consider asking for advice on the #hackers-new channel on Discord.