[groovy] 01/02: GROOVY-9593: Switch Spock from SNAPSHOT to 2.0-M3-groovy-3.0 (closes #1281)

[pa...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git

commit f7ad2d9e1903cc9626adf92cf4e0d9dc329f88e7
Author: Marcin Zajączkowski <sz...@users.sourceforge.net>
AuthorDate: Mon Jun 15 10:09:15 2020 +0200

    GROOVY-9593: Switch Spock from SNAPSHOT to 2.0-M3-groovy-3.0 (closes #1281)
    
    With '-Dspock.iKnowWhatImDoing.disableGroovyVersionCheck=true' running
    with the unsupported Groovy 4 is possible.
    
    https://github.com/spockframework/spock/pull/1164
---
 build.gradle                              | 5 ++++-
 subprojects/groovy-templates/build.gradle | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 2c99871..82034f3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -147,7 +147,7 @@ ext {
     slf4jVersion = '1.7.25'
     xmlunitVersion = '1.6'
     xstreamVersion = '1.4.12'
-    spockVersion = '2.0-groovy-3.0-SNAPSHOT' // supports up to 9.9.99
+    spockVersion = '2.0-M3-groovy-3.0' // running with Groovy 4 can be allowed with '-Dspock.iKnowWhatImDoing.disableGroovyVersionCheck=true'
     spotbugsVersion = '4.0.3'
     spotbugsAnnotationsVersion = '4.0.3'
     checkstyleVersion = '8.32'
@@ -343,6 +343,9 @@ allprojects {
         classpath = (classpath != null) ? classpath + groovyClasspath : groovyClasspath
     }.configureEach {
         options.incremental = true
+        if (groovyVersion.startsWith('4')) {
+            options.forkOptions.jvmArgs += ["-Dspock.iKnowWhatImDoing.disableGroovyVersionCheck=true"]
+        }
     }
 }
 
diff --git a/subprojects/groovy-templates/build.gradle b/subprojects/groovy-templates/build.gradle
index bcb9d23..e318372 100644
--- a/subprojects/groovy-templates/build.gradle
+++ b/subprojects/groovy-templates/build.gradle
@@ -37,6 +37,9 @@ dependencies {
 
 test {
     useJUnitPlatform()
+    if (groovyVersion.startsWith('4')) {
+        systemProperty "spock.iKnowWhatImDoing.disableGroovyVersionCheck", "true"
+    }
 }
 
 task backportJar(type:Jar) {
@@ -44,4 +47,4 @@ task backportJar(type:Jar) {
     dependsOn classes
     from sourceSets.main.output
     include 'groovy/text/markup/**'
-}
\ No newline at end of file
+}