groovy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pa...@apache.org
Subject [groovy] branch master updated: adjust version number back and exclude spock tests from build - coverage will be from 3.0.X builds until we have a compatible spock version
Date Tue, 01 Oct 2019 02:15:07 GMT
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 d54872f  adjust version number back and exclude spock tests from build - coverage
will be from 3.0.X builds until we have a compatible spock version
d54872f is described below

commit d54872f82e4639a3728bcabe553be1daec991c81
Author: Paul King <paulk@asert.com.au>
AuthorDate: Tue Oct 1 12:14:55 2019 +1000

    adjust version number back and exclude spock tests from build - coverage will be from
3.0.X builds until we have a compatible spock version
---
 gradle.properties                         |  4 ++--
 subprojects/groovy-nio/build.gradle       | 18 ++++++++++++++++--
 subprojects/groovy-templates/build.gradle | 18 ++++++++++++++++--
 3 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index b58d14d..62d9a06 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,9 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-groovyVersion = 3.9.98-SNAPSHOT
+groovyVersion = 4.0.0-SNAPSHOT
 # bundle version format: major('.'minor('.'micro('.'qualifier)?)?)? (first 3 only digits)
-groovyBundleVersion = 3.9.98.SNAPSHOT
+groovyBundleVersion = 4.0.0.SNAPSHOT
 
 gradle_version=5.6.2
 
diff --git a/subprojects/groovy-nio/build.gradle b/subprojects/groovy-nio/build.gradle
index d164141..70ed52a 100644
--- a/subprojects/groovy-nio/build.gradle
+++ b/subprojects/groovy-nio/build.gradle
@@ -25,8 +25,11 @@ repositories {
 dependencies {
     compile rootProject
     testCompile project(':groovy-test')
-    testCompile ("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')) {
+        testCompile ("org.spockframework:spock-core:$spockVersion") {
+            exclude group: 'org.codehaus.groovy'
+        }
     }
 }
 
@@ -34,4 +37,15 @@ 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'
+            }
+        }
+    }
+}
+
 compileJava.dependsOn moduleDescriptor
diff --git a/subprojects/groovy-templates/build.gradle b/subprojects/groovy-templates/build.gradle
index 28bf0a8..5c7e520 100644
--- a/subprojects/groovy-templates/build.gradle
+++ b/subprojects/groovy-templates/build.gradle
@@ -27,8 +27,22 @@ dependencies {
     compile project(':groovy-xml')
     testCompile rootProject.sourceSets.test.runtimeClasspath
     testCompile project(':groovy-test')
-    testCompile("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')) {
+        testCompile ("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'
+            }
+        }
     }
 }
 


Mime
View raw message