Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade all[most] androidx dependencies to latest #53001

Merged
merged 8 commits into from
May 28, 2024
Merged

Upgrade all[most] androidx dependencies to latest #53001

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift click to select a range
f99b23f
wip of upgrade to all androidx dependencies
May 22, 2024
e6d7186
downgrade lifecycle deps from 2.8.0 to 2.7.0 due to java 21 dexing is…
May 23, 2024
2237b72
DEPS update
May 23, 2024
c0bab8d
undo local changes to android embedding build.gradle
May 23, 2024
1f6bdce
fix random deprecation
May 23, 2024
69fd36c
Merge branch 'main' into androidx_core_1.13
gmackall May 23, 2024
465dba1
Merge remote-tracking branch 'refs/remotes/origin/androidx_core_1.13'…
May 23, 2024
1637f60
whitespace
May 23, 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
Prev Previous commit
Next Next commit
downgrade lifecycle deps from 2.8.0 to 2.7.0 due to java 21 dexing is… 
…sue that wasn't backported to agp <8
  • Loading branch information
Gray Mackall committed May 23, 2024
commit e6d71862af7f7c09d0e8c6ed0faaaf797eda54d1
16 changes: 8 additions & 8 deletions shell/platform/android/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,14 368,14 @@ embedding_dependencies_jars = [
"//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.3.jar",
"//third_party/android_embedding_dependencies/lib/kotlinx-coroutines-core-jvm-1.7.3.jar",
"//third_party/android_embedding_dependencies/lib/lifecycle-common-jvm-2.8.0.jar",
"//third_party/android_embedding_dependencies/lib/lifecycle-common-java8-2.8.0.jar",
"//third_party/android_embedding_dependencies/lib/lifecycle-livedata-2.8.0.jar",
"//third_party/android_embedding_dependencies/lib/lifecycle-livedata-core-2.8.0.jar",
"//third_party/android_embedding_dependencies/lib/lifecycle-runtime-desktop-2.8.0.jar",
"//third_party/android_embedding_dependencies/lib/lifecycle-viewmodel-desktop-2.8.0.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-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.2.1.jar",
"//third_party/android_embedding_dependencies/lib/tracing-1.2.0.jar",
Expand Down
12 changes: 6 additions & 6 deletions tools/androidx/files.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 1,26 @@
[
{
"url": "https://maven.google.com/androidx/lifecycle/lifecycle-common/2.8.0/lifecycle-common-2.8.0.jar",
"url": "https://maven.google.com/androidx/lifecycle/lifecycle-common/2.7.0/lifecycle-common-2.7.0.jar",
"out_file_name": "androidx_lifecycle_common.jar",
"maven_dependency": "androidx.lifecycle:lifecycle-common:2.8.0",
"maven_dependency": "androidx.lifecycle:lifecycle-common:2.7.0",
"provides": [
"androidx.lifecycle.Lifecycle",
"androidx.lifecycle.LifecycleObserver",
"androidx.lifecycle.LifecycleOwner"
]
},
{
"url": "https://maven.google.com/androidx/lifecycle/lifecycle-common-java8/2.8.0/lifecycle-common-java8-2.8.0.jar",
"url": "https://maven.google.com/androidx/lifecycle/lifecycle-common-java8/2.8.0/lifecycle-common-java8-2.7.0.jar",
"out_file_name": "androidx_lifecycle_common_java8.jar",
"maven_dependency": "androidx.lifecycle:lifecycle-common-java8:2.8.0",
"maven_dependency": "androidx.lifecycle:lifecycle-common-java8:2.7.0",
"provides": [
"androidx.lifecycle.DefaultLifecycleObserver"
]
},
{
"url": "https://maven.google.com/androidx/lifecycle/lifecycle-runtime/2.8.0/lifecycle-runtime-2.8.0.aar",
"url": "https://maven.google.com/androidx/lifecycle/lifecycle-runtime/2.8.0/lifecycle-runtime-2.7.0.aar",
"out_file_name": "androidx_lifecycle_runtime.aar",
"maven_dependency": "androidx.lifecycle:lifecycle-runtime:2.8.0",
"maven_dependency": "androidx.lifecycle:lifecycle-runtime:2.7.0",
"provides": [
"androidx.lifecycle.LifecycleRegistry"
]
Expand Down