You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polygene.apache.org by pa...@apache.org on 2016/09/12 02:43:52 UTC

zest-java git commit: ZEST-175 Disable Scala compilation on Java 9

Repository: zest-java
Updated Branches:
  refs/heads/develop ce9938d45 -> 55f65d6d2


ZEST-175 Disable Scala compilation on Java 9


Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/55f65d6d
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/55f65d6d
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/55f65d6d

Branch: refs/heads/develop
Commit: 55f65d6d2152c66526039243ebb03c803d16e9b6
Parents: ce9938d
Author: Paul Merlin <pa...@apache.org>
Authored: Sun Sep 11 19:43:44 2016 -0700
Committer: Paul Merlin <pa...@apache.org>
Committed: Sun Sep 11 19:43:44 2016 -0700

----------------------------------------------------------------------
 build.gradle                      | 3 +++
 libraries/lang-scala/build.gradle | 4 ++++
 2 files changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zest-java/blob/55f65d6d/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 4493880..5f4b1f4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -294,6 +294,7 @@ allprojects {
   if( ext.javaDir.isDirectory() || ext.scalaDir.isDirectory() || ext.groovyDir.isDirectory() ||
       ext.testJavaDir.isDirectory() || ext.testScalaDir.isDirectory() || ext.testGroovyDir.isDirectory() )
   {
+    // ZEST-175
     if( JavaVersion.current() < JavaVersion.VERSION_1_9 ) {
       apply plugin: 'jacoco'
     }
@@ -380,6 +381,7 @@ allprojects {
         }
       }
     }
+    // ZEST-175
     if(JavaVersion.current() < JavaVersion.VERSION_1_9 ) {
       jacoco {
         toolVersion = '0.7.5.201505241946'
@@ -484,6 +486,7 @@ dependencies {
 }
 // Generate a global code codeverage report
 task coverageReport {
+  // ZEST-175
   enabled = JavaVersion.current() < JavaVersion.VERSION_1_9
   dependsOn subprojects*.test
   def outputPath = "build/reports/coverage"

http://git-wip-us.apache.org/repos/asf/zest-java/blob/55f65d6d/libraries/lang-scala/build.gradle
----------------------------------------------------------------------
diff --git a/libraries/lang-scala/build.gradle b/libraries/lang-scala/build.gradle
index 4400422..dfb05a4 100644
--- a/libraries/lang-scala/build.gradle
+++ b/libraries/lang-scala/build.gradle
@@ -28,6 +28,10 @@ tasks.withType(ScalaCompile) {
     configure( scalaCompileOptions.forkOptions ) {
         memoryMaximumSize = '1g'
     }
+    // ZEST-175
+    if( JavaVersion.current() >= JavaVersion.VERSION_1_9 ) {
+        enabled = false
+    }
 }
 
 dependencies {