diff --git a/app/build.gradle.kts b/app/build.gradle.kts index f7d9ea5..5529ba5 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -20,7 +20,6 @@ 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") } @@ -111,7 +110,3 @@ publishing { } } } - -sonar { - isSkipProject = true -} diff --git a/build.gradle.kts b/build.gradle.kts index a08d5ee..3636913 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -22,14 +22,3 @@ plugins { group = "net.thauvin.erik" version = "1.4.0-SNAPSHOT" - -sonarqube { - properties { - property("sonar.projectName", rootProject.name) - property("sonar.projectKey", "ethauvin_${rootProject.name}") - property("sonar.organization", "ethauvin-github") - property("sonar.host.url", "https://sonarcloud.io") - property("sonar.sourceEncoding", "UTF-8") - property("sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/kover/report.xml") - } -} diff --git a/buildSrc/src/main/kotlin/buildsrc/conventions/sonarqube.gradle.kts b/buildSrc/src/main/kotlin/buildsrc/conventions/sonarqube.gradle.kts index eae56e9..14c29ec 100644 --- a/buildSrc/src/main/kotlin/buildsrc/conventions/sonarqube.gradle.kts +++ b/buildSrc/src/main/kotlin/buildsrc/conventions/sonarqube.gradle.kts @@ -32,17 +32,17 @@ plugins { id("org.sonarqube") id("org.jetbrains.kotlinx.kover") } -// -//sonarqube { -// properties { -// property("sonar.projectName", rootProject.name) -// property("sonar.projectKey", "ethauvin_${rootProject.name}") -// property("sonar.organization", "ethauvin-github") -// property("sonar.host.url", "https://sonarcloud.io") -// property("sonar.sourceEncoding", "UTF-8") -// property("sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/kover/report.xml") -// } -//} + +sonarqube { + properties { + property("sonar.projectName", rootProject.name) + property("sonar.projectKey", "ethauvin_${rootProject.name}") + property("sonar.organization", "ethauvin-github") + property("sonar.host.url", "https://sonarcloud.io") + property("sonar.sourceEncoding", "UTF-8") + property("sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/kover/report.xml") + } +} tasks.withType().configureEach { // workaround for https://github.com/Kotlin/kotlinx-kover/issues/394 diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts index 3f14a3b..aeb5eb3 100644 --- a/lib/build.gradle.kts +++ b/lib/build.gradle.kts @@ -79,7 +79,3 @@ publishing { } } } - -sonar { -// isSkipProject = true -}