Skip to content

Conversation

@gmackall
Copy link
Member

@gmackall gmackall commented Oct 24, 2024

Replace deprecated Project.buildDir getter 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.

@github-actions github-actions bot added tool Affects the "flutter" command-line tool. See also t: labels. d: examples Sample code and demos labels Oct 24, 2024
@AbdeMohlbi
Copy link
Contributor

AbdeMohlbi commented Oct 25, 2024

hey @gmackall ,i guess android\app\build.gradle.kts should look like this :

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()
Copy link
Member Author

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()
Copy link
Member Author

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

Copy link
Contributor

@AbdeMohlbi AbdeMohlbi Oct 30, 2024

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

One thing to consider: multiple files have the same content. Why not unify their usage?

@gmackall
Copy link
Member Author

hey @gmackall ,i guess android\app\build.gradle.kts should look like this :

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 .

I ended up going with a slightly different syntax, as the set wouldn't cause any errors, but I noticed that it wasn't properly creating the build directory (but looked like it worked at first if that directory hadn't been cleaned up). Thanks for chiming in regardless though!

@gmackall gmackall changed the title [WIP] Fix use of deprecated buildDir in Android templates [WIP] Fix use of deprecated buildDir in Android templates and tests Oct 30, 2024
@gmackall gmackall changed the title [WIP] Fix use of deprecated buildDir in Android templates and tests [WIP] Fix use of deprecated buildDir in Android templates/tests/examples Oct 30, 2024
@gmackall gmackall changed the title [WIP] Fix use of deprecated buildDir in Android templates/tests/examples Fix use of deprecated buildDir in Android templates/tests/examples Oct 30, 2024
@gmackall gmackall marked this pull request as ready for review October 30, 2024 06:12
@AbdeMohlbi
Copy link
Contributor

hey @gmackall ,i guess android\app\build.gradle.kts should look like this :

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 .

I ended up going with a slightly different syntax, as the set wouldn't cause any errors, but I noticed that it wasn't properly creating the build directory (but looked like it worked at first if that directory hadn't been cleaned up). Thanks for chiming in regardless though!

If i recall i tried it with a new project that uses kotlin (build.gradle.kts)
Tried running without any plugins worked.
Flutter Clean then flutter pub add sharedPrefernces and worked .maybe it has something to do with agp (8.7.1)and gradle(8.10) , also i guess i have a flutter.groovy script that is differnt then the master's branch .

@AbdeMohlbi
Copy link
Contributor

I'll close #157468 then

@gmackall gmackall requested review from a team and bartekpacia October 30, 2024 16:59
Copy link
Member

@bartekpacia bartekpacia left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice small thingie:)

@gmackall gmackall added the autosubmit Merge PR when tree becomes green via auto submit App label Nov 6, 2024
@auto-submit auto-submit bot merged commit b8e56e3 into flutter:master Nov 6, 2024
139 checks passed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Nov 7, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Nov 7, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Nov 7, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Nov 8, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Nov 8, 2024
auto-submit bot pushed a commit to flutter/packages that referenced this pull request Nov 11, 2024
flutter/flutter@73546b3...c8510f2

2024-11-08 [email protected] Roll Flutter Engine from 44d788f4651b to a08bd5a07c2a (3 revisions) (flutter/flutter#158375)
2024-11-08 [email protected] Add ability to override `NavigationDestination.label` padding for `NavigationBar` (flutter/flutter#158260)
2024-11-08 [email protected] Add flutter/package code generation instructions (flutter/flutter#158326)
2024-11-08 [email protected] Roll Flutter Engine from 8e19915c19fc to 44d788f4651b (3 revisions) (flutter/flutter#158362)
2024-11-08 [email protected] Roll Flutter Engine from bcb281cde579 to 8e19915c19fc (4 revisions) (flutter/flutter#158354)
2024-11-07 [email protected] Make `_SelectableRegionSelectionContainerDelegate` public (flutter/flutter#147080)
2024-11-07 [email protected] Manual roll Flutter Engine from 371c86fb6b49 to bcb281cde579 (flutter/flutter#158346)
2024-11-07 [email protected] Add clarification on review timelines in PR template (flutter/flutter#158345)
2024-11-07 [email protected] Increase Java heap limit to 8GB for plugin integration tests using deferred components (flutter/flutter#158330)
2024-11-07 [email protected] Roll pub packages (flutter/flutter#158337)
2024-11-07 [email protected] Roll Flutter Engine from ac50b20ae5c9 to 371c86fb6b49 (5 revisions) (flutter/flutter#158336)
2024-11-07 [email protected] Fix a breakage caused by the test being unskipped. (flutter/flutter#158335)
2024-11-07 [email protected] Roll Flutter Engine from 8a963cfc134c to ac50b20ae5c9 (1 revision) (flutter/flutter#158308)
2024-11-07 [email protected] `Plugin.isDevDependency` if exclusively in `dev_dependencies` (flutter/flutter#157462)
2024-11-07 [email protected] Add recently imported packages to issue template (flutter/flutter#158324)
2024-11-07 [email protected] Roll Flutter Engine from 076688d95818 to 8a963cfc134c (1 revision) (flutter/flutter#158304)
2024-11-07 [email protected] Roll Flutter Engine from 94dac953a95f to 076688d95818 (2 revisions) (flutter/flutter#158303)
2024-11-07 [email protected] Make leak tracking bots blocking. (flutter/flutter#157866)
2024-11-07 [email protected] Roll Flutter Engine from b36ca3319825 to 94dac953a95f (1 revision) (flutter/flutter#158297)
2024-11-06 [email protected] Roll Flutter Engine from 58ac1dadd69d to b36ca3319825 (9 revisions) (flutter/flutter#158295)
2024-11-06 [email protected] Added cusor control properties to CupertinoSearchTextField and tests (flutter/flutter#158240)
2024-11-06 [email protected] Fix flakiness in hot_reload_test.dart (flutter/flutter#158271)
2024-11-06 [email protected] Fix use of deprecated `buildDir` in Android templates/tests/examples (flutter/flutter#157560)
2024-11-06 [email protected] Roll Flutter Engine from f03f11300a9d to 58ac1dadd69d (5 revisions) (flutter/flutter#158283)
2024-11-06 [email protected] Roll pub packages (flutter/flutter#158281)
2024-11-06 [email protected] Delete firebase_android_embedding_v2_smoke_test (flutter/flutter#158223)
2024-11-06 [email protected] [web] fix --ab option for web benchmarks (flutter/flutter#154574)
2024-11-06 [email protected] excluding website-cms from critical pr triage (flutter/flutter#158220)
2024-11-06 [email protected] Add test for `image.frame_builder.0.dart` (flutter/flutter#158247)
2024-11-06 [email protected] 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 [email protected],[email protected] 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
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 12, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 13, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Feb 13, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Mar 6, 2025
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Mar 7, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

autosubmit Merge PR when tree becomes green via auto submit App d: examples Sample code and demos tool Affects the "flutter" command-line tool. See also t: labels.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants