From 8d3309647a80336afc6a0938b59cbdf65a3da470 Mon Sep 17 00:00:00 2001 From: jianglai Date: Wed, 22 May 2019 09:34:55 -0700 Subject: [PATCH] Add the ability to turn off dependency locking This makes it easy to experiment with new dependency versions or new plugins without having to update the lock files, by adding "-PdisableDependencyLocking=true" to any gradle command. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=249463575 --- gradle/build.gradle | 28 ++++++++++++++++------------ gradle/buildSrc/build.gradle | 16 ++++++++++------ gradle/buildSrc/gradle.properties | 1 + gradle/gradle.properties | 1 + 4 files changed, 28 insertions(+), 18 deletions(-) create mode 100644 gradle/buildSrc/gradle.properties diff --git a/gradle/build.gradle b/gradle/build.gradle index a100183ab..ad6d73f50 100644 --- a/gradle/build.gradle +++ b/gradle/build.gradle @@ -1,7 +1,9 @@ buildscript { - // Lock buildscript dependencies. - configurations.classpath { - resolutionStrategy.activateDependencyLocking() + if (project.disableDependencyLocking.toBoolean() == false) { + // Lock buildscript dependencies. + configurations.classpath { + resolutionStrategy.activateDependencyLocking() + } } dependencies { @@ -98,16 +100,18 @@ subprojects { // Skip no-op project if (project.name == 'services') return - buildscript { - // Lock buildscript dependencies. - configurations.classpath { - resolutionStrategy.activateDependencyLocking() - } - } - // Lock application dependencies. - dependencyLocking { - lockAllConfigurations() + if (rootProject.disableDependencyLocking.toBoolean() == false) { + buildscript { + // Lock buildscript dependencies. + configurations.classpath { + resolutionStrategy.activateDependencyLocking() + } + } + // Lock application dependencies. + dependencyLocking { + lockAllConfigurations() + } } def services = [':services:default', diff --git a/gradle/buildSrc/build.gradle b/gradle/buildSrc/build.gradle index d2d24fe55..0ab13ea5d 100644 --- a/gradle/buildSrc/build.gradle +++ b/gradle/buildSrc/build.gradle @@ -1,7 +1,9 @@ buildscript { - // Lock buildscript dependencies. - configurations.classpath { - resolutionStrategy.activateDependencyLocking() + if (rootProject.disableDependencyLocking.toBoolean() == false) { + // Lock buildscript dependencies. + configurations.classpath { + resolutionStrategy.activateDependencyLocking() + } } } @@ -17,9 +19,11 @@ plugins { id 'com.diffplug.gradle.spotless' version '3.18.0' } -// Lock application dependencies. -dependencyLocking { - lockAllConfigurations() +if (rootProject.disableDependencyLocking.toBoolean() == false) { + // Lock application dependencies. + dependencyLocking { + lockAllConfigurations() + } } repositories { diff --git a/gradle/buildSrc/gradle.properties b/gradle/buildSrc/gradle.properties new file mode 100644 index 000000000..3cf45aa75 --- /dev/null +++ b/gradle/buildSrc/gradle.properties @@ -0,0 +1 @@ +disableDependencyLocking=false diff --git a/gradle/gradle.properties b/gradle/gradle.properties index 880f203d5..bf7611334 100644 --- a/gradle/gradle.properties +++ b/gradle/gradle.properties @@ -4,3 +4,4 @@ uploaderDestination= uploaderCredentialsFile= uploaderMultithreadedUpload= flowDocsFile= +disableDependencyLocking=false