From e72558be5cf6c58b5817f168a9141a2ed68187f8 Mon Sep 17 00:00:00 2001
From: Oscar Spruit <oscar.spruit@adyen.com>
Date: Thu, 23 May 2024 15:28:43 +0200
Subject: [PATCH 1/2] Update sonar

---
 dependencies.gradle              |  2 +-
 gradle/verification-metadata.xml | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/dependencies.gradle b/dependencies.gradle
index 0ff97b11a0..56962668d7 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -31,7 +31,7 @@ ext {
     detekt_version = "1.23.6"
     jacoco_version = '0.8.12'
     ktlint_version = '1.2.1'
-    sonarqube_version = '4.4.1.3373'
+    sonarqube_version = '5.0.0.4638'
 
     // Android Dependencies
     annotation_version = "1.7.1"
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index cf135a92b5..625c02a654 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -9730,6 +9730,11 @@
             <sha256 value="37b316009dad2438e5102910e54ddb414a755cab23213d7dc9a712e35d8eabbf" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.sonarqube" name="org.sonarqube.gradle.plugin" version="5.0.0.4638">
+         <artifact name="org.sonarqube.gradle.plugin-5.0.0.4638.pom">
+            <sha256 value="46558329c0f7c7cedb888778cbab2e9e327fc12ced6b4f4f55032f2bf9925b79" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.sonarsource.parent" name="parent" version="59.0.29">
          <artifact name="parent-59.0.29.pom">
             <sha256 value="7d2dc7aec9f250ede1c8cdc4cdb563b2ed6c49e209b70024f9f62822d876952a" origin="Generated by Gradle"/>
@@ -9756,6 +9761,14 @@
             <sha256 value="11206426c9be18ce39741b8c7d1721bfe414e99d964f69153c1796f1fb837bcc" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.sonarsource.scanner.gradle" name="sonarqube-gradle-plugin" version="5.0.0.4638">
+         <artifact name="sonarqube-gradle-plugin-5.0.0.4638.jar">
+            <sha256 value="9fab1df676229a432cff70f168497c5ff12d8c11776b6a54ac3de862094670cb" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="sonarqube-gradle-plugin-5.0.0.4638.module">
+            <sha256 value="1cc22402989d76af0905ab0d29f23532161c78b0099327d37e5637e4b1425228" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.sonatype.oss" name="oss-parent" version="4">
          <artifact name="oss-parent-4.pom">
             <sha256 value="c513995cf019d9213d4fda666589937b2bf1bea5c4cdd337e6170e80b18406ee" origin="Generated by Gradle"/>

From f7700739633dadc7378a003fb13663fd422d6a80 Mon Sep 17 00:00:00 2001
From: Oscar Spruit <oscar.spruit@adyen.com>
Date: Thu, 23 May 2024 15:43:49 +0200
Subject: [PATCH 2/2] Split sonar command

This makes sure sonar runs after the other tasks are completed
---
 .github/workflows/sonar_cloud.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/sonar_cloud.yml b/.github/workflows/sonar_cloud.yml
index 9974c6f56c..9d744b7798 100644
--- a/.github/workflows/sonar_cloud.yml
+++ b/.github/workflows/sonar_cloud.yml
@@ -35,4 +35,6 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: ./gradlew detekt assDeb jacocoDebugTestReport lintDeb sonar -Dsonar.gradle.skipCompile=true -Pstrip-resources=true
+        run: |
+          ./gradlew detekt assDeb jacocoDebugTestReport lintDeb -Pstrip-resources=true
+          ./gradlew sonar