From 0bccce6260a1b9b1b77a07face513c0f1a69f97f Mon Sep 17 00:00:00 2001 From: Emmanuel Garcia Date: Tue, 1 Jun 2021 13:19:03 -0700 Subject: [PATCH] [gradle] Unlock all configurations if a local engine is used (#83635) --- dev/benchmarks/complex_layout/android/build.gradle | 4 +++- dev/benchmarks/macrobenchmarks/android/build.gradle | 4 +++- dev/benchmarks/platform_views_layout/android/build.gradle | 4 +++- .../android/build.gradle | 4 +++- dev/benchmarks/test_apps/stocks/android/build.gradle | 4 +++- .../abstract_method_smoke_test/android/build.gradle | 4 +++- .../android_embedding_v2_smoke_test/android/build.gradle | 4 +++- .../android_semantics_testing/android/build.gradle | 4 +++- dev/integration_tests/android_views/android/build.gradle | 4 +++- dev/integration_tests/channels/android/build.gradle | 4 +++- dev/integration_tests/external_ui/android/build.gradle | 4 +++- dev/integration_tests/flavors/android/build.gradle | 4 +++- dev/integration_tests/flutter_gallery/android/build.gradle | 4 +++- .../gradle_deprecated_settings/android/build.gradle | 4 +++- .../hybrid_android_views/android/build.gradle | 4 +++- dev/integration_tests/non_nullable/android/build.gradle | 4 +++- .../platform_interaction/android/build.gradle | 4 +++- dev/integration_tests/release_smoke_test/android/build.gradle | 4 +++- dev/integration_tests/ui/android/build.gradle | 4 +++- dev/manual_tests/android/build.gradle | 4 +++- dev/tools/bin/generate_gradle_lockfiles.dart | 4 +++- examples/flutter_view/android/build.gradle | 4 +++- examples/hello_world/android/build.gradle | 4 +++- examples/image_list/android/build.gradle | 4 +++- examples/layers/android/build.gradle | 4 +++- examples/platform_channel/android/build.gradle | 4 +++- examples/platform_view/android/build.gradle | 4 +++- packages/integration_test/example/android/build.gradle | 4 +++- 28 files changed, 84 insertions(+), 28 deletions(-) diff --git a/dev/benchmarks/complex_layout/android/build.gradle b/dev/benchmarks/complex_layout/android/build.gradle index 734b31571ef..f7ec09745ff 100644 --- a/dev/benchmarks/complex_layout/android/build.gradle +++ b/dev/benchmarks/complex_layout/android/build.gradle @@ -39,7 +39,9 @@ subprojects { dependencyLocking { ignoredDependencies.add('io.flutter:*') lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile") - lockAllConfigurations() + if (!project.hasProperty('local-engine-repo')) { + lockAllConfigurations() + } } } diff --git a/dev/benchmarks/macrobenchmarks/android/build.gradle b/dev/benchmarks/macrobenchmarks/android/build.gradle index 734b31571ef..f7ec09745ff 100644 --- a/dev/benchmarks/macrobenchmarks/android/build.gradle +++ b/dev/benchmarks/macrobenchmarks/android/build.gradle @@ -39,7 +39,9 @@ subprojects { dependencyLocking { ignoredDependencies.add('io.flutter:*') lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile") - lockAllConfigurations() + if (!project.hasProperty('local-engine-repo')) { + lockAllConfigurations() + } } } diff --git a/dev/benchmarks/platform_views_layout/android/build.gradle b/dev/benchmarks/platform_views_layout/android/build.gradle index 734b31571ef..f7ec09745ff 100644 --- a/dev/benchmarks/platform_views_layout/android/build.gradle +++ b/dev/benchmarks/platform_views_layout/android/build.gradle @@ -39,7 +39,9 @@ subprojects { dependencyLocking { ignoredDependencies.add('io.flutter:*') lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile") - lockAllConfigurations() + if (!project.hasProperty('local-engine-repo')) { + lockAllConfigurations() + } } } diff --git a/dev/benchmarks/platform_views_layout_hybrid_composition/android/build.gradle b/dev/benchmarks/platform_views_layout_hybrid_composition/android/build.gradle index 734b31571ef..f7ec09745ff 100644 --- a/dev/benchmarks/platform_views_layout_hybrid_composition/android/build.gradle +++ b/dev/benchmarks/platform_views_layout_hybrid_composition/android/build.gradle @@ -39,7 +39,9 @@ subprojects { dependencyLocking { ignoredDependencies.add('io.flutter:*') lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile") - lockAllConfigurations() + if (!project.hasProperty('local-engine-repo')) { + lockAllConfigurations() + } } } diff --git a/dev/benchmarks/test_apps/stocks/android/build.gradle b/dev/benchmarks/test_apps/stocks/android/build.gradle index 734b31571ef..f7ec09745ff 100644 --- a/dev/benchmarks/test_apps/stocks/android/build.gradle +++ b/dev/benchmarks/test_apps/stocks/android/build.gradle @@ -39,7 +39,9 @@ subprojects { dependencyLocking { ignoredDependencies.add('io.flutter:*') lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile") - lockAllConfigurations() + if (!project.hasProperty('local-engine-repo')) { + lockAllConfigurations() + } } } diff --git a/dev/integration_tests/abstract_method_smoke_test/android/build.gradle b/dev/integration_tests/abstract_method_smoke_test/android/build.gradle index 734b31571ef..f7ec09745ff 100644 --- a/dev/integration_tests/abstract_method_smoke_test/android/build.gradle +++ b/dev/integration_tests/abstract_method_smoke_test/android/build.gradle @@ -39,7 +39,9 @@ subprojects { dependencyLocking { ignoredDependencies.add('io.flutter:*') lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile") - lockAllConfigurations() + if (!project.hasProperty('local-engine-repo')) { + lockAllConfigurations() + } } } diff --git a/dev/integration_tests/android_embedding_v2_smoke_test/android/build.gradle b/dev/integration_tests/android_embedding_v2_smoke_test/android/build.gradle index 734b31571ef..f7ec09745ff 100644 --- a/dev/integration_tests/android_embedding_v2_smoke_test/android/build.gradle +++ b/dev/integration_tests/android_embedding_v2_smoke_test/android/build.gradle @@ -39,7 +39,9 @@ subprojects { dependencyLocking { ignoredDependencies.add('io.flutter:*') lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile") - lockAllConfigurations() + if (!project.hasProperty('local-engine-repo')) { + lockAllConfigurations() + } } } diff --git a/dev/integration_tests/android_semantics_testing/android/build.gradle b/dev/integration_tests/android_semantics_testing/android/build.gradle index 734b31571ef..f7ec09745ff 100644 --- a/dev/integration_tests/android_semantics_testing/android/build.gradle +++ b/dev/integration_tests/android_semantics_testing/android/build.gradle @@ -39,7 +39,9 @@ subprojects { dependencyLocking { ignoredDependencies.add('io.flutter:*') lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile") - lockAllConfigurations() + if (!project.hasProperty('local-engine-repo')) { + lockAllConfigurations() + } } } diff --git a/dev/integration_tests/android_views/android/build.gradle b/dev/integration_tests/android_views/android/build.gradle index 734b31571ef..f7ec09745ff 100644 --- a/dev/integration_tests/android_views/android/build.gradle +++ b/dev/integration_tests/android_views/android/build.gradle @@ -39,7 +39,9 @@ subprojects { dependencyLocking { ignoredDependencies.add('io.flutter:*') lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile") - lockAllConfigurations() + if (!project.hasProperty('local-engine-repo')) { + lockAllConfigurations() + } } } diff --git a/dev/integration_tests/channels/android/build.gradle b/dev/integration_tests/channels/android/build.gradle index 734b31571ef..f7ec09745ff 100644 --- a/dev/integration_tests/channels/android/build.gradle +++ b/dev/integration_tests/channels/android/build.gradle @@ -39,7 +39,9 @@ subprojects { dependencyLocking { ignoredDependencies.add('io.flutter:*') lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile") - lockAllConfigurations() + if (!project.hasProperty('local-engine-repo')) { + lockAllConfigurations() + } } } diff --git a/dev/integration_tests/external_ui/android/build.gradle b/dev/integration_tests/external_ui/android/build.gradle index 734b31571ef..f7ec09745ff 100644 --- a/dev/integration_tests/external_ui/android/build.gradle +++ b/dev/integration_tests/external_ui/android/build.gradle @@ -39,7 +39,9 @@ subprojects { dependencyLocking { ignoredDependencies.add('io.flutter:*') lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile") - lockAllConfigurations() + if (!project.hasProperty('local-engine-repo')) { + lockAllConfigurations() + } } } diff --git a/dev/integration_tests/flavors/android/build.gradle b/dev/integration_tests/flavors/android/build.gradle index 734b31571ef..f7ec09745ff 100644 --- a/dev/integration_tests/flavors/android/build.gradle +++ b/dev/integration_tests/flavors/android/build.gradle @@ -39,7 +39,9 @@ subprojects { dependencyLocking { ignoredDependencies.add('io.flutter:*') lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile") - lockAllConfigurations() + if (!project.hasProperty('local-engine-repo')) { + lockAllConfigurations() + } } } diff --git a/dev/integration_tests/flutter_gallery/android/build.gradle b/dev/integration_tests/flutter_gallery/android/build.gradle index 734b31571ef..f7ec09745ff 100644 --- a/dev/integration_tests/flutter_gallery/android/build.gradle +++ b/dev/integration_tests/flutter_gallery/android/build.gradle @@ -39,7 +39,9 @@ subprojects { dependencyLocking { ignoredDependencies.add('io.flutter:*') lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile") - lockAllConfigurations() + if (!project.hasProperty('local-engine-repo')) { + lockAllConfigurations() + } } } diff --git a/dev/integration_tests/gradle_deprecated_settings/android/build.gradle b/dev/integration_tests/gradle_deprecated_settings/android/build.gradle index 734b31571ef..f7ec09745ff 100644 --- a/dev/integration_tests/gradle_deprecated_settings/android/build.gradle +++ b/dev/integration_tests/gradle_deprecated_settings/android/build.gradle @@ -39,7 +39,9 @@ subprojects { dependencyLocking { ignoredDependencies.add('io.flutter:*') lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile") - lockAllConfigurations() + if (!project.hasProperty('local-engine-repo')) { + lockAllConfigurations() + } } } diff --git a/dev/integration_tests/hybrid_android_views/android/build.gradle b/dev/integration_tests/hybrid_android_views/android/build.gradle index 734b31571ef..f7ec09745ff 100644 --- a/dev/integration_tests/hybrid_android_views/android/build.gradle +++ b/dev/integration_tests/hybrid_android_views/android/build.gradle @@ -39,7 +39,9 @@ subprojects { dependencyLocking { ignoredDependencies.add('io.flutter:*') lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile") - lockAllConfigurations() + if (!project.hasProperty('local-engine-repo')) { + lockAllConfigurations() + } } } diff --git a/dev/integration_tests/non_nullable/android/build.gradle b/dev/integration_tests/non_nullable/android/build.gradle index 734b31571ef..f7ec09745ff 100644 --- a/dev/integration_tests/non_nullable/android/build.gradle +++ b/dev/integration_tests/non_nullable/android/build.gradle @@ -39,7 +39,9 @@ subprojects { dependencyLocking { ignoredDependencies.add('io.flutter:*') lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile") - lockAllConfigurations() + if (!project.hasProperty('local-engine-repo')) { + lockAllConfigurations() + } } } diff --git a/dev/integration_tests/platform_interaction/android/build.gradle b/dev/integration_tests/platform_interaction/android/build.gradle index 734b31571ef..f7ec09745ff 100644 --- a/dev/integration_tests/platform_interaction/android/build.gradle +++ b/dev/integration_tests/platform_interaction/android/build.gradle @@ -39,7 +39,9 @@ subprojects { dependencyLocking { ignoredDependencies.add('io.flutter:*') lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile") - lockAllConfigurations() + if (!project.hasProperty('local-engine-repo')) { + lockAllConfigurations() + } } } diff --git a/dev/integration_tests/release_smoke_test/android/build.gradle b/dev/integration_tests/release_smoke_test/android/build.gradle index 734b31571ef..f7ec09745ff 100644 --- a/dev/integration_tests/release_smoke_test/android/build.gradle +++ b/dev/integration_tests/release_smoke_test/android/build.gradle @@ -39,7 +39,9 @@ subprojects { dependencyLocking { ignoredDependencies.add('io.flutter:*') lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile") - lockAllConfigurations() + if (!project.hasProperty('local-engine-repo')) { + lockAllConfigurations() + } } } diff --git a/dev/integration_tests/ui/android/build.gradle b/dev/integration_tests/ui/android/build.gradle index 734b31571ef..f7ec09745ff 100644 --- a/dev/integration_tests/ui/android/build.gradle +++ b/dev/integration_tests/ui/android/build.gradle @@ -39,7 +39,9 @@ subprojects { dependencyLocking { ignoredDependencies.add('io.flutter:*') lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile") - lockAllConfigurations() + if (!project.hasProperty('local-engine-repo')) { + lockAllConfigurations() + } } } diff --git a/dev/manual_tests/android/build.gradle b/dev/manual_tests/android/build.gradle index 734b31571ef..f7ec09745ff 100644 --- a/dev/manual_tests/android/build.gradle +++ b/dev/manual_tests/android/build.gradle @@ -39,7 +39,9 @@ subprojects { dependencyLocking { ignoredDependencies.add('io.flutter:*') lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile") - lockAllConfigurations() + if (!project.hasProperty('local-engine-repo')) { + lockAllConfigurations() + } } } diff --git a/dev/tools/bin/generate_gradle_lockfiles.dart b/dev/tools/bin/generate_gradle_lockfiles.dart index c3cb95c195c..e642621343e 100644 --- a/dev/tools/bin/generate_gradle_lockfiles.dart +++ b/dev/tools/bin/generate_gradle_lockfiles.dart @@ -161,7 +161,9 @@ subprojects { dependencyLocking { ignoredDependencies.add('io.flutter:*') lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile") - lockAllConfigurations() + if (!project.hasProperty('local-engine-repo')) { + lockAllConfigurations() + } } } diff --git a/examples/flutter_view/android/build.gradle b/examples/flutter_view/android/build.gradle index 734b31571ef..f7ec09745ff 100644 --- a/examples/flutter_view/android/build.gradle +++ b/examples/flutter_view/android/build.gradle @@ -39,7 +39,9 @@ subprojects { dependencyLocking { ignoredDependencies.add('io.flutter:*') lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile") - lockAllConfigurations() + if (!project.hasProperty('local-engine-repo')) { + lockAllConfigurations() + } } } diff --git a/examples/hello_world/android/build.gradle b/examples/hello_world/android/build.gradle index 734b31571ef..f7ec09745ff 100644 --- a/examples/hello_world/android/build.gradle +++ b/examples/hello_world/android/build.gradle @@ -39,7 +39,9 @@ subprojects { dependencyLocking { ignoredDependencies.add('io.flutter:*') lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile") - lockAllConfigurations() + if (!project.hasProperty('local-engine-repo')) { + lockAllConfigurations() + } } } diff --git a/examples/image_list/android/build.gradle b/examples/image_list/android/build.gradle index 734b31571ef..f7ec09745ff 100644 --- a/examples/image_list/android/build.gradle +++ b/examples/image_list/android/build.gradle @@ -39,7 +39,9 @@ subprojects { dependencyLocking { ignoredDependencies.add('io.flutter:*') lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile") - lockAllConfigurations() + if (!project.hasProperty('local-engine-repo')) { + lockAllConfigurations() + } } } diff --git a/examples/layers/android/build.gradle b/examples/layers/android/build.gradle index 734b31571ef..f7ec09745ff 100644 --- a/examples/layers/android/build.gradle +++ b/examples/layers/android/build.gradle @@ -39,7 +39,9 @@ subprojects { dependencyLocking { ignoredDependencies.add('io.flutter:*') lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile") - lockAllConfigurations() + if (!project.hasProperty('local-engine-repo')) { + lockAllConfigurations() + } } } diff --git a/examples/platform_channel/android/build.gradle b/examples/platform_channel/android/build.gradle index 734b31571ef..f7ec09745ff 100644 --- a/examples/platform_channel/android/build.gradle +++ b/examples/platform_channel/android/build.gradle @@ -39,7 +39,9 @@ subprojects { dependencyLocking { ignoredDependencies.add('io.flutter:*') lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile") - lockAllConfigurations() + if (!project.hasProperty('local-engine-repo')) { + lockAllConfigurations() + } } } diff --git a/examples/platform_view/android/build.gradle b/examples/platform_view/android/build.gradle index 734b31571ef..f7ec09745ff 100644 --- a/examples/platform_view/android/build.gradle +++ b/examples/platform_view/android/build.gradle @@ -39,7 +39,9 @@ subprojects { dependencyLocking { ignoredDependencies.add('io.flutter:*') lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile") - lockAllConfigurations() + if (!project.hasProperty('local-engine-repo')) { + lockAllConfigurations() + } } } diff --git a/packages/integration_test/example/android/build.gradle b/packages/integration_test/example/android/build.gradle index 734b31571ef..f7ec09745ff 100644 --- a/packages/integration_test/example/android/build.gradle +++ b/packages/integration_test/example/android/build.gradle @@ -39,7 +39,9 @@ subprojects { dependencyLocking { ignoredDependencies.add('io.flutter:*') lockFile = file("${rootProject.projectDir}/project-${project.name}.lockfile") - lockAllConfigurations() + if (!project.hasProperty('local-engine-repo')) { + lockAllConfigurations() + } } }