From d0841400efcdfc7ba01760a0a61da118f43ddaa7 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Fri, 28 Apr 2017 15:05:56 +0200 Subject: [PATCH] Fixed the test resources for Gradle wiuthout this change Intellij support wasn't great if one hasn't applied the idea plugin with this change if someone's using Intellij (we check that by verifying the presence of .idea folder) then we apply the plugin automatically fixes #286 --- .../build.gradle | 2 +- .../gradle.properties | 2 +- ...SpringCloudContractVerifierGradlePlugin.groovy | 15 +++++++-------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/build.gradle b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/build.gradle index ee4064d88e..5b0030494f 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/build.gradle +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/build.gradle @@ -23,7 +23,7 @@ ext { ] } -project.version = findProperty('verifierVersion') ?: '1.0.4.BUILD-SNAPSHOT' +project.version = findProperty('verifierVersion') ?: '1.0.5.BUILD-SNAPSHOT' apply plugin: 'groovy' apply from: "$rootDir/gradle/release.gradle" apply plugin: 'eclipse' diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle.properties b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle.properties index 45c9027d5f..4d7059a180 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle.properties +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle.properties @@ -16,5 +16,5 @@ nexusUsername = nexusPassword = -verifierVersion=1.0.4.BUILD-SNAPSHOT +verifierVersion=1.0.5.BUILD-SNAPSHOT org.gradle.daemon=false \ No newline at end of file diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/SpringCloudContractVerifierGradlePlugin.groovy b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/SpringCloudContractVerifierGradlePlugin.groovy index 9c1eda169e..8f41b979ee 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/SpringCloudContractVerifierGradlePlugin.groovy +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/SpringCloudContractVerifierGradlePlugin.groovy @@ -75,14 +75,13 @@ class SpringCloudContractVerifierGradlePlugin implements Plugin { } private addIdeaTestSources(Project project, extension) { - project.afterEvaluate { - def hasIdea = project.plugins.findPlugin(IDEA_PLUGIN_CLASS) - if (hasIdea) { - project.idea { - module { - testSourceDirs += extension.generatedTestSourcesDir - testSourceDirs += extension.contractsDslDir - } + def hasIdea = new File(project.projectDir, ".idea").exists() + if (hasIdea) { + project.apply(plugin: 'idea') + project.idea { + module { + testSourceDirs += extension.generatedTestSourcesDir + testSourceDirs += extension.contractsDslDir } } }