diff --git a/.gitignore b/.gitignore index 66c6d02..de3e2bc 100644 --- a/.gitignore +++ b/.gitignore @@ -20,4 +20,5 @@ bin/ *.iws *.ipr *.iml -out/ \ No newline at end of file +.idea/ +out/ diff --git a/build.gradle b/build.gradle index e0021d8..f21180d 100755 --- a/build.gradle +++ b/build.gradle @@ -3,8 +3,8 @@ apply plugin: "groovy" version = "1.0" description = "Spock Framework - Example Project" -// Spock works with Java 1.5 and above -sourceCompatibility = 1.5 +// Spock works with Java 1.6 and above +sourceCompatibility = 1.6 repositories { // Spock releases are available from Maven Central @@ -16,12 +16,12 @@ repositories { dependencies { // mandatory dependencies for using Spock compile "org.codehaus.groovy:groovy-all:2.4.1" - testCompile "org.spockframework:spock-core:1.0-groovy-2.4" + testCompile "org.spockframework:spock-core:1.1-groovy-2.4-rc-3" // optional dependencies for using Spock testCompile "org.hamcrest:hamcrest-core:1.3" // only necessary if Hamcrest matchers are used - testRuntime "cglib:cglib-nodep:3.1" // allows mocking of classes (in addition to interfaces) - testRuntime "org.objenesis:objenesis:2.1" // allows mocking of classes without default constructor (together with CGLIB) + testRuntime "cglib:cglib-nodep:3.2.4" // allows mocking of classes (in addition to interfaces) + testRuntime "org.objenesis:objenesis:2.5.1" // allows mocking of classes without default constructor (together with CGLIB) // dependencies used by examples in this project testRuntime "com.h2database:h2:1.4.182" diff --git a/build.xml b/build.xml index 5dab880..fedcabd 100644 --- a/build.xml +++ b/build.xml @@ -2,12 +2,12 @@ - - + + - + - + - - + + + version="1.1-groovy-2.4-rc-3" /> - + version="3.2.4" /> + version="2.5.1" /> - + + classpathref="classpath.spock" /> - - + + @@ -90,11 +90,11 @@ destdir="${build.dir}" classpathref="classpath.spock" /> - + - + - \ No newline at end of file + diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 245cae1..a697830 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-bin.zip diff --git a/pom.xml b/pom.xml index 8b9599c..df740b7 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ visit https://github.com/groovy/GMavenPlus/wiki --> org.codehaus.gmavenplus gmavenplus-plugin - 1.4 + 1.5 @@ -35,7 +35,7 @@ maven-surefire-plugin - 2.6 + 2.18.1 false @@ -46,7 +46,7 @@ maven-deploy-plugin - 2.5 + 2.8.2 true @@ -59,25 +59,25 @@ org.spockframework spock-core - 1.0-groovy-2.4 + 1.1-groovy-2.4-rc-3 test org.codehaus.groovy groovy-all - 2.4.1 + 2.4.7 cglib cglib-nodep - 3.1 + 3.2.4 test org.objenesis objenesis - 2.1 + 2.5.1 test