Merge pull request #179 from nebula-plugins/core-lock-ignore-extra-lo…

…ckfiles-until-regeneration Core lock: ignore extra lockfiles until lock update or regeneration
nebula-plugins · Oct 23, 2019 · de9144f · de9144f
2 parents 75ed2f1 + bf4163f
commit de9144f
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 8 deletions.
diff --git a/src/main/groovy/nebula/plugin/dependencylock/utils/CoreLockingHelper.groovy b/src/main/groovy/nebula/plugin/dependencylock/utils/CoreLockingHelper.groovy
@@ -130,8 +130,12 @@ class CoreLockingHelper {
     }
 
     private void removeLockfilesForUnlockedConfigurations() {
-        def migrationTaskWasRequested = project.gradle.startParameter.taskNames.contains(DependencyLockTaskConfigurer.MIGRATE_TO_CORE_LOCKS_TASK_NAME)
-        if (!shouldLockAllConfigurations && !migrationTaskWasRequested) {
+        boolean migrationTaskWasRequested = project.gradle.startParameter.taskNames.contains(DependencyLockTaskConfigurer.MIGRATE_TO_CORE_LOCKS_TASK_NAME)
+        boolean hasWriteLocksFlag = project.gradle.startParameter.isWriteDependencyLocks()
+        boolean hasDependenciesToUpdate = !project.gradle.startParameter.getLockedDependenciesToUpdate().isEmpty()
+        boolean isUpdatingDependencies = hasWriteLocksFlag || hasDependenciesToUpdate
+
+        if (!shouldLockAllConfigurations && !migrationTaskWasRequested && isUpdatingDependencies) {
             project.gradle.taskGraph.whenReady { taskGraph ->
                 LinkedList tasks = taskGraph.executionPlan.executionQueue
                 Task lastTask = tasks.last?.task

diff --git a/src/test/groovy/nebula/plugin/dependencylock/DependencyLockPluginWithCoreSpec.groovy b/src/test/groovy/nebula/plugin/dependencylock/DependencyLockPluginWithCoreSpec.groovy
@@ -749,7 +749,7 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec
         !cleanBuildResults.output.contains('FAILURE')
     }
 
-    def 'generate core lock should lock delete stale lockfiles when regenerating'() {
+    def 'generate core lock should ignore extra lockfiles and then delete stale lockfiles when regenerating'() {
         given:
         buildFile.text = """\
             plugins {
@@ -786,6 +786,15 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec
         def lockFile = new File(projectDir, '/gradle/dependency-locks/customConfiguration.lockfile')
         lockFile.exists()
 
+        when:
+        def buildResult = runTasks('clean', 'build')
+
+        then:
+        !buildResult.output.contains('FAIL')
+
+        def customConfigurationLockFile = new File(projectDir, '/gradle/dependency-locks/customConfiguration.lockfile')
+        assert customConfigurationLockFile.exists()
+
         when:
         runTasks('dependencies', '--write-locks')
 
@@ -798,11 +807,11 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec
             assert expectedLocks.contains(actual)
         }
 
-        def customConfigurationLockFile = new File(projectDir, '/gradle/dependency-locks/customConfiguration.lockfile')
-        assert !customConfigurationLockFile.exists()
+        def customConfigurationLockFileAfterWriteLocks = new File(projectDir, '/gradle/dependency-locks/customConfiguration.lockfile')
+        assert !customConfigurationLockFileAfterWriteLocks.exists()
     }
 
-    def 'generate core lock should lock delete stale lockfiles when regenerating - multiproject setup'() {
+    def 'generate core lock should ignore extra lockfiles and then delete stale lockfiles when regenerating - multiproject setup'() {
         given:
         definePluginOutsideOfPluginBlock = true
         buildFile.text = """\
@@ -854,6 +863,15 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec
         def lockFile = new File(projectDir, 'sub1/gradle/dependency-locks/customConfiguration.lockfile')
         lockFile.exists()
 
+        when:
+        def buildResult = runTasks('clean', 'build')
+
+        then:
+        !buildResult.output.contains('FAIL')
+
+        def customConfigurationLockFile = new File(projectDir, 'sub1/gradle/dependency-locks/customConfiguration.lockfile')
+        assert customConfigurationLockFile.exists()
+
         when:
         runTasks('dependenciesForAll', '--write-locks')
 
@@ -866,8 +884,8 @@ class DependencyLockPluginWithCoreSpec extends AbstractDependencyLockPluginSpec
             assert expectedLocks.contains(actual)
         }
 
-        def customConfigurationLockFile = new File(projectDir, 'sub1/gradle/dependency-locks/customConfiguration.lockfile')
-        assert !customConfigurationLockFile.exists()
+        def customConfigurationLockFileAfterWriteLocks = new File(projectDir, 'sub1/gradle/dependency-locks/customConfiguration.lockfile')
+        assert !customConfigurationLockFileAfterWriteLocks.exists()
     }
 
     @Unroll