Merge a009d27 into 95671cb

.travis.yml

@@ -13,15 +13,18 @@ cache:
 
 env:
   - GRADLE_VERSION=1.12
-  - GRADLE_VERSION=2.4
-  - GRADLE_VERSION=2.5
-  - GRADLE_VERSION=2.6
-  - GRADLE_VERSION=2.7
+  - GRADLE_VERSION=2.0
+  - GRADLE_VERSION=2.14.1
+  - GRADLE_VERSION=3.0
+  - GRADLE_VERSION=3.2.1
 
 before_install:
   - echo -e "\ndistributionUrl=http\://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip" >> gradle/wrapper/gradle-wrapper.properties
   - cat gradle/wrapper/gradle-wrapper.properties
 
+install:
+ - true
+
 script:
   - ./gradlew build --stacktrace --continue
 

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:${Double.valueOf(gradle.gradleVersion) > 1.12 ? "+" : "0.5"}"
+        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:${Double.valueOf(gradle.gradleVersion) > 1.12 ? '+' : '0.5'}"
 
         if (project.hasProperty('coverage')) {
             classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:1.0.2'
@@ -35,7 +35,9 @@ dependencies {
     compile 'org.codehaus.groovy.modules.http-builder:http-builder:0.7.2'
 
     testCompile 'junit:junit:4.11'
-    testCompile "org.spockframework:spock-core:${getGroovyVersion()}"
+    testCompile("org.spockframework:spock-core:${getSpockVersion()}") {
+        exclude group: 'org.codehaus.groovy', module: 'groovy-all'
+    }
     testCompile 'com.github.tomakehurst:wiremock:1.47'
     testCompile 'com.google.guava:guava:18.0'
     testRuntime 'cglib:cglib-nodep:2.2.2'
@@ -48,8 +50,9 @@ test {
     }
 }
 
-String getGroovyVersion() {
-    return Double.valueOf(gradle.gradleVersion) > 1.12 ? "1.0-groovy-2.3" : "0.7-groovy-1.8"
+String getSpockVersion() {
+    String spockGroovyVersion = GroovySystem.version.replaceAll(/\.\d+$/,'')
+    return Double.valueOf(gradle.gradleVersion) < 2.0 ? "0.7-groovy-1.8" : "1.0-groovy-$spockGroovyVersion"
 }
 
 task wrapper(type: Wrapper) {