Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 00e72e9

Browse files
authored
Upgrade all[most] androidx dependencies to latest (#53001)
Upgrades every `androidx` dependency in the `src/third_party/android_embedding_dependencies` bundle to the latest version, except the `lifecycle` group*. Tested running a couple of apps as well because when updating these dependencies in the past I've been able to build the engine but then flutter run fail when trying to run an app. Fixes flutter/flutter#129307, also unblocks a feature that will eventually be needed for Scribe. [*]`2.8.0` is the latest there, but I ran into an issue with dexing when I tried to upgrade, due to b/336164417, an AGP bug that had its fix backported to all >`8.0.0` versions, but we still support less than that so we will have to wait on that upgrade. [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
1 parent 2ffbda6 commit 00e72e9

File tree

10 files changed

+54
-430
lines changed

10 files changed

+54
-430
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -785,7 +785,7 @@ deps = {
785785
'packages': [
786786
{
787787
'package': 'flutter/android/embedding_bundle',
788-
'version': 'last_updated:2023-08-11T11:35:44-0700'
788+
'version': 'last_updated:2024-05-23T10:01:05-0700'
789789
}
790790
],
791791
'condition': 'download_android_deps',

shell/platform/android/BUILD.gn

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -353,36 +353,36 @@ android_java_sources = [
353353
]
354354

355355
embedding_dependencies_jars = [
356-
"//third_party/android_embedding_dependencies/lib/activity-1.0.0.jar",
357-
"//third_party/android_embedding_dependencies/lib/annotation-1.2.0.jar",
358-
"//third_party/android_embedding_dependencies/lib/annotation-experimental-1.1.0.jar",
359-
"//third_party/android_embedding_dependencies/lib/annotations-13.0.jar",
356+
"//third_party/android_embedding_dependencies/lib/activity-1.8.1.jar",
357+
"//third_party/android_embedding_dependencies/lib/annotation-jvm-1.8.0.jar",
358+
"//third_party/android_embedding_dependencies/lib/annotation-experimental-1.4.0.jar",
359+
"//third_party/android_embedding_dependencies/lib/annotations-23.0.0.jar",
360360
"//third_party/android_embedding_dependencies/lib/collection-1.1.0.jar",
361-
"//third_party/android_embedding_dependencies/lib/core-1.6.0.jar",
362-
"//third_party/android_embedding_dependencies/lib/core-1.8.0.jar",
363-
"//third_party/android_embedding_dependencies/lib/core-common-2.1.0.jar",
364-
"//third_party/android_embedding_dependencies/lib/core-runtime-2.0.0.jar",
361+
"//third_party/android_embedding_dependencies/lib/core-1.13.1.jar",
362+
"//third_party/android_embedding_dependencies/lib/core-1.10.3.jar",
363+
"//third_party/android_embedding_dependencies/lib/core-common-2.2.0.jar",
364+
"//third_party/android_embedding_dependencies/lib/core-runtime-2.2.0.jar",
365365
"//third_party/android_embedding_dependencies/lib/customview-1.0.0.jar",
366-
"//third_party/android_embedding_dependencies/lib/fragment-1.1.0.jar",
367-
"//third_party/android_embedding_dependencies/lib/kotlin-stdlib-1.5.31.jar",
368-
"//third_party/android_embedding_dependencies/lib/kotlin-stdlib-common-1.5.31.jar",
369-
"//third_party/android_embedding_dependencies/lib/kotlin-stdlib-jdk7-1.5.30.jar",
370-
"//third_party/android_embedding_dependencies/lib/kotlin-stdlib-jdk8-1.5.30.jar",
371-
"//third_party/android_embedding_dependencies/lib/kotlinx-coroutines-android-1.5.2.jar",
372-
"//third_party/android_embedding_dependencies/lib/kotlinx-coroutines-core-jvm-1.5.2.jar",
373-
"//third_party/android_embedding_dependencies/lib/lifecycle-common-2.2.0.jar",
374-
"//third_party/android_embedding_dependencies/lib/lifecycle-common-java8-2.2.0.jar",
375-
"//third_party/android_embedding_dependencies/lib/lifecycle-livedata-2.0.0.jar",
376-
"//third_party/android_embedding_dependencies/lib/lifecycle-livedata-core-2.0.0.jar",
377-
"//third_party/android_embedding_dependencies/lib/lifecycle-runtime-2.2.0.jar",
378-
"//third_party/android_embedding_dependencies/lib/lifecycle-viewmodel-2.1.0.jar",
366+
"//third_party/android_embedding_dependencies/lib/fragment-1.7.1.jar",
367+
"//third_party/android_embedding_dependencies/lib/kotlin-stdlib-1.8.22.jar",
368+
"//third_party/android_embedding_dependencies/lib/kotlin-stdlib-common-1.8.22.jar",
369+
"//third_party/android_embedding_dependencies/lib/kotlin-stdlib-jdk7-1.8.20.jar",
370+
"//third_party/android_embedding_dependencies/lib/kotlin-stdlib-jdk8-1.8.20.jar",
371+
"//third_party/android_embedding_dependencies/lib/kotlinx-coroutines-android-1.7.1.jar",
372+
"//third_party/android_embedding_dependencies/lib/kotlinx-coroutines-core-jvm-1.7.1.jar",
373+
"//third_party/android_embedding_dependencies/lib/lifecycle-common-2.7.0.jar",
374+
"//third_party/android_embedding_dependencies/lib/lifecycle-common-java8-2.7.0.jar",
375+
"//third_party/android_embedding_dependencies/lib/lifecycle-livedata-2.7.0.jar",
376+
"//third_party/android_embedding_dependencies/lib/lifecycle-livedata-core-2.7.0.jar",
377+
"//third_party/android_embedding_dependencies/lib/lifecycle-runtime-2.7.0.jar",
378+
"//third_party/android_embedding_dependencies/lib/lifecycle-viewmodel-2.7.0.jar",
379379
"//third_party/android_embedding_dependencies/lib/loader-1.0.0.jar",
380-
"//third_party/android_embedding_dependencies/lib/savedstate-1.0.0.jar",
381-
"//third_party/android_embedding_dependencies/lib/tracing-1.0.0.jar",
380+
"//third_party/android_embedding_dependencies/lib/savedstate-1.2.1.jar",
381+
"//third_party/android_embedding_dependencies/lib/tracing-1.2.0.jar",
382382
"//third_party/android_embedding_dependencies/lib/versionedparcelable-1.1.1.jar",
383383
"//third_party/android_embedding_dependencies/lib/viewpager-1.0.0.jar",
384-
"//third_party/android_embedding_dependencies/lib/window-1.0.0-beta04.jar",
385-
"//third_party/android_embedding_dependencies/lib/window-java-1.0.0-beta04.jar",
384+
"//third_party/android_embedding_dependencies/lib/window-1.2.0.jar",
385+
"//third_party/android_embedding_dependencies/lib/window-java-1.2.0.jar",
386386
]
387387

388388
action("check_imports") {

shell/platform/android/test/io/flutter/embedding/android/FlutterFragmentTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ public void itDelegatesOnBackPressedAutomaticallyWhenEnabled() {
318318
TestDelegateFactory delegateFactory = new TestDelegateFactory(mockDelegate);
319319
fragment.setDelegateFactory(delegateFactory);
320320

321-
activity.onBackPressed();
321+
activity.getOnBackPressedDispatcher().onBackPressed();
322322

323323
verify(mockDelegate, times(1)).onBackPressed();
324324
}

testing/scenario_app/android/app/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
33

44
android {
5+
namespace = "dev.flutter.scenarios"
56
lintOptions {
67
abortOnError true
78
checkAllWarnings true
@@ -16,7 +17,7 @@ android {
1617
// NewerVersionAvailable and GradleDependency need to be taken care of
1718
// by a roller rather than as part of CI.
1819
// The others are irrelevant for a test application.
19-
disable 'UnpackedNativeCode','MissingApplicationIcon','GoogleAppIndexingApiWarning','GoogleAppIndexingWarning','GradleDependency','NewerVersionAvailable','Registered'
20+
disable 'UnpackedNativeCode','MissingApplicationIcon','GoogleAppIndexingApiWarning','GoogleAppIndexingWarning','GradleDependency','NewerVersionAvailable','Registered', 'ObsoleteLintCustomCheck'
2021
}
2122
buildToolsVersion = '34.0.0'
2223
compileSdkVersion 34

0 commit comments

Comments
 (0)