Changeset 2556c77

Timestamp:

Feb 17, 2019 2:33:19 AM (2 years ago)

Author:

str4d <str4d@…>

Branches:

master

Children:

4f6b58e

Parents:

9731c20

Message:

Travis CI: Update config to handle cross-compilation

Files:

• .travis.yml (modified) (2 diffs)
• build.gradle (modified) (2 diffs)

.travis.yml

@@ -3 +3 @@
 jdk:
   - oraclejdk9
-  - openjdk8
 
 matrix:
@@ -11 +10 @@
         sonarcloud:
           organization: "i2p"
+      before_install:
+        - export JAVA7_HOME=$(jdk_switcher home openjdk7)
+        - sed -i "1iplugins {\n    id 'org.sonarqube' version '2.6.1'\n}\n" build.gradle
+    - jdk: openjdk8
+      before_install:
+        - export JAVA7_HOME=$(jdk_switcher home openjdk7)
     - jdk: openjdk7
       sudo: required
       before_install: # Work around missing crypto in openjdk7
+        - export JAVA7_HOME=$(jdk_switcher home openjdk7)
         - sudo wget "https://bouncycastle.org/download/bcprov-ext-jdk15on-158.jar" -O "${JAVA_HOME}/jre/lib/ext/bcprov-ext-jdk15on-158.jar"
         - sudo perl -pi.bak -e 's/^(security\.provider\.)([0-9]+)/$1.($2+1)/ge' /etc/java-7-openjdk/security/java.security
         - echo "security.provider.1=org.bouncycastle.jce.provider.BouncyCastleProvider" | sudo tee -a /etc/java-7-openjdk/security/java.security
-
-before_install:
- - |
-    if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ]; then
-      sed -i "1iplugins {\n    id 'org.sonarqube' version '2.6.1'\n}\n" build.gradle
-    fi
+      install:
+        - export TARGET_JAVA_HOME=$JAVA_HOME
+        - jdk_switcher use oraclejdk8
+        - ./gradlew assemble
 
 before_cache:

build.gradle

@@ -39 +39 @@
         src
     }
+}
+
+String javaExecutable(String targetJavaHome, String execName) {
+    def javaExecutablesPath = new File(targetJavaHome, "bin")
+    def executable = new File(javaExecutablesPath, execName)
+    if (!executable.exists()) {
+        throw new IllegalArgumentException("There is no ${execName} executable in ${javaExecutablesPath}")
+    }
+    executable.toString()
 }
 
@@ -99 +108 @@
         }
     }
+
+    // Set up Java override if configured (used to test with Java 7).
+    def targetJavaHome = System.getenv("TARGET_JAVA_HOME")
+    if (targetJavaHome) {
+        if (JavaVersion.current().java9Compatible) {
+            throw new GradleException("Only set TARGET_JAVA_HOME with JDK 8")
+        }
+
+        project.afterEvaluate {
+            logger.info("Target Java home set to ${targetJavaHome}")
+            logger.info("Configuring Gradle to use forked compilation and testing")
+
+            tasks.withType(JavaCompile) {
+                options.fork = true
+                options.forkOptions.javaHome = file(targetJavaHome)
+            }
+
+            tasks.withType(Javadoc) {
+                executable = javaExecutable(targetJavaHome, "javadoc")
+            }
+
+            tasks.withType(Test) {
+                executable = javaExecutable(targetJavaHome, "java")
+            }
+
+            tasks.withType(JavaExec) {
+                executable = javaExecutable(targetJavaHome, "java")
+            }
+        }
+    }
 }