diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5a8f068..33abe87 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,7 +16,7 @@ jobs: - name: 'Set up JDK' uses: actions/setup-java@v5 with: - java-version: 8 + java-version: 17 distribution: temurin - name: Init Gradle Build Action uses: gradle/actions/setup-gradle@v5 @@ -38,7 +38,7 @@ jobs: - name: 'Set up JDK' uses: actions/setup-java@v5 with: - java-version: 8 + java-version: 17 distribution: temurin - name: 'Check Spock' run: | @@ -57,7 +57,7 @@ jobs: - name: 'Set up JDK' uses: actions/setup-java@v5 with: - java-version: 8 + java-version: 17 distribution: temurin - name: 'Check Spock' run: | diff --git a/README.adoc b/README.adoc index 1f029d4..0c11e14 100644 --- a/README.adoc +++ b/README.adoc @@ -14,12 +14,17 @@ All builds (Gradle and Maven) will automatically download all required dependenc === Prerequisites -- JDK 8 or higher +- JDK 17 or higher - Maven use `mvnw` wrapper - Gradle use `gradlew` wrapper NOTE: This example shows the usage of Spock 2.0, which uses the JUnit Platform. If you want to see how to get Spock 1.x with JUnit 4 up and running see the https://github.com/spockframework/spock-example/tree/spock-1.x[Spock-1.x] Branch. +NOTE: Spock supports Java 8, but Groovy 5.0 requires Java 11+ and Gradle 9+ requires Java 17+. + So for simplicity’s sake the example uses Java 17. + If you want to use an older Java version, please use an older Gradle version (e.g. Gradle 8.x for Java 8+). + Check the https://github.com/spockframework/spock-example/tree/java-8[Java-8] Branch for the last state of the example with Java 8. + === Building with Gradle Type: @@ -61,4 +66,3 @@ If you have any comments or questions, please direct them to the Spock discussio Happy spec'ing! The Spock Framework Team - diff --git a/build.gradle b/build.gradle index 81f98d7..160d449 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ description = "Spock Framework - Example Project" // Spock works with Java 1.8 and above java { toolchain { - languageVersion.set(JavaLanguageVersion.of(8)) + languageVersion.set(JavaLanguageVersion.of(17)) } } @@ -21,11 +21,13 @@ repositories { dependencies { // mandatory dependencies for using Spock - implementation platform('org.apache.groovy:groovy-bom:4.0.29') + implementation platform('org.apache.groovy:groovy-bom:5.0.3') implementation 'org.apache.groovy:groovy' - testImplementation platform("org.spockframework:spock-bom:2.3-groovy-4.0") + testImplementation platform("org.spockframework:spock-bom:2.4-groovy-5.0") testImplementation "org.spockframework:spock-core" testImplementation "org.spockframework:spock-junit4" // you can remove this if your code does not rely on old JUnit 4 rules + testImplementation(platform('org.junit:junit-bom:6.0.1')) + testRuntimeOnly('org.junit.platform:junit-platform-launcher') // optional dependencies for using Spock testImplementation "org.hamcrest:hamcrest-core:3.0" // only necessary if Hamcrest matchers are used diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 36e4933..8a84887 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=20f1b1176237254a6fc204d8434196fa11a4cfb387567519c61556e8710aed78 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +distributionSha256Sum=72f44c9f8ebcb1af43838f45ee5c4aa9c5444898b3468ab3f4af7b6076c5bc3f +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/ivy.xml b/ivy.xml index 2c10e9c..09945b8 100644 --- a/ivy.xml +++ b/ivy.xml @@ -26,22 +26,22 @@ - - - + + + - - + + - - + + - + diff --git a/pom.xml b/pom.xml index 93b482c..d630fc9 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,11 @@ UTF-8 UTF-8 - 4.0.29 + 17 + 17 + 2.4-groovy-5.0 + 5.0.3 + 6.0.1 @@ -69,10 +73,17 @@ org.spockframework spock-bom - 2.3-groovy-4.0 + ${spock.version} pom import + + org.junit + junit-bom + ${junit.version} + pom + import +