Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Changes from 1 commit
Commits
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
Merge remote-tracking branch 'upstream/main' into buildmoot-android-e…
…mbedding-deps
  • Loading branch information
matanlurey committed Jun 29, 2024
commit 516bdf7627e215aaa40470b2e25a331498f48fc6
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 = [
"//flutter/third_party/android_embedding_dependencies/lib/activity-1.0.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/annotation-1.2.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/annotation-experimental-1.1.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/annotations-13.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/activity-1.8.1.jar",
"//flutter/third_party/android_embedding_dependencies/lib/annotation-jvm-1.8.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/annotation-experimental-1.4.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/annotations-23.0.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/collection-1.1.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/core-1.6.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/core-1.8.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/core-common-2.1.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/core-runtime-2.0.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/core-1.13.1.jar",
"//flutter/third_party/android_embedding_dependencies/lib/core-1.10.3.jar",
"//flutter/third_party/android_embedding_dependencies/lib/core-common-2.2.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/core-runtime-2.2.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/customview-1.0.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/fragment-1.1.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/kotlin-stdlib-1.5.31.jar",
"//flutter/third_party/android_embedding_dependencies/lib/kotlin-stdlib-common-1.5.31.jar",
"//flutter/third_party/android_embedding_dependencies/lib/kotlin-stdlib-jdk7-1.5.30.jar",
"//flutter/third_party/android_embedding_dependencies/lib/kotlin-stdlib-jdk8-1.5.30.jar",
"//flutter/third_party/android_embedding_dependencies/lib/kotlinx-coroutines-android-1.5.2.jar",
"//flutter/third_party/android_embedding_dependencies/lib/kotlinx-coroutines-core-jvm-1.5.2.jar",
"//flutter/third_party/android_embedding_dependencies/lib/lifecycle-common-2.2.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/lifecycle-common-java8-2.2.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/lifecycle-livedata-2.0.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/lifecycle-livedata-core-2.0.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/lifecycle-process-2.2.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/lifecycle-runtime-2.2.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/lifecycle-viewmodel-2.1.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/fragment-1.7.1.jar",
"//flutter/third_party/android_embedding_dependencies/lib/kotlin-stdlib-1.8.22.jar",
"//flutter/third_party/android_embedding_dependencies/lib/kotlin-stdlib-common-1.8.22.jar",
"//flutter/third_party/android_embedding_dependencies/lib/kotlin-stdlib-jdk7-1.8.20.jar",
"//flutter/third_party/android_embedding_dependencies/lib/kotlin-stdlib-jdk8-1.8.20.jar",
"//flutter/third_party/android_embedding_dependencies/lib/kotlinx-coroutines-android-1.7.1.jar",
"//flutter/third_party/android_embedding_dependencies/lib/kotlinx-coroutines-core-jvm-1.7.1.jar",
"//flutter/third_party/android_embedding_dependencies/lib/lifecycle-common-2.7.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/lifecycle-common-java8-2.7.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/lifecycle-livedata-2.7.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/lifecycle-livedata-core-2.7.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/lifecycle-process-2.7.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/lifecycle-runtime-2.7.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/lifecycle-viewmodel-2.7.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/loader-1.0.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/savedstate-1.0.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/tracing-1.0.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/savedstate-1.2.1.jar",
"//flutter/third_party/android_embedding_dependencies/lib/tracing-1.2.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/versionedparcelable-1.1.1.jar",
"//flutter/third_party/android_embedding_dependencies/lib/viewpager-1.0.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/window-1.0.0-beta04.jar",
"//flutter/third_party/android_embedding_dependencies/lib/window-java-1.0.0-beta04.jar",
"//flutter/third_party/android_embedding_dependencies/lib/window-1.2.0.jar",
"//flutter/third_party/android_embedding_dependencies/lib/window-java-1.2.0.jar",
]

action("check_imports") {
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.