Skip to content
This repository was archived by the owner on Jan 18, 2021. It is now read-only.

Commit b2e7ba6

Browse files
committed
Rename validatePlugins to validatePluginsSkipkit to avoid task name clash with Gradle 6.x
1 parent 6b70994 commit b2e7ba6

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

subprojects/shipkit/src/main/groovy/org/shipkit/internal/gradle/plugin/PluginValidationPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*/
2020
public class PluginValidationPlugin implements Plugin<Project> {
2121

22-
static final String VALIDATE_PLUGINS = "validatePlugins";
22+
static final String VALIDATE_PLUGINS = "validatePluginsSkipkit";
2323

2424
@Override
2525
public void apply(final Project project) {

subprojects/shipkit/src/test/groovy/testutil/GradleVersionsDeterminer.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ trait GradleVersionsDeterminer {
2424
case null:
2525
return [currentGradleVersion()]
2626
case QUICK_GRADLE_VERSIONS_VALUE:
27-
return [currentGradleVersion(), "5.6", "5.0", "4.10.3", "4.0.2"].unique()
27+
return [currentGradleVersion(), "6.5", "5.6", "5.0", "4.10.3", "4.0.2"].unique()
2828
default:
2929
log.warn("Unsupported $REGRESSION_TESTS_ENV_NAME value '$regressionTestsLevel' (expected '$CURRENT_GRADLE_VERSION_ONLY_VALUE' or " +
3030
"'$QUICK_GRADLE_VERSIONS_VALUE'). Assuming '$CURRENT_GRADLE_VERSION_ONLY_VALUE'.")

0 commit comments

Comments
 (0)