From a02cccaa501e01eaf53b1dbb060a96e6ab406a8f Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Thu, 7 Dec 2017 16:54:02 +0000
Subject: [PATCH] Only use SonarQube with Java 8
It fails on Java 7, and is unsupported on Java 9.
---
.travis.yml | 6 +++---
build.gradle | 8 ++++++--
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index ee0af68add..92a6dbada7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,12 @@
language: java
jdk:
- - oraclejdk8
+ - oraclejdk9
- openjdk8
matrix:
include:
- - jdk: oraclejdk9
+ - jdk: oraclejdk8
addons:
sonarcloud:
organization: "i2p"
@@ -29,7 +29,7 @@ cache:
script:
- |
- if [ "$TRAVIS_JDK_VERSION" == "oraclejdk9" ]; then
+ if [ "$TRAVIS_JDK_VERSION" == "oraclejdk8" ]; then
./gradlew sonarqube codeCoverageReport
else
./gradlew check codeCoverageReport
diff --git a/build.gradle b/build.gradle
index aec1a21605..e8d8b4c189 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,9 @@
-plugins {
- id "org.sonarqube" version "2.6.1"
+// SonarQube is currently only supported on Java 8
+// https://docs.sonarqube.org/display/SONAR/Requirements#Requirements-SupportedPlatforms
+if (JavaVersion.current() == JavaVersion.VERSION_1_8) {
+ plugins {
+ id "org.sonarqube" version "2.6.1"
+ }
}
// Exclude apps/ dir itself, but include its subdirs
--
GitLab