PR comments

ben-manes · Sep 9, 2019 · 182d28e · 182d28e
1 parent 9d473dc
commit 182d28e
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -97,7 +97,7 @@ no agreed standard on this, but this is a good starting point:
 def isNonStable = { String version ->
   def stableKeyword = ['RELEASE', 'FINAL', 'GA'].any { it -> version.toUpperCase().contains(it) }
   def regex = /^[0-9,.v-]+$/
-  return !stableKeyword && !(version ==~ /^[0-9,.v-]+$/)
+  return !stableKeyword && !(version ==~ regex)
 }
 ```
 
@@ -139,7 +139,7 @@ dependencyUpdates {
    // Example 3: using the full syntax
    resolutionStrategy {
      componentSelection { rules ->
-       rules.all { ComponentSelection selection ->
+       rules.all {
          if (isNonStable(candidate.version) && !isNonStable(currentVersion)) {
            selection.reject('Release candidate')
          }

diff --git a/examples/build.gradle b/examples/build.gradle
@@ -32,7 +32,7 @@ configurations {
 def isNonStable = { String version ->
   def stableKeyword = ['RELEASE', 'FINAL', 'GA'].any { it -> version.toUpperCase().contains(it) }
   def regex = /^[0-9,.v-]+$/
-  return !stableKeyword && !(version ==~ /^[0-9,.v-]+$/)
+  return !stableKeyword && !(version ==~ regex)
 }
 
 dependencyUpdates {
@@ -41,6 +41,17 @@ dependencyUpdates {
   rejectVersionIf { selection ->
     isNonStable(selection.candidate.version) && !isNonStable(selection.currentVersion)
   }
+
+//  resolutionStrategy {
+//    componentSelection { rules ->
+//      rules.all {
+//        if (isNonStable(candidate.version) && !isNonStable(currentVersion)) {
+//          selection.reject('Release candidate')
+//        }
+//      }
+//    }
+//  }
+
 }
 
 dependencies {

diff --git a/examples/kotlin/build.gradle.kts b/examples/kotlin/build.gradle.kts
@@ -34,6 +34,16 @@ tasks.withType<DependencyUpdatesTask> {
     isNonStable(selection.candidate.version) && isNonStable(selection.currentVersion).not()
   }
 
+  resolutionStrategy {
+    componentSelection {
+      all {
+        if (isNonStable(candidate.version) && !isNonStable(currentVersion)) {
+          reject("Release candidate")
+        }
+      }
+    }
+  }
+
   // optional parameters
   checkForGradleUpdate = true
   outputFormatter = "json"

diff --git a/.../benmanes/gradle/versions/updates/resolutionstrategy/ComponentSelectionWithCurrent.groovy b/.../benmanes/gradle/versions/updates/resolutionstrategy/ComponentSelectionWithCurrent.groovy
@@ -37,12 +37,12 @@ class ComponentSelectionWithCurrent implements ComponentSelection {
 
   @Override
   public String toString() {
-    final StringBuffer sb = new StringBuffer("ComponentSelectionWithCurrent{");
-    sb.append("group=").append(getCandidate().group);
-    sb.append(", module=").append(getCandidate().module);
-    sb.append(", version=").append(getCandidate().version)
-    sb.append(", currentVersion='").append(currentVersion).append('\'');
-    sb.append('}');
-    return sb.toString();
+    return """\
+ComponentSelectionWithCurrent{
+    group="${candidate.group}",
+    module="${candidate.module}",
+    version="${candidate.version}",
+    currentVersion="$currentVersion", 
+}"""
   }
 }