From 13c73903c3aa10dd694ba5b382dd2a2697002cf0 Mon Sep 17 00:00:00 2001 From: Adam <897017+aSemy@users.noreply.github.com> Date: Fri, 2 Jun 2023 09:33:55 +0200 Subject: [PATCH] only enable SonarQube in :app --- .github/workflows/gradle.yml | 2 +- app/build.gradle.kts | 3 +++ .../conventions/lang/kotlin-multiplatform-base.gradle.kts | 1 - .../main/kotlin/buildsrc/conventions/sonarqube.gradle.kts | 8 ++++---- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 9c25062..bce879c 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -46,4 +46,4 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - run: ./gradlew :sonar --info -Dsonar.verbose=true + run: ./gradlew :app:sonar --info -Dsonar.verbose=true diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 8c24b9e..53beb10 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -20,6 +20,7 @@ import org.jetbrains.dokka.gradle.DokkaTask plugins { buildsrc.conventions.lang.`kotlin-jvm` buildsrc.conventions.publishing + buildsrc.conventions.sonarqube id("application") id("com.github.ben-manes.versions") } @@ -31,6 +32,8 @@ val urlEncoderMainClass = "net.thauvin.erik.urlencoder.UrlEncoder" dependencies { implementation(projects.lib) + kover(projects.lib) + // testImplementation("com.willowtreeapps.assertk:assertk-jvm:0.25") testImplementation("org.junit.jupiter:junit-jupiter:5.9.1") } diff --git a/buildSrc/src/main/kotlin/buildsrc/conventions/lang/kotlin-multiplatform-base.gradle.kts b/buildSrc/src/main/kotlin/buildsrc/conventions/lang/kotlin-multiplatform-base.gradle.kts index 547d24e..3a98de0 100644 --- a/buildSrc/src/main/kotlin/buildsrc/conventions/lang/kotlin-multiplatform-base.gradle.kts +++ b/buildSrc/src/main/kotlin/buildsrc/conventions/lang/kotlin-multiplatform-base.gradle.kts @@ -18,7 +18,6 @@ plugins { kotlin("multiplatform") id("io.gitlab.arturbosch.detekt") id("org.jetbrains.kotlinx.kover") - id("org.sonarqube") } diff --git a/buildSrc/src/main/kotlin/buildsrc/conventions/sonarqube.gradle.kts b/buildSrc/src/main/kotlin/buildsrc/conventions/sonarqube.gradle.kts index 32d270b..13650f3 100644 --- a/buildSrc/src/main/kotlin/buildsrc/conventions/sonarqube.gradle.kts +++ b/buildSrc/src/main/kotlin/buildsrc/conventions/sonarqube.gradle.kts @@ -33,10 +33,10 @@ plugins { id("org.jetbrains.kotlinx.kover") } -if (project != rootProject) { - logger.warn("The SonarQube convention plugin should only be applied to the root project") - // https://docs.sonarqube.org/latest/analyzing-source-code/scanners/sonarscanner-for-gradle/#analyzing-multi-project-builds -} +//if (project != rootProject) { +// logger.warn("The SonarQube convention plugin should only be applied to the root project") +// // https://docs.sonarqube.org/latest/analyzing-source-code/scanners/sonarscanner-for-gradle/#analyzing-multi-project-builds +//} sonarqube { properties {