Rename validatePlugins to validatePluginsSkipkit to avoid task name c…

…lash with Gradle 6.x
mockito · Jul 24, 2020 · b2e7ba6 · b2e7ba6
1 parent 6b70994
commit b2e7ba6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...ts/shipkit/src/main/groovy/org/shipkit/internal/gradle/plugin/PluginValidationPlugin.java b/...ts/shipkit/src/main/groovy/org/shipkit/internal/gradle/plugin/PluginValidationPlugin.java
@@ -19,7 +19,7 @@
  */
 public class PluginValidationPlugin implements Plugin<Project> {
 
-    static final String VALIDATE_PLUGINS = "validatePlugins";
+    static final String VALIDATE_PLUGINS = "validatePluginsSkipkit";
 
     @Override
     public void apply(final Project project) {

diff --git a/subprojects/shipkit/src/test/groovy/testutil/GradleVersionsDeterminer.groovy b/subprojects/shipkit/src/test/groovy/testutil/GradleVersionsDeterminer.groovy
@@ -24,7 +24,7 @@ trait GradleVersionsDeterminer {
             case null:
                 return [currentGradleVersion()]
             case QUICK_GRADLE_VERSIONS_VALUE:
-                return [currentGradleVersion(), "5.6", "5.0", "4.10.3", "4.0.2"].unique()
+                return [currentGradleVersion(), "6.5", "5.6", "5.0", "4.10.3", "4.0.2"].unique()
             default:
                 log.warn("Unsupported $REGRESSION_TESTS_ENV_NAME value '$regressionTestsLevel' (expected '$CURRENT_GRADLE_VERSION_ONLY_VALUE' or " +
                     "'$QUICK_GRADLE_VERSIONS_VALUE'). Assuming '$CURRENT_GRADLE_VERSION_ONLY_VALUE'.")