This repository was archived by the owner on Feb 25, 2025. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 6k
Upgrade Android SDK to 34 "UpsideDownCake" #47609
Merged
Merged
Changes from 9 commits
Commits
Show all changes
33 commits
Select commit
Hold shift + click to select a range
ddfd6be
Test pointing at my fork before landing that change
gmackall e702da6
Update test_runner build.gradle to use minsdk 19 and compilesdk 34
gmackall af88787
Update build.gradle
gmackall a7b56ab
Update build.gradle
gmackall c0f4955
Update main.dart
gmackall 5a8a8fe
Update project.xml
gmackall d5ea6e8
Update packages.txt
gmackall 3df6f17
Update build.gradle
gmackall 17da919
Update gen_javadoc.py
gmackall ca10998
Merge branch 'main' into upgrade_to_android14
gmackall 2821a43
Merge branch 'main' into upgrade_to_android14
gmackall d6aebb6
Merge branch 'main' into upgrade_to_android14
gmackall f3f3eee
Merge branch 'main' into upgrade_to_android14
gmackall 8d3a65f
Update DEPS
gmackall 1f6123f
Update DEPS
gmackall 6a8b646
Update DEPS
gmackall af3ce86
Try undoing to isolate where failure is coming from
gmackall 4c37722
revert back
gmackall 971a6cf
Point towards newest commit in the buildroot repo
gmackall 9eb714e
34v2->34v3
gmackall 231f261
stop testing jelly_bean
7a2dbba
Merge remote-tracking branch 'refs/remotes/origin/upgrade_to_android1…
0473938
undo change to cipd package creation script
286489c
some missed jelly_bean tests
7cc375b
try out java 17 on a whim
910eef6
do as the linter commands
2a87a97
yield to the bots round 2 (do as the formatter commands)
994cf9d
format
0ba27dd
catch error and initialize to null
38556e2
format
18bc650
undo change to close file descriptor and remake baseline
a6765b4
format
c0043e8
Update DEPS
gmackall File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -73,7 +73,7 @@ Future<int> runLint(ArgParser argParser, ArgResults argResults) async { | |
| <!-- WILL AUTOMATICALLY FIND ALL .java FILES AND INCLUDE THEM HERE --> | ||
| <project> | ||
| <sdk dir="${androidSdkDir.path}" /> | ||
| <module name="FlutterEngine" android="true" library="true" compile-sdk-version="android-T"> | ||
| <module name="FlutterEngine" android="true" library="true" compile-sdk-version="android-U"> | ||
|
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
| <manifest file="${path.join(androidDir.path, 'AndroidManifest.xml')}" /> | ||
| '''); | ||
| for (final FileSystemEntity entity in androidDir.listSync(recursive: true)) { | ||
|
|
@@ -95,7 +95,7 @@ Future<int> runLint(ArgParser argParser, ArgResults argResults) async { | |
| final List<String> lintArgs = <String>[ | ||
| path.join(androidSdkDir.path, 'cmdline-tools', 'latest', 'bin', 'lint'), | ||
| '--project', projectXmlPath, | ||
| '--compile-sdk-version', '33', | ||
| '--compile-sdk-version', '34', | ||
| '--showall', | ||
| '--exitcode', // Set non-zero exit code on errors | ||
| '-Wall', | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| platforms;android-33:platforms | ||
| platforms;android-34:platforms | ||
| cmdline-tools;latest:cmdline-tools | ||
| build-tools;33.0.0:build-tools | ||
| build-tools;34.0.0:build-tools | ||
| platform-tools:platform-tools | ||
| tools:tools | ||
| ndk;22.1.7171670:ndk | ||
| ndk;22.1.7171670:ndk |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.