minor gradle cleanup

MoonLightSuite · Jun 16, 2023 · 25d170d · 25d170d
1 parent 2f4f561
commit 25d170d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/build-logic/java-library/build.gradle.kts b/build-logic/java-library/build.gradle.kts
@@ -4,7 +4,7 @@
 // - java version, jvm settings
 // - publishing maven packages
 plugins {
-    `kotlin-dsl`
+    `kotlin-dsl`    // To compile the plugin code
     id("org.sonarqube") version "4.0.0.2929"
 }
 

diff --git a/build-logic/java-library/src/main/kotlin/eu.quanticol.java-library.gradle.kts b/build-logic/java-library/src/main/kotlin/eu.quanticol.java-library.gradle.kts
@@ -62,6 +62,7 @@ tasks.register<Copy>("copyJar") {
 
 // == Sonarqube settings ==
 sonar {
+    // TODO: change project key with `project.name` when sonarcloud is properly configured
     properties {
         property("sonar.projectKey", "MoonLightSuite_MoonLight")
         property("sonar.projectName", "Moonlight")
@@ -73,12 +74,5 @@ sonar {
             "sonar.coverage.jacoco.xmlReportPaths",
             "../build/reports/jacoco/testCodeCoverageReport/testCodeCoverageReport.xml"
         )
-
-//        //TODO: these properties are workarounds to pass multi-project sources to sonarqube
-//        property("sonar.java.sources", "core/src/main/java")
-//        property("sonar.java.tests", "core/src/test/java")
-//        property("sonar.java.binaries", "core/build/classes/java/main")
-        //property("sonar.inclusions", "core/src/main/java/*.java")
-        //property("sonar.java.sources", "core/src/main/java/**/.java")
     }
 }
diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
@@ -9,7 +9,6 @@ pluginManagement {
     }
 
     plugins {
-        `kotlin-dsl` apply false
         kotlin("jvm") version "1.8.10" apply false         // for compiling the docs
         id("org.jetbrains.dokka") version "1.8.20" apply false
     }
@@ -23,6 +22,11 @@ dependencyResolutionManagement {
     }
 }
 
+// Required to remove annoying warning in subprojects
+plugins {
+    `kotlin-dsl` apply false
+}
+
 // We aggregate all the build logic in a single project
 include("java-library")
 include("code-info")