Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
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 Nov 2, 2023
e702da6
Update test_runner build.gradle to use minsdk 19 and compilesdk 34
gmackall Nov 2, 2023
af88787
Update build.gradle
gmackall Nov 2, 2023
a7b56ab
Update build.gradle
gmackall Nov 2, 2023
c0f4955
Update main.dart
gmackall Nov 2, 2023
5a8a8fe
Update project.xml
gmackall Nov 2, 2023
d5ea6e8
Update packages.txt
gmackall Nov 2, 2023
3df6f17
Update build.gradle
gmackall Nov 2, 2023
17da919
Update gen_javadoc.py
gmackall Nov 2, 2023
ca10998
Merge branch 'main' into upgrade_to_android14
gmackall Nov 2, 2023
2821a43
Merge branch 'main' into upgrade_to_android14
gmackall Nov 2, 2023
d6aebb6
Merge branch 'main' into upgrade_to_android14
gmackall Nov 2, 2023
f3f3eee
Merge branch 'main' into upgrade_to_android14
gmackall Nov 2, 2023
8d3a65f
Update DEPS
gmackall Nov 2, 2023
1f6123f
Update DEPS
gmackall Nov 2, 2023
6a8b646
Update DEPS
gmackall Nov 2, 2023
af3ce86
Try undoing to isolate where failure is coming from
gmackall Nov 3, 2023
4c37722
revert back
gmackall Nov 6, 2023
971a6cf
Point towards newest commit in the buildroot repo
gmackall Nov 6, 2023
9eb714e
34v2->34v3
gmackall Nov 7, 2023
231f261
stop testing jelly_bean
Nov 7, 2023
7a2dbba
Merge remote-tracking branch 'refs/remotes/origin/upgrade_to_android1…
Nov 7, 2023
0473938
undo change to cipd package creation script
Nov 7, 2023
286489c
some missed jelly_bean tests
Nov 7, 2023
7cc375b
try out java 17 on a whim
Nov 7, 2023
910eef6
do as the linter commands
Nov 8, 2023
2a87a97
yield to the bots round 2 (do as the formatter commands)
Nov 8, 2023
994cf9d
format
Nov 8, 2023
0ba27dd
catch error and initialize to null
Nov 8, 2023
38556e2
format
Nov 8, 2023
18bc650
undo change to close file descriptor and remake baseline
Nov 8, 2023
a6765b4
format
Nov 8, 2023
c0043e8
Update DEPS
gmackall Nov 8, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ allowed_hosts = [
]

deps = {
'src': 'https://github.com/flutter/buildroot.git' + '@' + '5ced4367fee2721f6eda34802dc28b1335637c63',
'src': 'https://github.com/gmackall/buildroot.git' + '@' + '302769cc2f56a0898ce67274ac8543c8b80e5d9a',

'src/flutter/third_party/rapidjson':
Var('fuchsia_git') + '/third_party/rapidjson' + '@' + 'ef3564c5c8824989393b87df25355baf35ff544b',
Expand Down Expand Up @@ -719,7 +719,7 @@ deps = {
'packages': [
{
'package': 'flutter/android/sdk/all/${{platform}}',
'version': 'version:33v6'
'version': 'version:34v2'
}
],
'condition': 'download_android_deps',
Expand Down
4 changes: 2 additions & 2 deletions shell/platform/android/test_runner/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ println "AVAILABLE PROCESSORS: $availableProcessors"
println "=========================================="

android {
compileSdkVersion 33
compileSdkVersion 34

defaultConfig {
minSdkVersion 16
minSdkVersion 19
}

compileOptions {
Expand Down
8 changes: 4 additions & 4 deletions testing/android_background_image/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@ android {
// The others are irrelevant for a test application.
disable 'UnpackedNativeCode','MissingApplicationIcon','GoogleAppIndexingApiWarning','GoogleAppIndexingWarning','GradleDependency','NewerVersionAvailable'
}
buildToolsVersion = '33.0.0'
compileSdkVersion 33
buildToolsVersion = '34.0.0'
compileSdkVersion 34
compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
defaultConfig {
applicationId 'dev.flutter.android_background_image'
minSdkVersion 16
targetSdkVersion 33
minSdkVersion 19
targetSdkVersion 34
versionCode 1
versionName '1.0'
}
Expand Down
8 changes: 4 additions & 4 deletions testing/scenario_app/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ android {
// The others are irrelevant for a test application.
disable 'UnpackedNativeCode','MissingApplicationIcon','GoogleAppIndexingApiWarning','GoogleAppIndexingWarning','GradleDependency','NewerVersionAvailable','Registered'
}
buildToolsVersion = '33.0.0'
compileSdkVersion 33
buildToolsVersion = '34.0.0'
compileSdkVersion 34
compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
defaultConfig {
applicationId 'dev.flutter.scenarios'
minSdkVersion 18
targetSdkVersion 33
minSdkVersion 19
targetSdkVersion 34
versionCode 1
versionName '1.0'
testInstrumentationRunner 'dev.flutter.TestRunner'
Expand Down
4 changes: 2 additions & 2 deletions tools/android_lint/bin/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Copy link
Member Author

Choose a reason for hiding this comment

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

android-U is a guess here. I'm assuming the format is just first letter of the version name, but I can't find documentation

<manifest file="${path.join(androidDir.path, 'AndroidManifest.xml')}" />
''');
for (final FileSystemEntity entity in androidDir.listSync(recursive: true)) {
Expand All @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion tools/android_lint/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- WILL AUTOMATICALLY FIND ALL .java FILES AND INCLUDE THEM HERE -->
<project>
<sdk dir="../../../third_party/android_tools/sdk" />
<module name="FlutterEngine" android="true" library="true" compile-sdk-version="android-T">
<module name="FlutterEngine" android="true" library="true" compile-sdk-version="android-U">
<manifest file="../../../flutter/shell/platform/android/AndroidManifest.xml" />
<src file="../../../flutter/shell/platform/android/test/io/flutter/util/KeyCodes.java" />
<src file="../../../flutter/shell/platform/android/test/io/flutter/util/FakeKeyEvent.java" />
Expand Down
6 changes: 3 additions & 3 deletions tools/android_sdk/packages.txt
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
2 changes: 1 addition & 1 deletion tools/cipd/android_embedding_bundle/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ allprojects {
apply plugin: "com.android.application"

android {
compileSdkVersion 33
compileSdkVersion 34
}

configurations {
Expand Down
2 changes: 1 addition & 1 deletion tools/javadoc/gen_javadoc.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def main():
classpath = [
args.android_source_root,
os.path.join(
args.third_party, 'android_tools/sdk/platforms/android-33/android.jar'
args.third_party, 'android_tools/sdk/platforms/android-34/android.jar'
),
os.path.join(
args.third_party, 'android_embedding_dependencies', 'lib', '*'
Expand Down