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 07:39:01 UTC

[groovy] branch master updated: GROOVY-9474: Upgrade spock to latest version (adjust gradle build for groovy-nio)

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


The following commit(s) were added to refs/heads/master by this push:
     new e8a706f  GROOVY-9474: Upgrade spock to latest version (adjust gradle build for groovy-nio)
e8a706f is described below

commit e8a706f2da472e869c1b96b7eb51e35577f93445
Author: Paul King <pa...@asert.com.au>
AuthorDate: Sun Mar 22 17:38:53 2020 +1000

    GROOVY-9474: Upgrade spock to latest version (adjust gradle build for groovy-nio)
---
 build.gradle                                | 2 ++
 subprojects/groovy-nio/build.gradle         | 9 +++------
 subprojects/groovy-test-junit5/build.gradle | 5 -----
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/build.gradle b/build.gradle
index ecb0cd0..a09ad1f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -154,6 +154,8 @@ ext {
     spotbugsVersion = '4.0.1'
     spotbugsAnnotationsVersion = '4.0.1'
     checkstyleVersion = '8.30'
+    junit5Version = '5.6.0'
+    junit5PlatformVersion = '1.6.0'
 }
 
 dependencies {
diff --git a/subprojects/groovy-nio/build.gradle b/subprojects/groovy-nio/build.gradle
index 547e97c..afb4812 100644
--- a/subprojects/groovy-nio/build.gradle
+++ b/subprojects/groovy-nio/build.gradle
@@ -28,18 +28,15 @@ dependencies {
     testImplementation ("org.spockframework:spock-core:$spockVersion") {
         exclude group: 'org.codehaus.groovy'
     }
+    testImplementation ("org.spockframework:spock-junit4:$spockVersion")
 }
 
 task moduleDescriptor(type: org.codehaus.groovy.gradle.WriteExtensionDescriptorTask) {
     extensionClasses = 'org.apache.groovy.nio.extensions.NioExtensions'
 }
 
-sourceSets {
-    test {
-        groovy {
-            exclude 'org/apache/groovy/nio/extensions/NioExtensionsTest.groovy'
-        }
-    }
+test {
+    useJUnitPlatform()
 }
 
 compileJava.dependsOn moduleDescriptor
diff --git a/subprojects/groovy-test-junit5/build.gradle b/subprojects/groovy-test-junit5/build.gradle
index 050d13a..ea3a530 100644
--- a/subprojects/groovy-test-junit5/build.gradle
+++ b/subprojects/groovy-test-junit5/build.gradle
@@ -17,11 +17,6 @@
  *  under the License.
  */
 
-ext {
-    junit5Version = '5.6.0'
-    junit5PlatformVersion = '1.6.0'
-}
-
 dependencies {
     api rootProject // JUnit5Runner implements GroovyRunner...
     implementation("org.junit.platform:junit-platform-launcher:$junit5PlatformVersion") {