Merge pull request #260 from nebula-plugins/configuration-cache-tests…

…-locking Configuration cache tests locking
nebula-plugins · Nov 11, 2023 · f224afb · f224afb
2 parents 2f3c2cc + 60fba75
commit f224afb
Show file tree

Hide file tree

Showing 7 changed files with 153 additions and 133 deletions.
diff --git a/src/main/groovy/nebula/plugin/dependencylock/DependencyLockTaskConfigurer.groovy b/src/main/groovy/nebula/plugin/dependencylock/DependencyLockTaskConfigurer.groovy
@@ -217,9 +217,7 @@ class DependencyLockTaskConfigurer {
     private TaskProvider<GenerateLockTask> configureGlobalLockTask(TaskProvider<GenerateGlobalLockTask> globalLockTask, String lockFilename,
                                                                    DependencyLockExtension extension, Map<String, String> overridesMap) {
         globalLockTask.configure { globalGenerateTask ->
-            globalGenerateTask.doFirst {
-                project.subprojects.each { sub -> sub.repositories.each { repo -> project.repositories.add(repo) } }
-            }
+            project.subprojects.each { sub -> sub.repositories.each { repo -> project.repositories.add(repo) } }
             includeTransitives.set(
                     project.hasProperty('dependencyLock.includeTransitives') ? Boolean.parseBoolean(project['dependencyLock.includeTransitives'] as String) : extension.includeTransitives.get()
             )

diff --git a/src/test/groovy/nebula/plugin/BaseIntegrationTestKitSpec.groovy b/src/test/groovy/nebula/plugin/BaseIntegrationTestKitSpec.groovy
@@ -4,6 +4,16 @@ import nebula.test.IntegrationTestKitSpec
 
 abstract class BaseIntegrationTestKitSpec extends IntegrationTestKitSpec {
     def setup() {
+        // Enable configuration cache :)
+        new File(projectDir, 'gradle.properties') << '''org.gradle.configuration-cache=true'''.stripIndent()
+    }
 
+    void disableConfigurationCache() {
+        def propertiesFile = new File(projectDir, 'gradle.properties')
+        if(propertiesFile.exists()) {
+            propertiesFile.delete()
+        }
+        propertiesFile.createNewFile()
+        propertiesFile << '''org.gradle.configuration-cache=false'''.stripIndent()
     }
 }
diff --git a/src/test/groovy/nebula/plugin/dependencylock/DependencyLockAlignmentLauncherSpec.groovy b/src/test/groovy/nebula/plugin/dependencylock/DependencyLockAlignmentLauncherSpec.groovy
@@ -32,6 +32,9 @@ class DependencyLockAlignmentLauncherSpec extends BaseIntegrationTestKitSpec {
     def setup() {
         definePluginOutsideOfPluginBlock = true
         keepFiles = true
+
+        //TODO make task listener changes for config cache
+        disableConfigurationCache()
     }
 
     @Unroll

diff --git a/src/test/groovy/nebula/plugin/dependencylock/DependencyLockCommitLauncherSpec.groovy b/src/test/groovy/nebula/plugin/dependencylock/DependencyLockCommitLauncherSpec.groovy
@@ -15,13 +15,13 @@
  */
 package nebula.plugin.dependencylock
 
-import nebula.plugin.BaseIntegrationTestKitSpec
 import nebula.plugin.dependencylock.dependencyfixture.Fixture
+import nebula.test.IntegrationTestKitSpec
 import org.ajoberstar.grgit.Grgit
 
 import java.nio.file.Files
 
-class DependencyLockCommitLauncherSpec extends BaseIntegrationTestKitSpec {
+class DependencyLockCommitLauncherSpec extends IntegrationTestKitSpec {
 
     protected Grgit git
     protected Grgit originGit
@@ -53,7 +53,6 @@ class DependencyLockCommitLauncherSpec extends BaseIntegrationTestKitSpec {
 build/
 gradle.properties'''.stripIndent()
         def gradleProperties = new File(projectDir, "gradle.properties")
-        gradleProperties.createNewFile()
         gradleProperties << "systemProp.nebula.features.coreLockingSupport=false"
         // Enable configuration cache :)
         gradleProperties << '''org.gradle.configuration-cache=true'''.stripIndent()

diff --git a/src/test/groovy/nebula/plugin/dependencylock/DependencyLockLauncherSpec.groovy b/src/test/groovy/nebula/plugin/dependencylock/DependencyLockLauncherSpec.groovy
@@ -18,7 +18,6 @@ import nebula.plugin.BaseIntegrationTestKitSpec
 import nebula.plugin.dependencylock.dependencyfixture.Fixture
 import nebula.plugin.dependencylock.util.LockGenerator
 import nebula.plugin.dependencylock.utils.GradleVersionUtils
-import nebula.test.IntegrationTestKitSpec
 import nebula.test.dependencies.DependencyGraphBuilder
 import nebula.test.dependencies.GradleDependencyGenerator
 import nebula.test.dependencies.ModuleBuilder
@@ -446,6 +445,9 @@ class DependencyLockLauncherSpec extends BaseIntegrationTestKitSpec {
         dependenciesLock << PRE_DIFF_FOO_LOCK
         buildFile << BUILD_GRADLE
 
+        //TODO make diff lock config cache compatible
+        disableConfigurationCache()
+
         when:
         runTasks('generateLock', 'diffLock')
 
@@ -1056,6 +1058,8 @@ class DependencyLockLauncherSpec extends BaseIntegrationTestKitSpec {
                 }
             '''.stripIndent())
 
+        //TODO make diff lock config cache compatible
+        disableConfigurationCache()
         when:
         runTasks('generateLock', 'diffLock')
 
@@ -1071,6 +1075,8 @@ class DependencyLockLauncherSpec extends BaseIntegrationTestKitSpec {
     }
 
     def 'diffLock in multiproject with no locks'() {
+        //TODO make diff lock config cache compatible
+        disableConfigurationCache()
         setupCommonMultiproject()
 
         when: