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

Commit 6884e83

Browse files
authored
Re-re-land "Upgrade all[most] androidx dependencies to latest" (#53532)
Re-re-land #53001 (Reland attempt was at #53462) Unblocked by flutter/flutter#150585, but will still need a manual roll because I will need to re-generate a bunch of lockfiles. Also, https://github.com/flutter/flutter/blob/master/docs/engine/Testing-presubmit-Engine-PRs-with-the-Flutter-framework.md doesn't work (it's blocked on flutter/flutter#149780) so I mostly just have to pray that no new issues occur in the roll. But I believe all issues that came up in the last attempt should be addressed by the above pr and by manual lockfile generation. [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style
1 parent daa525e commit 6884e83

File tree

10 files changed

+58
-433
lines changed

10 files changed

+58
-433
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:2024-06-12T14:15:49-0700'
788+
'version': 'last_updated:2024-06-18T12:13:41-0700'
789789
}
790790
],
791791
'condition': 'download_android_deps',

shell/platform/android/BUILD.gn

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -353,37 +353,37 @@ 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-process-2.2.0.jar",
378-
"//third_party/android_embedding_dependencies/lib/lifecycle-runtime-2.2.0.jar",
379-
"//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-process-2.7.0.jar",
378+
"//third_party/android_embedding_dependencies/lib/lifecycle-runtime-2.7.0.jar",
379+
"//third_party/android_embedding_dependencies/lib/lifecycle-viewmodel-2.7.0.jar",
380380
"//third_party/android_embedding_dependencies/lib/loader-1.0.0.jar",
381-
"//third_party/android_embedding_dependencies/lib/savedstate-1.0.0.jar",
382-
"//third_party/android_embedding_dependencies/lib/tracing-1.0.0.jar",
381+
"//third_party/android_embedding_dependencies/lib/savedstate-1.2.1.jar",
382+
"//third_party/android_embedding_dependencies/lib/tracing-1.2.0.jar",
383383
"//third_party/android_embedding_dependencies/lib/versionedparcelable-1.1.1.jar",
384384
"//third_party/android_embedding_dependencies/lib/viewpager-1.0.0.jar",
385-
"//third_party/android_embedding_dependencies/lib/window-1.0.0-beta04.jar",
386-
"//third_party/android_embedding_dependencies/lib/window-java-1.0.0-beta04.jar",
385+
"//third_party/android_embedding_dependencies/lib/window-1.2.0.jar",
386+
"//third_party/android_embedding_dependencies/lib/window-java-1.2.0.jar",
387387
]
388388

389389
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
@@ -322,7 +322,7 @@ public void itDelegatesOnBackPressedWithSetFrameworkHandlesBack() {
322322

323323
// Calling onBackPressed now will still be handled by Android (the default),
324324
// until setFrameworkHandlesBack is set to true.
325-
activity.onBackPressed();
325+
activity.getOnBackPressedDispatcher().onBackPressed();
326326
verify(mockDelegate, times(0)).onBackPressed();
327327

328328
// Setting setFrameworkHandlesBack to true means the delegate will receive

testing/scenario_app/android/app/build.gradle

Lines changed: 1 addition & 0 deletions
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

0 commit comments

Comments
 (0)