From 5346eab529e41703bd5a9d0426fb2b5785023aff Mon Sep 17 00:00:00 2001
From: Gary Tierney <gary.tierney@gmx.com>
Date: Thu, 23 Aug 2018 22:55:44 +0100
Subject: [PATCH] Use travis built-in SonarCloud support

---
 .travis.yml                                   |  8 +++++++-
 build.gradle                                  |  2 +-
 gradle/{jacoco.gradle => quality-gate.gradle} | 18 ++++++++++++++++--
 3 files changed, 24 insertions(+), 4 deletions(-)
 rename gradle/{jacoco.gradle => quality-gate.gradle} (74%)

diff --git a/.travis.yml b/.travis.yml
index a7729fe3..e1fddb4e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,16 @@
 language: java
 jdk:
   - oraclejdk8
+
+addons:
+  sonarcloud:
+    organization: "github-apollo-rsps"
+
 after_success:
   - ./gradlew jacocoTestReport
   - bash <(curl -s https://codecov.io/bash)
-  - ./gradlew -Dsonar.organization=github-apollo-rsps -Dsonar.host.url=https://sonarcloud.io -Dsonar.login="$SONARCLOUD_TOKEN" sonarqube
+  - git fetch --unshallow
+  - ./gradlew -Dsonar.host.url=https://sonarcloud.io -Dsonar.login="$SONAR_TOKEN" sonarqube
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
   - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
diff --git a/build.gradle b/build.gradle
index cd99f545..5cee3c2e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,5 +17,5 @@ allprojects {
 }
 
 apply from: 'gradle/properties.gradle'
-apply from: 'gradle/jacoco.gradle'
+apply from: 'gradle/quality-gate.gradle'
 apply from: 'gradle/wrapper.gradle'
\ No newline at end of file
diff --git a/gradle/jacoco.gradle b/gradle/quality-gate.gradle
similarity index 74%
rename from gradle/jacoco.gradle
rename to gradle/quality-gate.gradle
index 4fee3f85..bd2a5090 100644
--- a/gradle/jacoco.gradle
+++ b/gradle/quality-gate.gradle
@@ -5,7 +5,6 @@ def testedProjects() {
 }
 
 gradle.projectsEvaluated {
-
     configure(testedProjects()) {
         apply plugin: 'jacoco'
 
@@ -19,11 +18,17 @@ gradle.projectsEvaluated {
         }
 
         test {
+            reports {
+                junitXml.enabled = true
+                html.enabled = false
+            }
+
             jacoco {
                 append = false
                 destinationFile = file("$buildDir/jacoco/jacocoTest.exec")
                 classDumpDir = file("$buildDir/jacoco/classpathdumps")
             }
+
         }
     }
 
@@ -35,7 +40,7 @@ gradle.projectsEvaluated {
 
         reports {
             xml.enabled = true
-            html.enabled = true
+            html.enabled = false
         }
 
         testedProjects().each { subproject ->
@@ -54,5 +59,14 @@ gradle.projectsEvaluated {
         executionData = execData
     }
 
+    sonarqube {
+        properties {
+            property "sonar.organization", "github-apollo-rsps"
+            property "sonar.projectKey", "apollo:org.apollo"
+            property "sonar.projectName", "Apollo RSPS"
+            property "sonar.kotlin.file.suffixes", ".kt,.kts"
+        }
+    }
 
+    project.tasks["sonarqube"].dependsOn(jacocoTestReport)
 }
\ No newline at end of file