Fix issue with version selector not being available when applying rej…

…ect rule
nebula-plugins · Sep 29, 2021 · 39dbf35 · 39dbf35
1 parent 4ff67e4
commit 39dbf35
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/src/integTest/groovy/nebula/plugin/resolutionrules/ResolutionRulesPluginSpec.groovy b/src/integTest/groovy/nebula/plugin/resolutionrules/ResolutionRulesPluginSpec.groovy
@@ -577,7 +577,7 @@ class ResolutionRulesPluginSpec extends IntegrationSpec {
         def result = runTasks('dependencies', '--configuration', 'compileClasspath')
 
         then:
-        !result.standardError.contains("esolution rules could not resolve all dependencies to align configuration ':compileClasspath':\n" +
+        !result.standardError.contains("Resolution rules could not resolve all dependencies to align configuration ':compileClasspath':\n" +
                 " - com.google.guava:guava:19.0 -> com.google.guava:guava:19.0 - Could not find com.google.guava:guava:19.0")
     }
 }
diff --git a/src/main/kotlin/nebula/plugin/resolutionrules/rules.kt b/src/main/kotlin/nebula/plugin/resolutionrules/rules.kt
@@ -228,12 +228,6 @@ data class RejectRule(
     val moduleVersionId = module.toModuleVersionId()
     @Transient lateinit var versionSelector: VersionSelector
 
-    init {
-        if (moduleVersionId.version.isNotEmpty()) {
-            versionSelector = VersionWithSelector(moduleVersionId.version).asSelector()
-        }
-    }
-
     override fun apply(
         project: Project,
         configuration: Configuration,
@@ -259,6 +253,7 @@ data class RejectRules(val rules: List<RejectRule>) : Rule {
             val candidate = selection.candidate
             val rules = ruleByModuleIdentifier[candidate.moduleIdentifier] ?: return@all
             rules.forEach { rule ->
+                rule.versionSelector = VersionWithSelector(rule.moduleVersionId.version).asSelector()
                 if (!rule.hasVersionSelector() || rule.versionSelector.accept(candidate.version)) {
                     val message = "rejected by rule ${rule.ruleSet} because '${rule.reason}'"
                     selection.reject(message)