DependencyLockExtension: skippedConfigurationNamesPrefixes not lazy a…

…pi for backwrads compatibility
nebula-plugins · Nov 15, 2023 · 07a7fe1 · 07a7fe1
1 parent eb2fd35
commit 07a7fe1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/main/groovy/nebula/plugin/dependencylock/DependencyLockExtension.groovy b/src/main/groovy/nebula/plugin/dependencylock/DependencyLockExtension.groovy
@@ -23,7 +23,6 @@ abstract class DependencyLockExtension {
         lockFile.convention('dependencies.lock')
         globalLockFile.convention('global.lock')
         configurationNames.convention([])
-        skippedConfigurationNamesPrefixes.convention([])
         updateDependencies.convention([])
         skippedDependencies.convention([])
         includeTransitives.convention(false)
@@ -37,7 +36,6 @@ abstract class DependencyLockExtension {
     abstract Property<String> getLockFile()
     abstract Property<String> getGlobalLockFile()
     abstract SetProperty<String> getConfigurationNames()
-    abstract SetProperty<String> getSkippedConfigurationNamesPrefixes()
     abstract SetProperty<String> getUpdateDependencies()
     abstract SetProperty<String> getSkippedDependencies()
     abstract Property<Boolean> getIncludeTransitives()
@@ -47,5 +45,7 @@ abstract class DependencyLockExtension {
     abstract Property<Boolean> getUpdateDependenciesFailOnNonSpecifiedDependenciesToUpdate()
     abstract SetProperty<String> getAdditionalConfigurationsToLock()
 
+    Set<String> skippedConfigurationNamesPrefixes = [] as Set
+
     Closure dependencyFilter = { String group, String name, String version -> true }
 }
diff --git a/src/main/groovy/nebula/plugin/dependencylock/DependencyLockTaskConfigurer.groovy b/src/main/groovy/nebula/plugin/dependencylock/DependencyLockTaskConfigurer.groovy
@@ -202,7 +202,7 @@ class DependencyLockTaskConfigurer {
             peers.set(getProjectPeers())
             generateLockTask.conventionMapping.with {
                 configurationResolutionData = {
-                    lockableConfigurations(project, extension.configurationNames.get(), extension.skippedConfigurationNamesPrefixes.get()).findAll { it.isCanBeResolved() }.collect {
+                    lockableConfigurations(project, extension.configurationNames.get(), extension.skippedConfigurationNamesPrefixes).findAll { it.isCanBeResolved() }.collect {
                         new ConfigurationResolutionData(
                                 it.name,
                                 it.incoming.resolutionResult.getAllDependencies(),
@@ -237,15 +237,15 @@ class DependencyLockTaskConfigurer {
                     def subprojects = project.subprojects.collect { subproject ->
                         def ext = subproject.getExtensions().findByType(DependencyLockExtension)
                         if (ext != null) {
-                            Collection<Configuration> lockableConfigurations = lockableConfigurations(subproject, ext.configurationNames.get(), extension.skippedConfigurationNamesPrefixes.get())
+                            Collection<Configuration> lockableConfigurations = lockableConfigurations(subproject, ext.configurationNames.get(), extension.skippedConfigurationNamesPrefixes)
                             Collection<Configuration> configurations = filterNonLockableConfigurationsAndProvideWarningsForGlobalLockSubproject(subproject, ext.configurationNames.get(), lockableConfigurations)
                             Configuration aggregate = subproject.configurations.create("aggregateConfiguration")
                             aggregate.setCanBeConsumed(true)
                             aggregate.setCanBeResolved(true)
                             configurations
                                     .findAll { configuration ->
                                         !configurationsToSkipForGlobalLockPrefixes.any { String prefix -> configuration.name.startsWith(prefix) }
-                                                && !extension.skippedConfigurationNamesPrefixes.get().any { String prefix -> configuration.name.startsWith(prefix) }
+                                                && !extension.skippedConfigurationNamesPrefixes.any { String prefix -> configuration.name.startsWith(prefix) }
                                     }
                                     .each { configuration ->
                                         aggregate.extendsFrom(configuration)
@@ -259,7 +259,7 @@ class DependencyLockTaskConfigurer {
                     def conf = project.configurations.detachedConfiguration(subprojectsArray)
                     project.allprojects.each { it.configurations.add(conf) }
 
-                    def configs = [conf] + ConfigurationUtils.lockableConfigurations(project, extension.configurationNames.get(), extension.skippedConfigurationNamesPrefixes.get())
+                    def configs = [conf] + ConfigurationUtils.lockableConfigurations(project, extension.configurationNames.get(), extension.skippedConfigurationNamesPrefixes)
                     configs.findAll { it.isCanBeResolved() }.collect {
                         new ConfigurationResolutionData(
                                 it.name,

diff --git a/src/main/kotlin/nebula/plugin/dependencylock/DependencyLockPlugin.kt b/src/main/kotlin/nebula/plugin/dependencylock/DependencyLockPlugin.kt
@@ -186,7 +186,7 @@ class DependencyLockPlugin : Plugin<Project> {
     }
 
     private fun maybeApplyLock(conf: Configuration, extension: DependencyLockExtension, overrides: Map<*, *>, globalLockFileName: String?, lockFilename: String?) {
-        val shouldIgnoreLock = (extension.skippedConfigurationNamesPrefixes.get() + DependencyLockTaskConfigurer.configurationsToSkipForGlobalLockPrefixes).any {
+        val shouldIgnoreLock = (extension.skippedConfigurationNamesPrefixes + DependencyLockTaskConfigurer.configurationsToSkipForGlobalLockPrefixes).any {
             prefix -> conf.name.startsWith(prefix) && !conf.name.contains("resolutionRules")
         }
         if(shouldIgnoreLock) {