Skip to content

F
Front-End
Unverified Commit 5c691893 authored by Emmanuel Garcia's avatar Emmanuel Garcia Committed by GitHub
Browse files
Options

Migrate AGP and Gradle versions to 7.1.2/7.4 (#99723)

parent 6baca0db
Show whitespace changes
Inline Side-by-side
Showing with 214 additions and 125 deletions
.ci.yaml
View file @ 5c691893
......@@ -37,14 +37,14 @@ platform_properties:
{"name":"chrome_and_driver_96","path":"chrome"},
{"name":"flutter_sdk","path":"flutter sdk"},
{"name":"gradle","path":"gradle"},
{"name":"openjdk","path":"java"},
{"name":"openjdk","path":"java11"},
{"name":"pub_cache","path":".pub-cache"}
]
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "curl"},
{"dependency": "open_jdk"}
{"dependency": "open_jdk", "version": "11"},
{"dependency": "curl"}
]
os: Linux
device_os: "N"
......@@ -57,14 +57,14 @@ platform_properties:
{"name":"chrome_and_driver_96","path":"chrome"},
{"name":"flutter_sdk","path":"flutter sdk"},
{"name":"gradle","path":"gradle"},
{"name":"openjdk","path":"java"},
{"name":"openjdk","path":"java11"},
{"name":"pub_cache","path":".pub-cache"}
]
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "curl"},
{"dependency": "open_jdk"}
{"dependency": "open_jdk", "version": "11"},
{"dependency": "curl"}
]
os: Linux
device_os: "R"
......@@ -76,7 +76,7 @@ platform_properties:
{"name":"android_sdk","path":"android"},
{"name":"chrome_and_driver_96","path":"chrome"},
{"name":"flutter_sdk","path":"flutter sdk"},
{"name":"openjdk","path":"java"},
{"name":"openjdk","path":"java11"},
{"name":"osx_sdk_13a233","path":"osx_sdk"},
{"name":"pub_cache","path":".pub-cache"},
{"name":"xcode_binary","path":"xcode_binary"}
......@@ -96,14 +96,14 @@ platform_properties:
{"name":"chrome_and_driver_96","path":"chrome"},
{"name":"flutter_sdk","path":"flutter sdk"},
{"name":"gradle","path":"gradle"},
{"name":"openjdk","path":"java"},
{"name":"openjdk","path":"java11"},
{"name":"pub_cache","path":".pub-cache"}
]
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:98.1"},
{"dependency": "open_jdk"}
{"dependency": "open_jdk", "version": "11"}
]
os: Mac-12
device_os: N
......@@ -115,7 +115,7 @@ platform_properties:
{"name":"chrome_and_driver_96","path":"chrome"},
{"name":"flutter_sdk","path":"flutter sdk"},
{"name":"gradle","path":"gradle"},
{"name":"openjdk","path":"java"},
{"name":"openjdk","path":"java11"},
{"name":"pub_cache","path":".pub-cache"},
{"name":"xcode_binary","path":"xcode_binary"},
{"name":"osx_sdk_13a233","path":"osx_sdk"}
......@@ -137,7 +137,7 @@ platform_properties:
{"name":"android_sdk","path":"android"},
{"name":"chrome_and_driver_96","path":"chrome"},
{"name":"flutter_sdk","path":"flutter sdk"},
{"name":"openjdk","path":"java"},
{"name":"openjdk","path":"java11"},
{"name":"pub_cache","path":".pub-cache"},
{"name":"vsbuild","path":"vsbuild"}
]
......@@ -156,7 +156,7 @@ platform_properties:
{"name":"chrome_and_driver_96","path":"chrome"},
{"name":"flutter_sdk","path":"flutter sdk"},
{"name":"gradle","path":"gradle"},
{"name":"openjdk","path":"java"},
{"name":"openjdk","path":"java11"},
{"name":"pub_cache","path":".pub-cache"}
]
dependencies: >-
......@@ -164,7 +164,7 @@ platform_properties:
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "certs"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"}
{"dependency": "open_jdk", "version": "11"}
]
os: Windows-10
device_os: N
......@@ -187,12 +187,14 @@ targets:
add_recipes_cq: "true"
caches: >-
[
{"name":"gradle","path":"gradle"}
{"name":"gradle","path":"gradle"},
{"name": "openjdk", "path": "java"}
]
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"}
]
tags: >
["devicelab","hostonly"]
......@@ -212,7 +214,7 @@ targets:
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"},
{"dependency": "open_jdk", "version": "11"},
{"dependency": "goldctl"},
{"dependency": "clang"},
{"dependency": "cmake"},
......@@ -232,7 +234,7 @@ targets:
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"},
{"dependency": "open_jdk", "version": "11"},
{"dependency": "goldctl"},
{"dependency": "clang"},
{"dependency": "cmake"},
......@@ -393,7 +395,7 @@ targets:
{"dependency": "clang"},
{"dependency": "cmake"},
{"dependency": "ninja"},
{"dependency": "open_jdk"},
{"dependency": "open_jdk", "version": "11"},
{"dependency": "android_sdk", "version": "version:31v8"}
]
shard: framework_tests
......@@ -456,12 +458,14 @@ targets:
properties:
caches: >-
[
{"name":"gradle","path":"gradle"}
{"name":"gradle","path":"gradle"},
{"name": "openjdk", "path": "java11"}
]
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk", "version": "11"}
]
tags: >
["devicelab","hostonly"]
......@@ -478,12 +482,14 @@ targets:
properties:
caches: >-
[
{"name":"gradle","path":"gradle"}
{"name":"gradle","path":"gradle"},
{"name": "openjdk", "path": "java11"}
]
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk", "version": "11"}
]
tags: >
["devicelab","hostonly"]
......@@ -500,12 +506,14 @@ targets:
properties:
caches: >-
[
{"name":"gradle","path":"gradle"}
{"name":"gradle","path":"gradle"},
{"name": "openjdk", "path": "java11"}
]
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk", "version": "11"}
]
tags: >
["devicelab","hostonly"]
......@@ -522,12 +530,14 @@ targets:
properties:
caches: >-
[
{"name":"gradle","path":"gradle"}
{"name":"gradle","path":"gradle"},
{"name": "openjdk", "path": "java11"}
]
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk", "version": "11"}
]
tags: >
["devicelab","hostonly"]
......@@ -544,12 +554,14 @@ targets:
properties:
caches: >-
[
{"name":"gradle","path":"gradle"}
{"name":"gradle","path":"gradle"},
{"name": "openjdk", "path": "java11"}
]
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk", "version": "11"}
]
tags: >
["devicelab","hostonly"]
......@@ -566,12 +578,14 @@ targets:
properties:
caches: >-
[
{"name":"gradle","path":"gradle"}
{"name":"gradle","path":"gradle"},
{"name": "openjdk", "path": "java11"}
]
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk", "version": "11"}
]
tags: >
["devicelab","hostonly"]
......@@ -612,12 +626,14 @@ targets:
properties:
caches: >-
[
{"name":"gradle","path":"gradle"}
{"name":"gradle", "path":"gradle"},
{"name": "openjdk", "path": "java11"}
]
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk", "version": "11"}
]
tags: >
["devicelab","hostonly"]
......@@ -635,12 +651,14 @@ targets:
properties:
caches: >-
[
{"name":"gradle","path":"gradle"}
{"name":"gradle","path":"gradle"},
{"name": "openjdk", "path": "java11"}
]
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk", "version": "11"}
]
tags: >
["devicelab","hostonly"]
......@@ -658,12 +676,14 @@ targets:
properties:
caches: >-
[
{"name":"gradle","path":"gradle"}
{"name":"gradle", "path":"gradle"},
{"name": "openjdk", "path": "java11"}
]
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"}
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk", "version": "11"}
]
tags: >
["devicelab","hostonly"]
......@@ -735,7 +755,7 @@ targets:
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "clang"},
{"dependency": "open_jdk"},
{"dependency": "open_jdk", "version": "11"},
{"dependency": "goldctl"}
]
shard: tool_integration_tests
......@@ -760,7 +780,7 @@ targets:
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "clang"},
{"dependency": "open_jdk"},
{"dependency": "open_jdk", "version": "11"},
{"dependency": "goldctl"}
]
shard: tool_integration_tests
......@@ -785,7 +805,7 @@ targets:
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "clang"},
{"dependency": "open_jdk"},
{"dependency": "open_jdk", "version": "11"},
{"dependency": "goldctl"}
]
shard: tool_integration_tests
......@@ -810,7 +830,7 @@ targets:
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "clang"},
{"dependency": "open_jdk"},
{"dependency": "open_jdk", "version": "11"},
{"dependency": "goldctl"}
]
shard: tool_integration_tests
......@@ -833,7 +853,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "open_jdk"}
{"dependency": "open_jdk", "version": "11"}
]
shard: tool_tests
subshard: commands
......@@ -854,7 +874,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "open_jdk"}
{"dependency": "open_jdk", "version": "11"}
]
shard: tool_tests
subshard: general
......@@ -1349,7 +1369,7 @@ targets:
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"},
{"dependency": "open_jdk", "version": "11"},
{"dependency": "goldctl"}
]
shard: web_tool_tests
......@@ -2473,7 +2493,8 @@ targets:
add_recipes_cq: "true"
caches: >-
[
{"name":"gradle","path":"gradle"}
{"name":"gradle", "path":"gradle"},
{"name": "openjdk", "path": "java"}
]
dependencies: >-
[
......@@ -2503,7 +2524,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "open_jdk"},
{"dependency": "open_jdk", "version": "11"},
{"dependency": "xcode"},
{"dependency": "gems"}
]
......@@ -2526,7 +2547,7 @@ targets:
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:98.1"},
{"dependency": "open_jdk"},
{"dependency": "open_jdk", "version": "11"},
{"dependency": "xcode"},
{"dependency": "gems"},
{"dependency": "goldctl"}
......@@ -2546,7 +2567,7 @@ targets:
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:98.1"},
{"dependency": "open_jdk"},
{"dependency": "open_jdk", "version": "11"},
{"dependency": "xcode"},
{"dependency": "gems"},
{"dependency": "goldctl"}
......@@ -2566,7 +2587,7 @@ targets:
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:98.1"},
{"dependency": "open_jdk"},
{"dependency": "open_jdk", "version": "11"},
{"dependency": "xcode"},
{"dependency": "gems"},
{"dependency": "goldctl"}
......@@ -2586,7 +2607,7 @@ targets:
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:98.1"},
{"dependency": "open_jdk"},
{"dependency": "open_jdk", "version": "11"},
{"dependency": "xcode"},
{"dependency": "gems"},
{"dependency": "goldctl"}
......@@ -2690,7 +2711,7 @@ targets:
{"dependency": "goldctl"},
{"dependency": "xcode"},
{"dependency": "gems"},
{"dependency": "open_jdk"},
{"dependency": "open_jdk", "version": "11"},
{"dependency": "android_sdk", "version": "version:31v8"}
]
shard: framework_tests
......@@ -2748,7 +2769,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "open_jdk"},
{"dependency": "open_jdk", "version": "11"},
{"dependency": "xcode"},
{"dependency": "gems"}
]
......@@ -2772,7 +2793,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "open_jdk"},
{"dependency": "open_jdk", "version": "11"},
{"dependency": "xcode"},
{"dependency": "gems"}
]
......@@ -2791,12 +2812,13 @@ targets:
properties:
caches: >-
[
{"name":"gradle","path":"gradle"}
{"name":"gradle","path":"gradle"},
{"name": "openjdk", "path": "java11"}
]
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "open_jdk"},
{"dependency": "open_jdk", "version": "11"},
{"dependency": "xcode"},
{"dependency": "gems"}
]
......@@ -2821,7 +2843,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "open_jdk"},
{"dependency": "open_jdk", "version": "11"},
{"dependency": "xcode"},
{"dependency": "gems"}
]
......@@ -2841,12 +2863,13 @@ targets:
properties:
caches: >-
[
{"name":"gradle","path":"gradle"}
{"name":"gradle","path":"gradle"},
{"name": "openjdk", "path": "java11"}
]
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "open_jdk"},
{"dependency": "open_jdk", "version": "11"},
{"dependency": "xcode"},
{"dependency": "gems"}
]
......@@ -2866,12 +2889,13 @@ targets:
properties:
caches: >-
[
{"name":"gradle","path":"gradle"}
{"name":"gradle","path":"gradle"},
{"name": "openjdk", "path": "java11"}
]
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "open_jdk"},
{"dependency": "open_jdk", "version": "11"},
{"dependency": "xcode"},
{"dependency": "gems"}
]
......@@ -2891,12 +2915,13 @@ targets:
properties:
caches: >-
[
{"name":"gradle","path":"gradle"}
{"name":"gradle", "path":"gradle"},
{"name": "openjdk", "path": "java11"}
]
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "open_jdk"},
{"dependency": "open_jdk", "version": "11"},
{"dependency": "xcode"},
{"dependency": "gems"}
]
......@@ -2921,7 +2946,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "open_jdk"},
{"dependency": "open_jdk", "version": "11"},
{"dependency": "xcode"},
{"dependency": "gems"}
]
......@@ -2947,7 +2972,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "open_jdk"},
{"dependency": "open_jdk", "version": "11"},
{"dependency": "xcode"},
{"dependency": "gems"}
]
......@@ -2972,7 +2997,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "open_jdk"},
{"dependency": "open_jdk", "version": "11"},
{"dependency": "xcode"},
{"dependency": "gems"}
]
......@@ -2995,7 +3020,7 @@ targets:
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:98.1"},
{"dependency": "open_jdk"},
{"dependency": "open_jdk", "version": "11"},
{"dependency": "xcode"},
{"dependency": "gems"},
{"dependency": "goldctl"}
......@@ -3021,7 +3046,7 @@ targets:
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:98.1"},
{"dependency": "open_jdk"},
{"dependency": "open_jdk", "version": "11"},
{"dependency": "xcode"},
{"dependency": "gems"},
{"dependency": "goldctl"}
......@@ -3047,7 +3072,7 @@ targets:
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:98.1"},
{"dependency": "open_jdk"},
{"dependency": "open_jdk", "version": "11"},
{"dependency": "xcode"},
{"dependency": "gems"},
{"dependency": "goldctl"}
......@@ -3073,7 +3098,7 @@ targets:
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:98.1"},
{"dependency": "open_jdk"},
{"dependency": "open_jdk", "version": "11"},
{"dependency": "xcode"},
{"dependency": "gems"},
{"dependency": "goldctl"}
......@@ -3098,7 +3123,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "open_jdk"}
{"dependency": "open_jdk", "version": "11"}
]
shard: tool_tests
subshard: commands
......@@ -3114,7 +3139,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "open_jdk"}
{"dependency": "open_jdk", "version": "11"}
]
shard: tool_tests
subshard: general
......@@ -3153,7 +3178,7 @@ targets:
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:98.1"},
{"dependency": "open_jdk"},
{"dependency": "open_jdk", "version": "11"},
{"dependency": "xcode"},
{"dependency": "goldctl"}
]
......@@ -3740,7 +3765,8 @@ targets:
add_recipes_cq: "true"
caches: >-
[
{"name":"gradle","path":"gradle"}
{"name":"gradle","path":"gradle"},
{"name": "openjdk", "path": "java"}
]
dependencies: >-
[
......@@ -3767,7 +3793,7 @@ targets:
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"},
{"dependency": "open_jdk", "version": "11"},
{"dependency": "goldctl"},
{"dependency": "vs_build", "version": "version:vs2019"}
]
......@@ -3786,7 +3812,7 @@ targets:
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"},
{"dependency": "open_jdk", "version": "11"},
{"dependency": "goldctl"},
{"dependency": "vs_build", "version": "version:vs2019"}
]
......@@ -3805,7 +3831,7 @@ targets:
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"},
{"dependency": "open_jdk", "version": "11"},
{"dependency": "goldctl"},
{"dependency": "vs_build", "version": "version:vs2019"}
]
......@@ -3860,7 +3886,7 @@ targets:
[
{"dependency": "goldctl"},
{"dependency": "vs_build", "version": "version:vs2019"},
{"dependency": "open_jdk"},
{"dependency": "open_jdk", "version": "11"},
{"dependency": "android_sdk", "version": "version:31v8"}
]
shard: framework_tests
......@@ -3919,7 +3945,7 @@ targets:
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"}
{"dependency": "open_jdk", "version": "11"}
]
tags: >
["devicelab","hostonly"]
......@@ -3943,7 +3969,7 @@ targets:
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"}
{"dependency": "open_jdk", "version": "11"}
]
tags: >
["devicelab","hostonly"]
......@@ -3977,7 +4003,11 @@ targets:
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"}
{"dependency": "open_jdk", "version": "11"}
]
caches: >-
[
{"name": "openjdk", "path": "java11"}
]
tags: >
["devicelab","hostonly"]
......@@ -4001,7 +4031,7 @@ targets:
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"}
{"dependency": "open_jdk", "version": "11"}
]
tags: >
["devicelab","hostonly"]
......@@ -4020,13 +4050,14 @@ targets:
properties:
caches: >-
[
{"name":"gradle","path":"gradle"}
{"name":"gradle", "path":"gradle"},
{"name": "openjdk", "path": "java11"}
]
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"}
{"dependency": "open_jdk", "version": "11"}
]
tags: >
["devicelab","hostonly"]
......@@ -4043,13 +4074,14 @@ targets:
properties:
caches: >-
[
{"name":"gradle","path":"gradle"}
{"name":"gradle","path":"gradle"},
{"name": "openjdk", "path": "java11"}
]
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"}
{"dependency": "open_jdk", "version": "11"}
]
tags: >
["devicelab","hostonly"]
......@@ -4073,7 +4105,7 @@ targets:
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"}
{"dependency": "open_jdk", "version": "11"}
]
tags: >
["devicelab","hostonly"]
......@@ -4094,7 +4126,7 @@ targets:
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"},
{"dependency": "open_jdk", "version": "11"},
{"dependency": "goldctl"},
{"dependency": "vs_build", "version": "version:vs2019"}
]
......@@ -4119,7 +4151,7 @@ targets:
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"},
{"dependency": "open_jdk", "version": "11"},
{"dependency": "goldctl"},
{"dependency": "vs_build", "version": "version:vs2019"}
]
......@@ -4144,7 +4176,7 @@ targets:
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"},
{"dependency": "open_jdk", "version": "11"},
{"dependency": "goldctl"},
{"dependency": "vs_build", "version": "version:vs2019"}
]
......@@ -4169,7 +4201,7 @@ targets:
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"},
{"dependency": "open_jdk", "version": "11"},
{"dependency": "goldctl"},
{"dependency": "vs_build", "version": "version:vs2019"}
]
......@@ -4194,7 +4226,7 @@ targets:
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"},
{"dependency": "open_jdk", "version": "11"},
{"dependency": "goldctl"},
{"dependency": "vs_build", "version": "version:vs2019"}
]
......@@ -4219,7 +4251,7 @@ targets:
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"},
{"dependency": "open_jdk", "version": "11"},
{"dependency": "goldctl"},
{"dependency": "vs_build", "version": "version:vs2019"}
]
......@@ -4243,7 +4275,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "open_jdk"}
{"dependency": "open_jdk", "version": "11"}
]
shard: tool_tests
subshard: commands
......@@ -4264,7 +4296,7 @@ targets:
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "open_jdk"}
{"dependency": "open_jdk", "version": "11"}
]
shard: tool_tests
subshard: general
......@@ -4285,7 +4317,7 @@ targets:
[
{"dependency": "android_sdk", "version": "version:31v8"},
{"dependency": "chrome_and_driver", "version": "version:96.2"},
{"dependency": "open_jdk"},
{"dependency": "open_jdk", "version": "11"},
{"dependency": "goldctl"}
]
shard: web_tool_tests
......
dev/devicelab/bin/tasks/build_aar_module_test.dart
View file @ 5c691893
......@@ -262,7 +262,7 @@ Future<void> main() async {
} catch (e) {
return TaskResult.failure(e.toString());
} finally {
// rmTree(tempDir);
rmTree(tempDir);
}
});
}
dev/devicelab/bin/tasks/gradle_plugin_light_apk_test.dart
View file @ 5c691893
......@@ -235,7 +235,6 @@ Future<void> main() async {
await runProjectTest((FlutterProject project) async {
section('gradlew assembleLocal (plugin with custom build type)');
await project.addCustomBuildType('local', initWith: 'debug');
await project.addGlobalBuildType('local', initWith: 'debug');
section('Add plugin');
project.addPlugin('path_provider');
await project.getPackages();
......
dev/devicelab/lib/framework/apk_utils.dart
View file @ 5c691893
......@@ -37,7 +37,8 @@ Future<void> runProjectTest(Future<void> Function(FlutterProject project) testFu
try {
await testFunction(project);
} finally {
rmTree(tempDir);
print('tempDir=$tempDir');
// rmTree(tempDir);
}
}
......@@ -274,26 +275,6 @@ android {
''');
}
Future<void> addGlobalBuildType(String name, {required String initWith}) async {
final File buildScript = File(
path.join(androidPath, 'build.gradle'),
);
buildScript.openWrite(mode: FileMode.append).write('''
subprojects {
afterEvaluate {
android {
buildTypes {
$name {
initWith $initWith
}
}
}
}
}
''');
}
/// Adds a plugin to the pubspec.
/// In pubspec, each dependency is expressed as key, value pair joined by a colon `:`.
/// such as `plugin_a`:`^0.0.1` or `plugin_a`:`\npath: /some/path`.
......
packages/flutter_tools/lib/src/android/gradle_errors.dart
View file @ 5c691893
......@@ -77,6 +77,7 @@ final List<GradleHandledError> gradleErrors = <GradleHandledError>[
multidexErrorHandler,
incompatibleKotlinVersionHandler,
minCompileSdkVersionHandler,
jvm11Required,
];
const String _boxTitle = 'Flutter Fix';
......@@ -538,3 +539,25 @@ final GradleHandledError minCompileSdkVersionHandler = GradleHandledError(
},
eventLabel: 'min-compile-sdk-version',
);
@visibleForTesting
final GradleHandledError jvm11Required = GradleHandledError(
test: (String line) {
return line.contains('Android Gradle plugin requires Java 11 to run');
},
handler: ({
required String line,
required FlutterProject project,
required bool usesAndroidX,
required bool multidexEnabled,
}) async {
globals.printBox(
'${globals.logger.terminal.warningMark} You need Java 11 or higher to build your app with this version of Gradle.\n\n'
'To get Java 11, update to the latest version of Android Studio on https://developer.android.com/studio/install.\n\n'
'To check the Java version used by Flutter, run `flutter doctor -v`.',
title: _boxTitle,
);
return GradleBuildStatus.exit;
},
eventLabel: 'java11-required',
);
packages/flutter_tools/lib/src/android/gradle_utils.dart
View file @ 5c691893
......@@ -27,8 +27,10 @@ import 'android_sdk.dart';
// For more information about the latest version, check:
// https://developer.android.com/studio/releases/gradle-plugin#updating-gradle
// https://kotlinlang.org/docs/gradle.html#plugin-and-versions
const String templateDefaultGradleVersion = '6.7';
const String templateAndroidGradlePluginVersion = '4.1.0';
const String templateDefaultGradleVersion = '7.4';
const String templateAndroidGradlePluginVersion = '7.1.2';
// TODO(egarciad): Gradle 7 breaks AARs builds: https://github.com/flutter/flutter/issues/101083
const String templateAndroidGradlePluginVersionForModule = '4.1.0';
const String templateKotlinGradlePluginVersion = '1.6.10';
final RegExp _androidPluginRegExp = RegExp(r'com\.android\.tools\.build:gradle:(\d+\.\d+\.\d+)');
......@@ -192,6 +194,9 @@ String getGradleVersionFor(String androidPluginVersion) {
if (_isWithinVersionRange(androidPluginVersion, min: '4.0.0', max: '4.1.0')) {
return '6.7';
}
if (_isWithinVersionRange(androidPluginVersion, min: '7.0', max: '7.4')) {
return '7.4';
}
throwToolExit('Unsupported Android Plugin version: $androidPluginVersion.');
}
......
packages/flutter_tools/lib/src/project.dart
View file @ 5c691893
......@@ -587,6 +587,7 @@ class AndroidProject extends FlutterProjectPlatform {
'androidIdentifier': androidIdentifier,
'androidX': usesAndroidX,
'agpVersion': gradle.templateAndroidGradlePluginVersion,
'agpVersionForModule': gradle.templateAndroidGradlePluginVersionForModule,
'kotlinVersion': gradle.templateKotlinGradlePluginVersion,
'gradleVersion': gradle.templateDefaultGradleVersion,
},
......
packages/flutter_tools/templates/module/android/gradle/build.gradle.tmpl
View file @ 5c691893
......@@ -7,7 +7,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:{{agpVersion}}'
classpath 'com.android.tools.build:gradle:{{agpVersionForModule}}'
}
}
......
packages/flutter_tools/templates/plugin/android-java.tmpl/build.gradle.tmpl
View file @ 5c691893
......@@ -8,7 +8,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:4.1.0'
classpath 'com.android.tools.build:gradle:{{agpVersion}}'
}
}
......
packages/flutter_tools/templates/plugin_ffi/android.tmpl/build.gradle.tmpl
View file @ 5c691893
......@@ -11,7 +11,7 @@ buildscript {
dependencies {
// The Android Gradle Plugin knows how to build native code with the NDK.
classpath 'com.android.tools.build:gradle:4.1.0'
classpath 'com.android.tools.build:gradle:{{agpVersion}}'
}
}
......
packages/flutter_tools/test/general.shard/android/gradle_errors_test.dart
View file @ 5c691893
......@@ -35,6 +35,7 @@ void main() {
multidexErrorHandler,
incompatibleKotlinVersionHandler,
minCompileSdkVersionHandler,
jvm11Required,
])
);
});
......@@ -955,6 +956,49 @@ Execution failed for task ':app:checkDebugAarMetadata'.
ProcessManager: () => FakeProcessManager.empty(),
});
});
group('Java 11 requirement', () {
testWithoutContext('pattern', () {
expect(
jvm11Required.test('''
* What went wrong:
A problem occurred evaluating project ':flutter'.
> Failed to apply plugin 'com.android.internal.library'.
> Android Gradle plugin requires Java 11 to run. You are currently using Java 1.8.
You can try some of the following options:
- changing the IDE settings.
- changing the JAVA_HOME environment variable.
- changing `org.gradle.java.home` in `gradle.properties`.'''
),
isTrue,
);
});
testUsingContext('suggestion', () async {
await jvm11Required.handler();
expect(
testLogger.statusText,
contains(
'\n'
'┌─ Flutter Fix ─────────────────────────────────────────────────────────────────┐\n'
'│ [!] You need Java 11 or higher to build your app with this version of Gradle. │\n'
'│ │\n'
'│ To get Java 11, update to the latest version of Android Studio on │\n'
'│ https://developer.android.com/studio/install. │\n'
'│ │\n'
'│ To check the Java version used by Flutter, run `flutter doctor -v`. │\n'
'└───────────────────────────────────────────────────────────────────────────────┘\n'
)
);
}, overrides: <Type, Generator>{
GradleUtils: () => FakeGradleUtils(),
Platform: () => fakePlatform('android'),
FileSystem: () => MemoryFileSystem.test(),
ProcessManager: () => FakeProcessManager.empty(),
});
});
}
bool formatTestErrorMessage(String errorMessage, GradleHandledError error) {
......
packages/flutter_tools/test/general.shard/android/gradle_find_bundle_test.dart
View file @ 5c691893
......@@ -357,7 +357,7 @@ void main() {
'gradle',
label: 'gradle-expected-file-not-found',
parameters: CustomDimensions.fromMap(<String, String> {
'cd37': 'androidGradlePluginVersion: 6.7, fileExtension: .aab',
'cd37': 'androidGradlePluginVersion: 7.4, fileExtension: .aab',
}),
),
));
......
packages/flutter_tools/test/general.shard/android/gradle_test.dart
View file @ 5c691893
......@@ -445,6 +445,10 @@ flutter:
expect(getGradleVersionFor('4.0.0'), '6.7');
expect(getGradleVersionFor('4.1.0'), '6.7');
expect(getGradleVersionFor('7.0'), '7.4');
expect(getGradleVersionFor('7.1.2'), '7.4');
expect(getGradleVersionFor('7.2'), '7.4');
});
testWithoutContext('throws on unsupported versions', () {
......
packages/flutter_tools/test/general.shard/android/gradle_utils_test.dart
View file @ 5c691893
......@@ -73,7 +73,7 @@ void main() {
'distributionPath=wrapper/dists\n'
'zipStoreBase=GRADLE_USER_HOME\n'
'zipStorePath=wrapper/dists\n'
'distributionUrl=https\\://services.gradle.org/distributions/gradle-6.7-all.zip\n');
'distributionUrl=https\\://services.gradle.org/distributions/gradle-7.4-all.zip\n');
});
testWithoutContext('injects the wrapper when some files are missing', () {
......@@ -110,7 +110,7 @@ void main() {
'distributionPath=wrapper/dists\n'
'zipStoreBase=GRADLE_USER_HOME\n'
'zipStorePath=wrapper/dists\n'
'distributionUrl=https\\://services.gradle.org/distributions/gradle-6.7-all.zip\n');
'distributionUrl=https\\://services.gradle.org/distributions/gradle-7.4-all.zip\n');
});
testWithoutContext('injects the wrapper and the Gradle version is derivated from the AGP version', () {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

HIAST - GitLab