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

Rename validatePlugins to validatePluginsSkipkit to avoid task name clash with Gradle 6.x #877

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Rename validatePlugins to validatePluginsSkipkit to avoid task name clash with Gradle 6.x #877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2e7ba6
Rename validatePlugins to validatePluginsSkipkit to avoid task name c…
vlsi Jul 24, 2020
32ebd6c
Skip :generatePom... and :generateMetadata... tasks in test assertions
vlsi Jul 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...ts/shipkit/src/main/groovy/org/shipkit/internal/gradle/plugin/PluginValidationPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
* This plugin validates that every plugin has a corresponding .properties file.
*
* <ul>
* <li>Adds 'validatePlugins' task of type {@link PluginValidatorTask}.
* <li>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
* </li>
* </ul>
*/
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) {
Expand Down
2 changes: 0 additions & 2 deletions subprojects/shipkit/src/test/groovy/org/shipkit/gradle/ShipkitJavaIntegTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ class ShipkitJavaIntegTest extends GradleSpecification {
:updateReleaseNotes
:gitCommit
:gitTag
:api:generatePomFileForJavaLibraryPublication
:api:compileJava
:api:processResources
:api:classes
Expand All @@ -68,7 +67,6 @@ class ShipkitJavaIntegTest extends GradleSpecification {
:api:createDependencyInfoFile
:api:sourcesJar
:api:publishJavaLibraryPublicationToMavenLocal
:impl:generatePomFileForJavaLibraryPublication
:impl:compileJava
:impl:processResources
:impl:classes
Expand Down
4 changes: 0 additions & 4 deletions subprojects/shipkit/src/test/groovy/org/shipkit/gradle/ShipkitJavadocIntegTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ class ShipkitJavadocIntegTest extends GradleSpecification {
:updateReleaseNotes
:gitCommit
:gitTag
:api:generatePomFileForJavaLibraryPublication
:api:compileJava
:api:processResources
:api:classes
Expand All @@ -59,7 +58,6 @@ class ShipkitJavadocIntegTest extends GradleSpecification {
:api:createDependencyInfoFile
:api:sourcesJar
:api:publishJavaLibraryPublicationToMavenLocal
:impl:generatePomFileForJavaLibraryPublication
:impl:compileJava
:impl:processResources
:impl:classes
Expand Down Expand Up @@ -137,7 +135,6 @@ class ShipkitJavadocIntegTest extends GradleSpecification {
:updateReleaseNotes
:gitCommit
:gitTag
:api:generatePomFileForJavaLibraryPublication
:api:compileJava
:api:processResources
:api:classes
Expand All @@ -147,7 +144,6 @@ class ShipkitJavadocIntegTest extends GradleSpecification {
:api:createDependencyInfoFile
:api:sourcesJar
:api:publishJavaLibraryPublicationToMavenLocal
:impl:generatePomFileForJavaLibraryPublication
:impl:compileJava
:impl:processResources
:impl:classes
Expand Down
6 changes: 5 additions & 1 deletion subprojects/shipkit/src/test/groovy/testutil/GradleSpecification.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,11 @@ abstract class GradleSpecification extends Specification implements GradleVersio

protected List<String> 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() {
Expand Down
2 changes: 1 addition & 1 deletion subprojects/shipkit/src/test/groovy/testutil/GradleVersionsDeterminer.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'.")
Expand Down