From b2e7ba64892077f19579193d64e59e05f0e5947d Mon Sep 17 00:00:00 2001 From: Vladimir Sitnikov Date: Fri, 24 Jul 2020 12:43:06 +0300 Subject: [PATCH 1/2] Rename validatePlugins to validatePluginsSkipkit to avoid task name clash with Gradle 6.x --- .../shipkit/internal/gradle/plugin/PluginValidationPlugin.java | 2 +- .../src/test/groovy/testutil/GradleVersionsDeterminer.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/subprojects/shipkit/src/main/groovy/org/shipkit/internal/gradle/plugin/PluginValidationPlugin.java b/subprojects/shipkit/src/main/groovy/org/shipkit/internal/gradle/plugin/PluginValidationPlugin.java index 54144288..5f6362d3 100644 --- a/subprojects/shipkit/src/main/groovy/org/shipkit/internal/gradle/plugin/PluginValidationPlugin.java +++ b/subprojects/shipkit/src/main/groovy/org/shipkit/internal/gradle/plugin/PluginValidationPlugin.java @@ -19,7 +19,7 @@ */ public class PluginValidationPlugin implements Plugin { - 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 index 1d41ff7a..6f90635b 100644 --- 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'.") From 32ebd6c3dadb61febc7d0c89bd6fd5f67414cfd6 Mon Sep 17 00:00:00 2001 From: Vladimir Sitnikov Date: Fri, 24 Jul 2020 14:57:04 +0300 Subject: [PATCH 2/2] Skip :generatePom... and :generateMetadata... tasks in test assertions The task depend on Gradle version, and their order is not stable. --- .../internal/gradle/plugin/PluginValidationPlugin.java | 2 +- .../groovy/org/shipkit/gradle/ShipkitJavaIntegTest.groovy | 2 -- .../org/shipkit/gradle/ShipkitJavadocIntegTest.groovy | 4 ---- .../src/test/groovy/testutil/GradleSpecification.groovy | 6 +++++- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/subprojects/shipkit/src/main/groovy/org/shipkit/internal/gradle/plugin/PluginValidationPlugin.java b/subprojects/shipkit/src/main/groovy/org/shipkit/internal/gradle/plugin/PluginValidationPlugin.java index 5f6362d3..df408ac4 100644 --- a/subprojects/shipkit/src/main/groovy/org/shipkit/internal/gradle/plugin/PluginValidationPlugin.java +++ b/subprojects/shipkit/src/main/groovy/org/shipkit/internal/gradle/plugin/PluginValidationPlugin.java @@ -11,7 +11,7 @@ * This plugin validates that every plugin has a corresponding .properties file. * *
    - *
  • Adds 'validatePlugins' task of type {@link PluginValidatorTask}. + *
  • Adds 'validatePluginsShipkit' task of type {@link PluginValidatorTask}. * Validates that every plugin has a corresponding .properties file. * New task is configured as dependency of 'check' task so that when you run 'check', the plugins are validated *
    • diff --git a/subprojects/shipkit/src/test/groovy/org/shipkit/gradle/ShipkitJavaIntegTest.groovy b/subprojects/shipkit/src/test/groovy/org/shipkit/gradle/ShipkitJavaIntegTest.groovy index 5e7c54a7..4a8edb9e 100644 --- a/subprojects/shipkit/src/test/groovy/org/shipkit/gradle/ShipkitJavaIntegTest.groovy +++ b/subprojects/shipkit/src/test/groovy/org/shipkit/gradle/ShipkitJavaIntegTest.groovy @@ -58,7 +58,6 @@ class ShipkitJavaIntegTest extends GradleSpecification { :updateReleaseNotes :gitCommit :gitTag -:api:generatePomFileForJavaLibraryPublication :api:compileJava :api:processResources :api:classes @@ -68,7 +67,6 @@ class ShipkitJavaIntegTest extends GradleSpecification { :api:createDependencyInfoFile :api:sourcesJar :api:publishJavaLibraryPublicationToMavenLocal -:impl:generatePomFileForJavaLibraryPublication :impl:compileJava :impl:processResources :impl:classes diff --git a/subprojects/shipkit/src/test/groovy/org/shipkit/gradle/ShipkitJavadocIntegTest.groovy b/subprojects/shipkit/src/test/groovy/org/shipkit/gradle/ShipkitJavadocIntegTest.groovy index 133f3583..384290a2 100644 --- a/subprojects/shipkit/src/test/groovy/org/shipkit/gradle/ShipkitJavadocIntegTest.groovy +++ b/subprojects/shipkit/src/test/groovy/org/shipkit/gradle/ShipkitJavadocIntegTest.groovy @@ -49,7 +49,6 @@ class ShipkitJavadocIntegTest extends GradleSpecification { :updateReleaseNotes :gitCommit :gitTag -:api:generatePomFileForJavaLibraryPublication :api:compileJava :api:processResources :api:classes @@ -59,7 +58,6 @@ class ShipkitJavadocIntegTest extends GradleSpecification { :api:createDependencyInfoFile :api:sourcesJar :api:publishJavaLibraryPublicationToMavenLocal -:impl:generatePomFileForJavaLibraryPublication :impl:compileJava :impl:processResources :impl:classes @@ -137,7 +135,6 @@ class ShipkitJavadocIntegTest extends GradleSpecification { :updateReleaseNotes :gitCommit :gitTag -:api:generatePomFileForJavaLibraryPublication :api:compileJava :api:processResources :api:classes @@ -147,7 +144,6 @@ class ShipkitJavadocIntegTest extends GradleSpecification { :api:createDependencyInfoFile :api:sourcesJar :api:publishJavaLibraryPublicationToMavenLocal -:impl:generatePomFileForJavaLibraryPublication :impl:compileJava :impl:processResources :impl:classes diff --git a/subprojects/shipkit/src/test/groovy/testutil/GradleSpecification.groovy b/subprojects/shipkit/src/test/groovy/testutil/GradleSpecification.groovy index 03c722f4..f6aa2fb4 100644 --- a/subprojects/shipkit/src/test/groovy/testutil/GradleSpecification.groovy +++ b/subprojects/shipkit/src/test/groovy/testutil/GradleSpecification.groovy @@ -132,7 +132,11 @@ abstract class GradleSpecification extends Specification implements GradleVersio protected List skippedTaskPathsGradleBugWorkaround(String output) { //Due to https://github.com/gradle/gradle/issues/2732 no tasks are returned in dry-run mode. When fixed ".taskPaths(SKIPPED)" should be used directly - return output.readLines().findAll { it.endsWith(" SKIPPED") }.collect { it.substring(0, it.lastIndexOf(" ")) } + return output.readLines() + .findAll { it.endsWith(" SKIPPED") } + .findAll { !it.contains(":generatePom") } + .findAll { !it.contains(":generateMetadata") } + .collect { it.substring(0, it.lastIndexOf(" ")) } } private static String findClassesDir() {