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

Document dependencies and remove support-v13 #11912

Merged
blasten merged 1 commit into from
Sep 6, 2019
Merged

Document dependencies and remove support-v13 #11912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion shell/platform/android/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,6 @@ action("flutter_shell_java") {
sources += get_target_outputs(":gen_android_build_config_java")

android_support_jars = [
"//third_party/android_support/android_support_v13.jar",
"//third_party/android_support/android_support_compat.jar",
"//third_party/android_support/android_support_annotations.jar",
"//third_party/android_support/android_support_fragment.jar",
Expand Down
47 changes: 35 additions & 12 deletions tools/android_support/files.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,41 +2,64 @@
{
"url": "https://dl.google.com/dl/android/maven2/android/arch/lifecycle/common/1.1.1/common-1.1.1.jar",
"out_file_name": "android_arch_lifecycle_common.jar",
"maven_dependency": "android.arch.lifecycle:common:1.1.1"
"maven_dependency": "android.arch.lifecycle:common:1.1.1",
"provides": [
"android.arch.lifecycle.Lifecycle",
"android.arch.lifecycle.LifecycleObserver",
"android.arch.lifecycle.LifecycleOwner"
]
},
{
"url": "https://dl.google.com/dl/android/maven2/android/arch/lifecycle/common-java8/1.1.1/common-java8-1.1.1.jar",
"out_file_name": "android_arch_lifecycle_common_java8.jar",
"maven_dependency": "android.arch.lifecycle:common-java8:1.1.1"
"maven_dependency": "android.arch.lifecycle:common-java8:1.1.1",
"provides": [
"android.arch.lifecycle.DefaultLifecycleObserver"
]
},
{
"url": "https://dl.google.com/dl/android/maven2/android/arch/lifecycle/runtime/1.1.1/runtime-1.1.1.aar",
"out_file_name": "android_arch_lifecycle_runtime.jar",
"maven_dependency": "android.arch.lifecycle:runtime:1.1.1"
"maven_dependency": "android.arch.lifecycle:runtime:1.1.1",
"provides": [
"android.arch.lifecycle.LifecycleRegistry"
]
},
{
"url": "https://dl.google.com/dl/android/maven2/android/arch/lifecycle/viewmodel/1.1.1/viewmodel-1.1.1.aar",
"out_file_name": "android_arch_lifecycle_viewmodel.jar",
"maven_dependency": "android.arch.lifecycle:viewmodel:1.1.1"
"maven_dependency": "android.arch.lifecycle:viewmodel:1.1.1",
"provides": []
Copy link
Member

@xster xster Sep 6, 2019

Choose a reason for hiding this comment

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

does this mean this can be deleted too?

Copy link
Author

@blasten blasten Sep 6, 2019

Choose a reason for hiding this comment

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

these are still needed to compile the embedding. This is a transitive dependency of support-fragment.

Copy link
Member

@xster xster Sep 6, 2019

Choose a reason for hiding this comment

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

I see, you're saying this ends up in the user's APK either way ultimately?

Copy link
Author

@blasten blasten Sep 7, 2019

Choose a reason for hiding this comment

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

correct. Gradle will bring this dependency anyways.

Copy link
Member

@xster xster Sep 7, 2019

Choose a reason for hiding this comment

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

understood, thanks

},
{
"url": "https://dl.google.com/dl/android/maven2/com/android/support/support-fragment/28.0.0/support-fragment-28.0.0.aar",
"out_file_name": "android_support_fragment.jar",
"maven_dependency": "com.android.support:support-fragment:28.0.0"
},
{
"url": "https://dl.google.com/dl/android/maven2/com/android/support/support-v13/28.0.0/support-v13-28.0.0.aar",
"out_file_name": "android_support_v13.jar",
"maven_dependency": "com.android.support:support-v13:28.0.0"
"maven_dependency": "com.android.support:support-fragment:28.0.0",
"provides": [
"android.support.v4.app.Fragment",
"android.support.v4.app.FragmentActivity"
]
},
{
"url": "https://dl.google.com/dl/android/maven2/com/android/support/support-annotations/28.0.0/support-annotations-28.0.0.jar",
"out_file_name": "android_support_annotations.jar",
"maven_dependency": "com.android.support:support-annotations:28.0.0"
"maven_dependency": "com.android.support:support-annotations:28.0.0",
"provides": [
"android.support.annotation.CallSuper",
"android.support.annotation.FloatRange",
"android.support.annotation.IntDef",
"android.support.annotation.Keep",
"android.support.annotation.NonNull",
"android.support.annotation.Nullable",
"android.support.annotation.RequiresApi",
"android.support.annotation.UiThread",
"android.support.annotation.VisibleForTesting"
]
},
{
"url": "https://dl.google.com/dl/android/maven2/com/android/support/support-compat/28.0.0/support-compat-28.0.0.aar",
"out_file_name": "android_support_compat.jar",
"maven_dependency": "com.android.support:support-compat:28.0.0"
"maven_dependency": "com.android.support:support-compat:28.0.0",
"provides": []
}
]
3 changes: 3 additions & 0 deletions tools/android_support/generate_pom_file.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ def main():
pom_dependencies = ''
if args.include_embedding_dependencies:
for dependency in dependencies:
if not dependency['provides']:
# Don't include transitive dependencies since they aren't used by the embedding.
continue
group_id, artifact_id, version = dependency['maven_dependency'].split(':')
pom_dependencies += POM_DEPENDENCY.format(group_id, artifact_id, version)

Expand Down
1 change: 0 additions & 1 deletion tools/gen_javadoc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ def main():
'third_party/android_support/android_support_annotations.jar',
'third_party/android_support/android_support_compat.jar',
'third_party/android_support/android_support_fragment.jar',
'third_party/android_support/android_support_v13.jar',
'third_party/android_tools/sdk/platforms/android-29/android.jar',
'base/android/java/src',
'third_party/jsr-305/src/ri/src/main/java',
Expand Down