From a493d4e00bfd7525b4bb64ef783c1de94ca4a452 Mon Sep 17 00:00:00 2001 From: Adam <897017+aSemy@users.noreply.github.com> Date: Tue, 6 Jun 2023 01:09:52 +0200 Subject: [PATCH] try fixing Sonar + KMP... --- .../lang/kotlin-multiplatform-jvm.gradle.kts | 11 +++++++++++ .../kotlin/buildsrc/conventions/sonarqube.gradle.kts | 6 ++++++ 2 files changed, 17 insertions(+) diff --git a/buildSrc/src/main/kotlin/buildsrc/conventions/lang/kotlin-multiplatform-jvm.gradle.kts b/buildSrc/src/main/kotlin/buildsrc/conventions/lang/kotlin-multiplatform-jvm.gradle.kts index 6bbef24..e7bc81e 100644 --- a/buildSrc/src/main/kotlin/buildsrc/conventions/lang/kotlin-multiplatform-jvm.gradle.kts +++ b/buildSrc/src/main/kotlin/buildsrc/conventions/lang/kotlin-multiplatform-jvm.gradle.kts @@ -2,6 +2,7 @@ package buildsrc.conventions.lang plugins { id("buildsrc.conventions.lang.kotlin-multiplatform-base") + id("buildsrc.conventions.sonarqube") } kotlin { @@ -9,3 +10,13 @@ kotlin { withJava() } } + + +sonar { + properties { + property("sonar.sources", "src/jvmMain/kotlin") + property("sonar.test", "src/jvmTest/kotlin") + property("sonar.junit.reportPaths", "build/test-results/jvmTest") + property("sonar.surefire.reportsPath", "build/test-results/jvmTest") + } +} diff --git a/buildSrc/src/main/kotlin/buildsrc/conventions/sonarqube.gradle.kts b/buildSrc/src/main/kotlin/buildsrc/conventions/sonarqube.gradle.kts index f55c17e..3365c8b 100644 --- a/buildSrc/src/main/kotlin/buildsrc/conventions/sonarqube.gradle.kts +++ b/buildSrc/src/main/kotlin/buildsrc/conventions/sonarqube.gradle.kts @@ -17,6 +17,7 @@ package buildsrc.conventions +import org.sonarqube.gradle.SonarExtension.SONAR_DEPRECATED_TASK_NAME import org.sonarqube.gradle.SonarTask /** @@ -38,3 +39,8 @@ tasks.withType().configureEach { // workaround for https://github.com/Kotlin/kotlinx-kover/issues/394 dependsOn(tasks.matching { it.name == "koverXmlReport" }) } + +tasks.matching { it.name == SONAR_DEPRECATED_TASK_NAME }.configureEach { + // this task is deprecated, use 'sonar' instead + group = "other" +}