diff --git a/src/integTest/groovy/nebula/plugin/resolutionrules/AbstractIntegrationTestKitSpec.groovy b/src/integTest/groovy/nebula/plugin/resolutionrules/AbstractIntegrationTestKitSpec.groovy index eb84633..d8ebff1 100644 --- a/src/integTest/groovy/nebula/plugin/resolutionrules/AbstractIntegrationTestKitSpec.groovy +++ b/src/integTest/groovy/nebula/plugin/resolutionrules/AbstractIntegrationTestKitSpec.groovy @@ -4,6 +4,17 @@ import nebula.test.IntegrationTestKitSpec abstract class AbstractIntegrationTestKitSpec 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/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesPluginInteractionSpec.groovy b/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesPluginInteractionSpec.groovy index a50e2eb..d948578 100644 --- a/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesPluginInteractionSpec.groovy +++ b/src/integTest/groovy/nebula/plugin/resolutionrules/AlignRulesPluginInteractionSpec.groovy @@ -681,6 +681,9 @@ class AlignRulesPluginInteractionSpec extends AbstractIntegrationTestKitSpec { @Unroll def 'dependency-lock plugin applied after resolution-rules plugin with non-locked resolution rules - fail due to dependency lock state is out of date '() { + // This disables configuration cache because dependency verifier is not compatible yet + // TODO: change it once dependency verifier is compatible with configuration cache + disableConfigurationCache() // note: this is a more unusual case. Typically resolution rules are distributed like a library, version controlled, and locked like other dependencies def (GradleDependencyGenerator mavenrepo, File rulesJsonFile) = dependencyLockAlignInteractionSetupWithUnlockedResolutionRulesConfiguration() buildFile << """\ @@ -1136,6 +1139,9 @@ class AlignRulesPluginInteractionSpec extends AbstractIntegrationTestKitSpec { @Unroll def 'dependency-lock plugin applied before resolution-rules plugin with non-locked resolution rules - fail due to dependency lock state is out of date '() { + // This disables configuration cache because dependency verifier is not compatible yet + // TODO: change it once dependency verifier is compatible with configuration cache + disableConfigurationCache() // note: this is a more unusual case. Typically resolution rules are distributed like a library, version controlled, and locked like other dependencies def (GradleDependencyGenerator mavenrepo, File rulesJsonFile) = dependencyLockAlignInteractionSetupWithUnlockedResolutionRulesConfiguration() buildFile << """\