build: update sonarqube

hcxiong · Oct 27, 2019 · 64c9ce2 · 64c9ce2
1 parent 08f9a90
commit 64c9ce2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -19,13 +19,18 @@ java-11:
   image: openjdk:11
   script: ./gradlew clean build
 
+java-12:
+  stage: test
+  image: gradle:jdk12 # latest gradle and jdk12
+  script: gradle clean build
+
 check:
   stage: check
   image: openjdk:8
   script:
     - export JADX_LAST_TAG="$(git describe --abbrev=0 --tags)"
     - export JADX_VERSION="${JADX_LAST_TAG:1}-dev-$(git rev-parse --short HEAD)"
-    - ./gradlew clean sonarqube -Dsonar.host.url=$SONAR_HOST -Dsonar.organization=$SONAR_ORG -Dsonar.login=$SONAR_TOKEN -Dsonar.branch.name=dev
+    - ./gradlew clean sonarqube -Dsonar.host.url="${SONAR_HOST}" -Dsonar.projectKey=jadx -Dsonar.organization="${SONAR_ORG}" -Dsonar.login="${SONAR_TOKEN}" -Dsonar.branch.name=dev || echo "Skip sonar build and upload"
     - ./gradlew clean dist
   artifacts:
     paths:

diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'org.sonarqube' version '2.7.1'
+	id 'org.sonarqube' version '2.8'
 	id 'com.github.ben-manes.versions' version '0.22.0'
 	id "com.diffplug.gradle.spotless" version "3.24.0"
 }

diff --git a/scripts/travis-master.sh b/scripts/travis-master.sh
@@ -6,7 +6,7 @@ set -e
 bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports"
 
 # run sonar checks
-./gradlew clean sonarqube -Dsonar.host.url=${SONAR_HOST} -Dsonar.organization=${SONAR_ORG} -Dsonar.login=${SONAR_TOKEN} || echo "Skip sonar build and upload"
+./gradlew clean sonarqube -Dsonar.host.url=${SONAR_HOST} -Dsonar.projectKey=jadx -Dsonar.organization=${SONAR_ORG} -Dsonar.login=${SONAR_TOKEN} || echo "Skip sonar build and upload"
 
 # upload bundles to bintray unstable package
 ./gradlew clean dist