diff --git a/build.gradle b/build.gradle index f8bd96459..ba4456e6a 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ // limitations under the License. buildscript { - if (project.disableDependencyLocking.toBoolean() == false) { + if (rootProject.enableDependencyLocking.toBoolean()) { // Lock buildscript dependencies. configurations.classpath { resolutionStrategy.activateDependencyLocking() @@ -169,7 +169,7 @@ subprojects { } } - if (rootProject.disableDependencyLocking.toBoolean() == false) { + if (rootProject.enableDependencyLocking.toBoolean()) { buildscript { // Lock buildscript dependencies. configurations.classpath { diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 368f34d68..cd90bc924 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -13,7 +13,7 @@ // limitations under the License. buildscript { - if (rootProject.disableDependencyLocking.toBoolean() == false) { + if (project.enableDependencyLocking.toBoolean()) { // Lock buildscript dependencies. configurations.classpath { resolutionStrategy.activateDependencyLocking() @@ -32,7 +32,7 @@ plugins { id 'com.diffplug.gradle.spotless' version '3.18.0' } -if (rootProject.disableDependencyLocking.toBoolean() == false) { +if (rootProject.enableDependencyLocking.toBoolean()) { // Lock application dependencies. dependencyLocking { lockAllConfigurations() diff --git a/buildSrc/gradle.properties b/buildSrc/gradle.properties index 3cf45aa75..f54ed697a 100644 --- a/buildSrc/gradle.properties +++ b/buildSrc/gradle.properties @@ -1 +1 @@ -disableDependencyLocking=false +enableDependencyLocking=false diff --git a/gradle.properties b/gradle.properties index bf7611334..52523fc8f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,4 +4,4 @@ uploaderDestination= uploaderCredentialsFile= uploaderMultithreadedUpload= flowDocsFile= -disableDependencyLocking=false +enableDependencyLocking=true