Commit Graph

70 Commits

Author SHA1 Message Date
gmackall
d1eb1f0a57
Upgrade integration tests to use AGP 7.3/Gradle 7.4 (#129642)
Upgrades tests under `dev/integration_tests` to use the latest values [in the templates](944d6c8fef/dev/tools/bin/generate_gradle_lockfiles.dart (L135)). Most of this PR was auto-generated, by running `find dev/integration_tests/ -type d -name 'android' | dart dev/tools/bin/generate_gradle_lockfiles.dart` from the root of the flutter directory.

The pieces that were not are:
1. Upgrading the Gradle versions used in integration tests to be >=7.4, in places where it was currently lower.
2. Upgrading the mac, windows, and linux build_tests .ci.yaml configuration to use jdk 17 on all shards. It currently was using a mix of 17 and 11. This isn't desirable, because some of the tests require 17, and the distribution is [random across shards](cef9a8c54b/dev/bots/test.dart (L553)) (so they were only passing because they were getting randomly placed on shards using jdk 17).
3. Adding a dependency on jdk 11 for the tests based on the `firebaselab/firebaselab` recipe. Previously they had no java dependency, and were therefore defaulting to java 1.8. The newer AGP versions necessitated an upgrade to 11 to run.

Note that it also ended up downgrading the AGP version in two places (in the [hybrid_android_views](https://github.com/flutter/flutter/pull/129642/files#diff-d7cfaa1c96d5c2383e7fc253ac8c9df062b544c24f7d80aa8a02290c01d17205L17) and [platform_interaction](https://github.com/flutter/flutter/pull/129642/files#diff-b2fba811efadd1cfb097bebd93be99fe4b6d6f17aefa863267290fc704290766L17) tests), because those had been manually edited to a newer version than the template.

Related to: https://github.com/flutter/flutter/issues/123636, https://github.com/flutter/flutter/pull/123910
2023-06-30 19:34:20 +00:00
gmackall
c12488a707
[Reland] Add migrator to upgrade gradle version when conflict with Android Studio bundled Java version is detected (#125836)
This is an attempt to reland https://github.com/flutter/flutter/pull/124085.

Differences from this attempt and the last: 
1. Adds a check for null android studio versions and a test for this case.
2. Wraps the migrate code in a try-catch [per the suggestion here](https://github.com/flutter/flutter/pull/125728/files#r1181747899).

Old PR description:
This PR adds an android project migrator that checks the version of android studio and the version of gradle for conflicts, and upgrades to 7.4 if a conflict is detected. For more detail about the particular conflict, see https://github.com/flutter/flutter/issues/122376.

The PR also upgrades older gradle versions being used in integration testing to 7.4.

Fixes/related to: https://github.com/flutter/flutter/issues/122376 and https://github.com/flutter/flutter/issues/123636
2023-05-03 21:00:06 +00:00
gmackall
db7196c52c
Revert "Add migrator to upgrade gradle version when conflict with And… (#125813)
…roid Studio bundled Java version is detected (#124085)"

This reverts commit eba2a520b4.
2023-05-01 18:47:01 +00:00
gmackall
eba2a520b4
Add migrator to upgrade gradle version when conflict with Android Studio bundled Java version is detected (#124085)
This PR adds an android project migrator that checks the version of android studio and the version of gradle for conflicts, and upgrades to 7.4 if a conflict is detected. For more detail about the particular conflict, see https://github.com/flutter/flutter/issues/122376.

The PR also upgrades older gradle versions being used in integration testing to 7.4. 

Fixes/related to: https://github.com/flutter/flutter/issues/122376 and https://github.com/flutter/flutter/issues/123636
2023-04-27 23:07:50 +00:00
Bartek Pacia
c40dd27681
Fix Gradle warning in a freshly flutter createed Android project (#122290)
Fix Gradle warning in a freshly `flutter create`ed Android project
2023-03-21 23:41:49 +00:00
Gary Qian
06e7c7a618
Incrementally update gradle to AGP 7.2.0 and 7.3.3 in some integration_tests (#116201) 2022-12-05 12:27:29 -08:00
Ahmed Ashour
0be4a8e9ae
Remove unneeded date comment in gradle-wrapper.properties (#104061) 2022-06-13 16:43:11 -07:00
Andrei Diaconu
924336fcee
Reland 3: Display Features (#93240) 2021-11-20 15:48:06 -08:00
Gary Qian
02b1146cff
Reland "Exit on deprecated v1 embedding when trying to run or build" (#92901) (#93566) 2021-11-12 15:52:32 -08:00
Yegor
24b9346c9b
Revert "Reland "Exit on deprecated v1 embedding when trying to run or build (#92901)" (#93386)" (#93518)
This reverts commit eabb7cbc34.

It broke multiple tests.
2021-11-11 16:45:40 -08:00
Gary Qian
eabb7cbc34
Reland "Exit on deprecated v1 embedding when trying to run or build (#92901)" (#93386) 2021-11-11 14:49:35 -08:00
Zachary Anderson
858a328712
Revert "Exit on deprecated v1 embedding when trying to run or build (#92901)" (#93365)
This reverts commit 6153bbef3e.
2021-11-09 22:22:14 -08:00
Gary Qian
6153bbef3e
Exit on deprecated v1 embedding when trying to run or build (#92901) 2021-11-09 17:38:03 -08:00
Zachary Anderson
2468f315e0
Revert "Reland: display features (#93117)" (#93204)
This reverts commit 9038fac960.
2021-11-06 22:46:46 -07:00
Andrei Diaconu
9038fac960
Reland: display features (#93117) 2021-11-05 15:54:25 -07:00
Zachary Anderson
7779ad3c60
Revert "Reland engine display features (#89511)" (#93098)
This reverts commit 058dfd49a0.
2021-11-04 23:05:45 -07:00
Andrei Diaconu
058dfd49a0
Reland engine display features (#89511) 2021-11-04 18:37:55 -07:00
Emmanuel Garcia
c97a8622bf
Update lockfiles (#92800) 2021-11-01 08:58:13 -07:00
Emmanuel Garcia
4d79bb02c4
Bump Kotlin version in templates and projects (#92052) 2021-10-25 13:13:03 -07:00
Emmanuel Garcia
d7631275fe
Bump targetSdkVersion to 31 and organize static values (#91719) 2021-10-15 13:41:48 -07:00
Zachary Anderson
5188df0821
Revert gradle roll (#91459)
* Revert "Mark last failing test after gradle update as flaky. (#91423)"

This reverts commit 46a52d03bd.

* Revert "fix android template for Gradle 7 (#91411)"

This reverts commit 51d06d537f.

* Revert "Add explicit version for mac and windows openjdk. (#91408)"

This reverts commit bf429f2771.

* Revert "Update the openjdk version used by linux android tests. (#91405)"

This reverts commit 2144ab8b45.

* Revert "Migrate to Gradle 7.0.2 / AGP 7.0.1 (#90642)"

This reverts commit b6459f9b63.
2021-10-07 19:42:24 -07:00
Taha Tesser
b6459f9b63
Migrate to Gradle 7.0.2 / AGP 7.0.1 (#90642) 2021-10-06 17:01:13 -07:00
Littlegnal
1b73a35fba
Change project.buildDir in standalone subprojects property (#91030) 2021-10-01 17:18:05 -07:00
Emmanuel Garcia
0bccce6260
[gradle] Unlock all configurations if a local engine is used (#83635) 2021-06-01 13:19:03 -07:00
Emmanuel Garcia
fa5883b78e
Add Gradle lockfiles and tool to generate them (#83067) 2021-05-21 13:04:03 -07:00
Jonah Williams
d9638d25d7
migrate from jcenter to mavencentral (#80908) 2021-04-21 21:41:07 -07:00
Emmanuel Garcia
42f21fd780
Standardize how Java8 is set in gradle files (#80600) 2021-04-19 20:19:03 -07:00
Jenn Magder
2eca1f4033
Migrate dev projects from jcenter to mavenCentral (#78812) 2021-03-22 17:39:02 -07:00
Ahmed Saleh
740504d3e6
Refactor: use one subprojects property (#77942) 2021-03-12 16:28:03 -08:00
Emmanuel Garcia
8dd0de7f58
Relands: Migrate template to Gradle 6.7 and AGP 4.1.0 (#71446) 2020-12-01 19:01:09 -08:00
Amir Hardon
7df04fdbd3
Revert "Migrate template to Gradle 6.7 and AGP 4.1.0 (#70808)" (#71096)
This reverts commit 8e73bab94c.
2020-11-23 12:27:36 -08:00
Emmanuel Garcia
8e73bab94c
Migrate template to Gradle 6.7 and AGP 4.1.0 (#70808) 2020-11-20 13:05:35 -08:00
xster
df8e537f96
move compile/target sdk versions to 29 (#62799) (#63008) 2020-08-11 14:51:02 -07:00
Jonah Williams
e8ad863a08
Revert "move compile/target sdk versions to 29 (#62799)" (#62884)
This reverts commit 5b3dc5251b.
2020-08-04 11:20:16 -07:00
xster
5b3dc5251b
move compile/target sdk versions to 29 (#62799) 2020-08-04 08:26:08 -07:00
Emmanuel Garcia
54dba4cd59
Don't import plugins that don't support android in settings.gradle (#54407) 2020-04-12 08:55:03 -07:00
Dan Field
3d812c1b96
Reduce gradle deps (#50691)
* drop unnecessary test deps

* bump to junit 4.13
2020-02-12 21:14:54 -08:00
Ian Hickson
449f4a6673
License update (#45373)
* Update project.pbxproj files to say Flutter rather than Chromium

Also, the templates now have an empty organization so that we don't cause people to give their apps a Flutter copyright.

* Update the copyright notice checker to require a standard notice on all files

* Update copyrights on Dart files. (This was a mechanical commit.)

* Fix weird license headers on Dart files that deviate from our conventions; relicense Shrine.

Some were already marked "The Flutter Authors", not clear why. Their
dates have been normalized. Some were missing the blank line after the
license. Some were randomly different in trivial ways for no apparent
reason (e.g. missing the trailing period).

* Clean up the copyrights in non-Dart files. (Manual edits.)

Also, make sure templates don't have copyrights.

* Fix some more ORGANIZATIONNAMEs
2019-11-27 15:04:02 -08:00
Emmanuel Garcia
61c6c29233
Migrate examples and tests to AndroidX (#41251) 2019-09-25 09:02:15 -07:00
Emmanuel Garcia
4d404da6df
Update Kotlin and Gradle version (#40181) 2019-09-13 19:37:07 -07:00
Emmanuel Garcia
2c857b9370
Enable R8 (#40453) 2019-09-13 19:06:40 -07:00
Jason Simmons
7bfbc28505
Revert "Upgrade the Gradle script to Android plugin version 3.3.0 (#26913)" (#27045)
This reverts commit 30f33d6c7d.
2019-01-24 14:29:08 -08:00
Jason Simmons
30f33d6c7d
Upgrade the Gradle script to Android plugin version 3.3.0 (#26913)
Fixes https://github.com/flutter/flutter/issues/26544
2019-01-24 12:21:11 -08:00
Jonah Williams
f777db2b78
add uiMode to android:configChanges (#26896) 2019-01-22 10:37:22 -08:00
Dan Field
d8d36bc7e8
targetSdkVersion 28 (#26798) 2019-01-19 11:59:42 -08:00
Dan Field
f02f4fbed3
Rev Android Platform to 28 for bots (#26790)
* Rev Android Platform to 28 for bots

* push all to 28

* include platform tools update
2019-01-18 20:39:10 -08:00
Stanislav Baranov
323d1574c6
newly created apps / plugins should use latest gradle dependencies (#22790) (#23314) 2018-10-19 19:07:06 -07:00
Yegor
82d6589590
Revert "newly created apps / plugins should use latest gradle dependencies (#22790)" (#23263)
This reverts commit 751c083f7d.

Our buildbots need to be upgraded to a newer version of the Android SDK.
2018-10-18 14:17:47 -07:00
Sebastian Roth
751c083f7d newly created apps / plugins should use latest gradle dependencies (#22790) 2018-10-18 12:56:18 -07:00
Mikkel Nygaard Ravn
8c39c35eb0
Upgradle Gradle dependencies to match Android Studio 3.1.2 (#18080) 2018-06-01 09:57:40 +02:00