Merge branch 'jims/JAL-3130_Java11_Gradle_publishing' into bug/JAL-3224_getdown_chang...
authorJim Procter <jprocter@issues.jalview.org>
Mon, 22 Apr 2019 11:46:48 +0000 (12:46 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Mon, 22 Apr 2019 11:46:48 +0000 (12:46 +0100)
1  2 
build.gradle
gradle.properties

diff --cc 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")
    }
  }
Simple merge