From: Jim Procter <jprocter@issues.jalview.org>
Date: Mon, 22 Apr 2019 11:46:48 +0000 (+0100)
Subject: Merge branch 'jims/JAL-3130_Java11_Gradle_publishing' into bug/JAL-3224_getdown_chang... 
X-Git-Tag: Release_2_11_0~17^2~7^2~20
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=fe1a2bf71a933785bc5e5218deecd0125c0103f5;p=jalview.git

Merge branch 'jims/JAL-3130_Java11_Gradle_publishing' into bug/JAL-3224_getdown_changed_to_unpack_tgz_resources
---

fe1a2bf71a933785bc5e5218deecd0125c0103f5
diff --cc build.gradle
index 45a757e,c34128e..b4a5077
--- a/build.gradle
+++ b/build.gradle
@@@ -194,14 -190,26 +195,17 @@@ compileJava 
  }
  
  compileTestJava {
-   if (clover) {
+ 
+   if (use_clover) {
      dependsOn compileCloverJava
      classpath += configurations.cloverRuntime
+   } else {
+     classpath += sourceSets.main.runtimeClasspath
    }
    doFirst {
 -    if (JAVA_VERSION.equals("1.8")) {
 -      sourceCompatibility = 1.8
 -      targetCompatibility = 1.8
 -    } else if (JAVA_VERSION.equals("11")) {
 -      sourceCompatibility = 11
 -      targetCompatibility = 11
 -
 -      options.compilerArgs = [
 -        '--module-path', sourceSets.modules.compileClasspath.asPath,
 -        '--add-modules', j11modules
 -      ]
 -    }
 +    sourceCompatibility = compile_source_compatibility
 +    targetCompatibility = compile_target_compatibility
 +    options.compilerArgs = additional_compiler_args
      print ("Setting target compatibility to "+targetCompatibility+"\n")
    }
  }