You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by pa...@apache.org on 2020/03/22 02:15:09 UTC
[groovy] 02/02: GROOVY-9474: Upgrade spock to latest version
(adjust for master) (closes #1201)
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 caca3eed8ead077848b391c4770f89442afa516a
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sun Mar 22 12:14:44 2020 +1000
GROOVY-9474: Upgrade spock to latest version (adjust for master) (closes #1201)
---
build.gradle | 2 +-
subprojects/groovy-nio/build.gradle | 18 ++++++------------
subprojects/groovy-templates/build.gradle | 18 ++++++------------
3 files changed, 13 insertions(+), 25 deletions(-)
diff --git a/build.gradle b/build.gradle
index 21911af..ecb0cd0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -150,7 +150,7 @@ ext {
slf4jVersion = '1.7.25'
xmlunitVersion = '1.6'
xstreamVersion = '1.4.11.1'
- spockVersion = '2.0-M2-groovy-3.0' // supports up to 3.9.99
+ spockVersion = '2.0-groovy-3.0-SNAPSHOT' // supports up to 9.9.99
spotbugsVersion = '4.0.1'
spotbugsAnnotationsVersion = '4.0.1'
checkstyleVersion = '8.30'
diff --git a/subprojects/groovy-nio/build.gradle b/subprojects/groovy-nio/build.gradle
index af4d589..547e97c 100644
--- a/subprojects/groovy-nio/build.gradle
+++ b/subprojects/groovy-nio/build.gradle
@@ -25,11 +25,8 @@ repositories {
dependencies {
api rootProject // NioExtensions uses Closure...
testImplementation project(':groovy-test')
- // temporarily disable spock tests since it doesn't support 4 yet
- if (!spockVersion.startsWith('1.3') || !groovyVersion.startsWith('4')) {
- testImplementation ("org.spockframework:spock-core:$spockVersion") {
- exclude group: 'org.codehaus.groovy'
- }
+ testImplementation ("org.spockframework:spock-core:$spockVersion") {
+ exclude group: 'org.codehaus.groovy'
}
}
@@ -37,13 +34,10 @@ task moduleDescriptor(type: org.codehaus.groovy.gradle.WriteExtensionDescriptorT
extensionClasses = 'org.apache.groovy.nio.extensions.NioExtensions'
}
-// temporarily disable spock tests since it doesn't support 4 yet
-if (spockVersion.startsWith('1.3') && groovyVersion.startsWith('4')) {
- sourceSets {
- test {
- groovy {
- exclude 'org/apache/groovy/nio/extensions/NioExtensionsTest.groovy'
- }
+sourceSets {
+ test {
+ groovy {
+ exclude 'org/apache/groovy/nio/extensions/NioExtensionsTest.groovy'
}
}
}
diff --git a/subprojects/groovy-templates/build.gradle b/subprojects/groovy-templates/build.gradle
index c847a1c..117e003 100644
--- a/subprojects/groovy-templates/build.gradle
+++ b/subprojects/groovy-templates/build.gradle
@@ -27,21 +27,15 @@ dependencies {
implementation project(':groovy-xml')
testImplementation rootProject.sourceSets.test.runtimeClasspath
testImplementation project(':groovy-test')
- // temporarily disable spock tests since it doesn't support 4 yet
- if (!spockVersion.startsWith('1.3') || !groovyVersion.startsWith('4')) {
- testImplementation ("org.spockframework:spock-core:$spockVersion") {
- exclude group: 'org.codehaus.groovy'
- }
+ testImplementation ("org.spockframework:spock-core:$spockVersion") {
+ exclude group: 'org.codehaus.groovy'
}
}
-// temporarily disable spock tests since it doesn't support 4 yet
-if (spockVersion.startsWith('1.3') && groovyVersion.startsWith('4')) {
- sourceSets {
- test {
- groovy {
- exclude 'groovy/text/StreamingTemplateEngineSpecification.groovy'
- }
+sourceSets {
+ test {
+ groovy {
+ exclude 'groovy/text/StreamingTemplateEngineSpecification.groovy'
}
}
}