SpringCloud/spring-cloud-contract
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade Gradle to 2.12 (#229)

Browse Source
This commit is contained in:
Marcin Zajączkowski
2016-04-15 12:25:23 +02:00
committed by Marcin Grzejszczak
parent ea9ebe43f3
commit df15d9f4c4
10 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
accurest-gradle-plugin/src/test/groovy/io/codearte/accurest/plugin/AccurestIntegrationSpec.groovy
View File

@@ -1,24 +1,28 @@
package io.codearte.accurest.plugin
import nebula.test.IntegrationSpec
import nebula.test.functional.GradleRunner
import java.nio.file.Files
import java.nio.file.Path
import static java.nio.charset.StandardCharsets.UTF_8
import static java.nio.charset.StandardCharsets.UTF_8
/**
* @author Olga Maciaszek-Sharma
@since 23.02.16
* @since 23.02.16
*/
class AccurestIntegrationSpec extends IntegrationSpec{
class AccurestIntegrationSpec extends IntegrationSpec {
public static final String SPOCK = "targetFramework = 'Spock'"
public static final String JUNIT = "targetFramework = 'JUnit'"
public static final String MVC_SPEC = "baseClassForTests = 'com.blogspot.toomuchcoding.MvcSpec'"
public static final String MVC_TEST = "baseClassForTests = 'com.blogspot.toomuchcoding.MvcTest'"
void setup() {
classpathFilter = GradleRunner.CLASSPATH_ALL //workaround for removing dependant modules by default filter
}
protected void switchToJunitTestFramework() {
Path path = buildFile.toPath()
String content = new StringBuilder(new String(Files.readAllBytes(path), UTF_8)).replaceAll(SPOCK, JUNIT)

3
accurest-gradle-plugin/src/test/groovy/io/codearte/accurest/plugin/BasicFunctionalSpec.groovy
View File

@@ -1,11 +1,10 @@
package io.codearte.accurest.plugin
import io.codearte.accurest.util.AssertionUtil
import nebula.test.IntegrationSpec
import spock.lang.Stepwise
@Stepwise
class BasicFunctionalSpec extends IntegrationSpec {
class BasicFunctionalSpec extends AccurestIntegrationSpec {
private static final String GENERATED_TEST = "build//generated-test-sources//accurest//accurest//twitter_places_analyzer//PairIdSpec.groovy"
private static final String GENERATED_CLIENT_JSON_STUB = "build//production//bootSimple-stubs//repository//mappings//twitter-places-analyzer//pairId//collerate_PlacesFrom_Tweet.json"

1
accurest-gradle-plugin/src/test/groovy/io/codearte/accurest/plugin/ScenarioProjectSpec.groovy
View File

@@ -1,6 +1,5 @@
package io.codearte.accurest.plugin
import nebula.test.IntegrationSpec
import spock.lang.Stepwise
@Stepwise

2
accurest-gradle-plugin/src/test/resources/functionalTest/bootSimple/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-bin.zip

2
accurest-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=http\://services.gradle.org/distributions/gradle-2.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-bin.zip

2
accurest-gradle-plugin/src/test/resources/functionalTest/sampleProject/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=http\://services.gradle.org/distributions/gradle-2.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-bin.zip

2
accurest-gradle-plugin/src/test/resources/functionalTest/scenarioProject/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=http\://services.gradle.org/distributions/gradle-2.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-bin.zip

9
build.gradle
View File

@@ -61,7 +61,7 @@ subprojects {
dependencies {
compile localGroovy()
testCompile('org.spockframework:spock-core:1.0-groovy-2.3') {
testCompile('org.spockframework:spock-core:1.0-groovy-2.4') {
exclude(group: 'org.codehaus.groovy')
}
}
@@ -98,7 +98,7 @@ project(':accurest-core') {
compile "com.github.tomakehurst:wiremock:$wiremockVersion"
compile "com.toomuchcoding.jsonassert:jsonassert:$jsonassertVersion"
compile 'org.assertj:assertj-core:2.3.0'
compile 'org.codehaus.groovy:groovy-all:2.3.10'
compile 'org.codehaus.groovy:groovy-all:2.4.4'
testCompile 'cglib:cglib-nodep:2.2'
testCompile 'org.objenesis:objenesis:2.1'
testCompile project(':accurest-testing-utils')
@@ -129,8 +129,9 @@ project(':accurest-gradle-plugin') {
dependencies {
compile project(':accurest-core')
compile project(':accurest-converters')
compile gradleApi()
testCompile('com.netflix.nebula:nebula-test:2.2.1') {
testCompile('com.netflix.nebula:nebula-test:4.0.0') {
exclude(group: 'org.spockframework')
}
testCompile project(':accurest-testing-utils')
@@ -151,5 +152,5 @@ project(':accurest-gradle-plugin') {
}
task wrapper(type: Wrapper) {
gradleVersion = '2.4'
gradleVersion = '2.12'
}

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,6 @@
#Tue Apr 05 14:37:54 CEST 2016
#Tue Apr 12 23:29:55 EDT 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-bin.zip