Skip to content

Commit

Permalink
Reverts "Re-re-land "Upgrade all[most] androidx dependencies to lates…
Browse files Browse the repository at this point in the history
…t" (flutter#53532)" (flutter#53546)

Reverts: flutter#53532
Initiated by: gmackall
Reason for reverting: This breaks apps that use plugins that use compileSdk 31, some of which we use in our postsubmit (so it blocks the tree).
Original PR Author: gmackall

Reviewed By: {reidbaker, matanlurey}

This change reverts the following previous change:
Re-re-land flutter#53001

(Reland attempt was at flutter#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
  • Loading branch information
auto-submit[bot] authored Jun 25, 2024
1 parent 6991653 commit a07ba90
Show file tree
Hide file tree
Showing 10 changed files with 433 additions and 58 deletions.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -785,7 +785,7 @@ deps = {
'packages': [
{
'package': 'flutter/android/embedding_bundle',
'version': 'last_updated:2024-06-18T12:13:41-0700'
'version': 'last_updated:2024-06-12T14:15:49-0700'
}
],
'condition': 'download_android_deps',
Expand Down
52 changes: 26 additions & 26 deletions shell/platform/android/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -353,37 +353,37 @@ android_java_sources = [
]

embedding_dependencies_jars = [
"//third_party/android_embedding_dependencies/lib/activity-1.8.1.jar",
"//third_party/android_embedding_dependencies/lib/annotation-jvm-1.8.0.jar",
"//third_party/android_embedding_dependencies/lib/annotation-experimental-1.4.0.jar",
"//third_party/android_embedding_dependencies/lib/annotations-23.0.0.jar",
"//third_party/android_embedding_dependencies/lib/activity-1.0.0.jar",
"//third_party/android_embedding_dependencies/lib/annotation-1.2.0.jar",
"//third_party/android_embedding_dependencies/lib/annotation-experimental-1.1.0.jar",
"//third_party/android_embedding_dependencies/lib/annotations-13.0.jar",
"//third_party/android_embedding_dependencies/lib/collection-1.1.0.jar",
"//third_party/android_embedding_dependencies/lib/core-1.13.1.jar",
"//third_party/android_embedding_dependencies/lib/core-1.10.3.jar",
"//third_party/android_embedding_dependencies/lib/core-common-2.2.0.jar",
"//third_party/android_embedding_dependencies/lib/core-runtime-2.2.0.jar",
"//third_party/android_embedding_dependencies/lib/core-1.6.0.jar",
"//third_party/android_embedding_dependencies/lib/core-1.8.0.jar",
"//third_party/android_embedding_dependencies/lib/core-common-2.1.0.jar",
"//third_party/android_embedding_dependencies/lib/core-runtime-2.0.0.jar",
"//third_party/android_embedding_dependencies/lib/customview-1.0.0.jar",
"//third_party/android_embedding_dependencies/lib/fragment-1.7.1.jar",
"//third_party/android_embedding_dependencies/lib/kotlin-stdlib-1.8.22.jar",
"//third_party/android_embedding_dependencies/lib/kotlin-stdlib-common-1.8.22.jar",
"//third_party/android_embedding_dependencies/lib/kotlin-stdlib-jdk7-1.8.20.jar",
"//third_party/android_embedding_dependencies/lib/kotlin-stdlib-jdk8-1.8.20.jar",
"//third_party/android_embedding_dependencies/lib/kotlinx-coroutines-android-1.7.1.jar",
"//third_party/android_embedding_dependencies/lib/kotlinx-coroutines-core-jvm-1.7.1.jar",
"//third_party/android_embedding_dependencies/lib/lifecycle-common-2.7.0.jar",
"//third_party/android_embedding_dependencies/lib/lifecycle-common-java8-2.7.0.jar",
"//third_party/android_embedding_dependencies/lib/lifecycle-livedata-2.7.0.jar",
"//third_party/android_embedding_dependencies/lib/lifecycle-livedata-core-2.7.0.jar",
"//third_party/android_embedding_dependencies/lib/lifecycle-process-2.7.0.jar",
"//third_party/android_embedding_dependencies/lib/lifecycle-runtime-2.7.0.jar",
"//third_party/android_embedding_dependencies/lib/lifecycle-viewmodel-2.7.0.jar",
"//third_party/android_embedding_dependencies/lib/fragment-1.1.0.jar",
"//third_party/android_embedding_dependencies/lib/kotlin-stdlib-1.5.31.jar",
"//third_party/android_embedding_dependencies/lib/kotlin-stdlib-common-1.5.31.jar",
"//third_party/android_embedding_dependencies/lib/kotlin-stdlib-jdk7-1.5.30.jar",
"//third_party/android_embedding_dependencies/lib/kotlin-stdlib-jdk8-1.5.30.jar",
"//third_party/android_embedding_dependencies/lib/kotlinx-coroutines-android-1.5.2.jar",
"//third_party/android_embedding_dependencies/lib/kotlinx-coroutines-core-jvm-1.5.2.jar",
"//third_party/android_embedding_dependencies/lib/lifecycle-common-2.2.0.jar",
"//third_party/android_embedding_dependencies/lib/lifecycle-common-java8-2.2.0.jar",
"//third_party/android_embedding_dependencies/lib/lifecycle-livedata-2.0.0.jar",
"//third_party/android_embedding_dependencies/lib/lifecycle-livedata-core-2.0.0.jar",
"//third_party/android_embedding_dependencies/lib/lifecycle-process-2.2.0.jar",
"//third_party/android_embedding_dependencies/lib/lifecycle-runtime-2.2.0.jar",
"//third_party/android_embedding_dependencies/lib/lifecycle-viewmodel-2.1.0.jar",
"//third_party/android_embedding_dependencies/lib/loader-1.0.0.jar",
"//third_party/android_embedding_dependencies/lib/savedstate-1.2.1.jar",
"//third_party/android_embedding_dependencies/lib/tracing-1.2.0.jar",
"//third_party/android_embedding_dependencies/lib/savedstate-1.0.0.jar",
"//third_party/android_embedding_dependencies/lib/tracing-1.0.0.jar",
"//third_party/android_embedding_dependencies/lib/versionedparcelable-1.1.1.jar",
"//third_party/android_embedding_dependencies/lib/viewpager-1.0.0.jar",
"//third_party/android_embedding_dependencies/lib/window-1.2.0.jar",
"//third_party/android_embedding_dependencies/lib/window-java-1.2.0.jar",
"//third_party/android_embedding_dependencies/lib/window-1.0.0-beta04.jar",
"//third_party/android_embedding_dependencies/lib/window-java-1.0.0-beta04.jar",
]

action("check_imports") {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ public void itDelegatesOnBackPressedWithSetFrameworkHandlesBack() {

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

// Setting setFrameworkHandlesBack to true means the delegate will receive
Expand Down
1 change: 0 additions & 1 deletion testing/scenario_app/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'

android {
namespace = "dev.flutter.scenarios"
lintOptions {
abortOnError true
checkAllWarnings true
Expand Down
Loading

0 comments on commit a07ba90

Please sign in to comment.