From cccabb2cc98edfd53534a0526ed97bbc95fe97eb Mon Sep 17 00:00:00 2001
From: Fabrice Lecomte <fabrice.lecomte.be@gmail.com>
Date: Fri, 16 Apr 2021 03:14:59 +0200
Subject: [PATCH] improve sonarqube action

---
 .github/workflows/tests.yml                           | 11 ++++++++++-
 build.gradle.kts                                      |  3 +--
 src/main/kotlin/fr/dcproject/common/validation/Url.kt |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 0a89778..5d1385a 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -126,11 +126,20 @@ jobs:
         key: ${{ runner.os }}-sonar
         restore-keys: ${{ runner.os }}-sonar
 
+    - name: Test
+      uses: eskatos/gradle-command-action@v1
+      with:
+        gradle-version: 6.8
+        arguments: test
+
     - name: Build and analyze
+      uses: eskatos/gradle-command-action@v1
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
         SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-      run: ./gradlew build sonarqube --info
+      with:
+        gradle-version: 6.8
+        arguments: sonarqube --info
 
   lint:
     needs: build
diff --git a/build.gradle.kts b/build.gradle.kts
index bee0958..ce5b4b5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -181,8 +181,6 @@ tasks.named<ShadowJar>("shadowJar") {
 }
 
 tasks.sonarqube.configure {
-    dependsOn(tasks.test)
-    dependsOn(tasks.detekt)
     dependsOn(tasks.jacocoTestReport)
 }
 
@@ -313,6 +311,7 @@ tasks.register("testWithDependencies", Test::class) {
     dependsOn(tasks.named("testComposeUp"))
     dependsOn(tasks.ktlintCheck)
     dependsOn(testSql)
+    finalizedBy(tasks.sonarqube) // report is always generated after tests run
 }
 tasks.register("testArticles", Test::class) {
     group = "tests"
diff --git a/src/main/kotlin/fr/dcproject/common/validation/Url.kt b/src/main/kotlin/fr/dcproject/common/validation/Url.kt
index e7e2cc6..320dae2 100644
--- a/src/main/kotlin/fr/dcproject/common/validation/Url.kt
+++ b/src/main/kotlin/fr/dcproject/common/validation/Url.kt
@@ -7,7 +7,7 @@ import java.net.URL
 fun ValidationBuilder<String>.isUrl() =
     addConstraint("is not url") {
         try {
-            val url = URL(it)
+            URL(it)
             true
         } catch (e: MalformedURLException) {
             false