Updated build script

w3stling · Aug 28, 2023 · d9ee5bf · d9ee5bf
1 parent 36ef99f
commit d9ee5bf
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -118,7 +118,7 @@ jobs:
           echo "Next version: ${{ needs.build.outputs.next-version }}"
 
       - name: Analyze code 🔎️
-        run: ./gradlew test jacocoTestReport sonarqube --info -Dsonar.projectVersion=${{ needs.build.outputs.next-version }}-SNAPSHOT
+        run: ./gradlew test jacocoTestReport sonar --info -Dsonar.projectVersion=${{ needs.build.outputs.next-version }}-SNAPSHOT
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml
@@ -42,7 +42,7 @@ jobs:
         uses: gradle/wrapper-validation-action@v1
 
       - name: Build and test 🏗
-        run: ./gradlew test jacocoTestReport sonarqube
+        run: ./gradlew test jacocoTestReport sonar
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

diff --git a/build.gradle b/build.gradle
@@ -57,7 +57,6 @@ jacoco {
 jacocoTestReport {
     reports {
         xml.required = true
-        xml.outputLocation = file("${buildDir}/reports/jacoco/report.xml")
     }
 }
 
@@ -110,7 +109,7 @@ signing {
     sign publishing.publications.mavenJava
 }
 
-sonarqube {
+sonar {
     properties {
         property "sonar.projectKey", "w3stling_rssreader"
         property "sonar.organization", "w3stling"