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

Re-re-land "Upgrade all[most] androidx dependencies to latest" #53532

Merged
auto-submit merged 4 commits into from
Jun 24, 2024
Merged

Re-re-land "Upgrade all[most] androidx dependencies to latest" #53532

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ef27c8c
reland androidx upgrade
mackall-work Jun 24, 2024
391d007
Merge branch 'main' into re-re-land-androidx
gmackall Jun 24, 2024
efd333d
remove disabling of ObsoleteLintCustomCheck
mackall-work Jun 24, 2024
4ccbf11
Merge remote-tracking branch 'refs/remotes/origin/re-re-land-androidx…
mackall-work Jun 24, 2024
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
2 changes: 1 addition & 1 deletion DEPS
View file
Open in desktop
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-12T14:15:49-0700'
'version': 'last_updated:2024-06-18T12:13:41-0700'
}
],
'condition': 'download_android_deps',
Expand Down
52 changes: 26 additions & 26 deletions shell/platform/android/BUILD.gn
View file
Open in desktop
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.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/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/collection-1.1.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/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/customview-1.0.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/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/loader-1.0.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/savedstate-1.2.1.jar",
"//third_party/android_embedding_dependencies/lib/tracing-1.2.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.0.0-beta04.jar",
"//third_party/android_embedding_dependencies/lib/window-java-1.0.0-beta04.jar",
"//third_party/android_embedding_dependencies/lib/window-1.2.0.jar",
"//third_party/android_embedding_dependencies/lib/window-java-1.2.0.jar",
]

action("check_imports") {
Expand Down
2 changes: 1 addition & 1 deletion shell/platform/android/test/io/flutter/embedding/android/FlutterFragmentTest.java
View file
Open in desktop
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.onBackPressed();
activity.getOnBackPressedDispatcher().onBackPressed();
verify(mockDelegate, times(0)).onBackPressed();

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

android {
namespace = "dev.flutter.scenarios"
lintOptions {
abortOnError true
checkAllWarnings true
Expand All @@ -16,7 +17,7 @@ android {
// NewerVersionAvailable and GradleDependency need to be taken care of
// by a roller rather than as part of CI.
// The others are irrelevant for a test application.
disable 'UnpackedNativeCode','MissingApplicationIcon','GoogleAppIndexingApiWarning','GoogleAppIndexingWarning','GradleDependency','NewerVersionAvailable','Registered'
disable 'UnpackedNativeCode','MissingApplicationIcon','GoogleAppIndexingApiWarning','GoogleAppIndexingWarning','GradleDependency','NewerVersionAvailable','Registered', 'ObsoleteLintCustomCheck'

@reidbaker reidbaker Jun 24, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Can you add a comment why this was added?

@gmackall gmackall Jun 24, 2024

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Hmm I can't remember at this point, as the original pr was a while ago. I'll try removing.

}
buildToolsVersion = '34.0.0'
compileSdkVersion 34
Expand Down
Loading