SONARKT-372 Improve the integration with Gradle Tooling API in the Gr…

…adle rules (#400)
SonarSource · Dec 13, 2023 · 7f85757 · 7f85757
1 parent 2a75938
commit 7f85757
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 35 deletions.
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -58,7 +58,6 @@ dependencyResolutionManagement {
             library("sonar-regex-parsing", "org.sonarsource.analyzer-commons", "sonar-regex-parsing").versionRef(analyzerCommons)
             library("sonar-xml-parsing", "org.sonarsource.analyzer-commons", "sonar-xml-parsing").versionRef(analyzerCommons)
             library("staxmate", "com.fasterxml.staxmate", "staxmate").versionRef(staxmate)
-            library("gradle-tooling-api", "org.gradle", "gradle-tooling-api").versionRef(gradleToolingApi)
         }
 
         create("utilLibs") {

diff --git a/sonar-kotlin-gradle/build.gradle.kts b/sonar-kotlin-gradle/build.gradle.kts
@@ -17,7 +17,6 @@ dependencies {
     implementation(libs.staxmate)
     implementation(libs.gson)
     implementation(libs.sonar.analyzer.commons.recognizers)
-    implementation(libs.gradle.tooling.api)
 
     implementation(project(":sonar-kotlin-api"))
     implementation(project(":sonar-kotlin-surefire"))

diff --git a/sonar-kotlin-gradle/src/main/java/org/sonarsource/kotlin/gradle/KotlinGradleSensor.kt b/sonar-kotlin-gradle/src/main/java/org/sonarsource/kotlin/gradle/KotlinGradleSensor.kt
@@ -19,8 +19,6 @@
  */
 package org.sonarsource.kotlin.gradle
 
-import org.gradle.tooling.GradleConnector
-import org.gradle.tooling.model.kotlin.dsl.KotlinDslScriptsModel
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.slf4j.LoggerFactory
 import org.sonar.api.batch.fs.FileSystem
@@ -69,23 +67,18 @@ class KotlinGradleSensor(
     override fun getFilesToAnalyse(sensorContext: SensorContext): Iterable<InputFile> {
         val fileSystem: FileSystem = sensorContext.fileSystem()
 
-        val rootDirFile = File(sensorContext.config()[GRADLE_PROJECT_ROOT_PROPERTY].get())
+        val mainFilePredicate = fileSystem.predicates().and(
+            fileSystem.predicates().or(
+                fileSystem.predicates().hasFilename("build.gradle.kts"),
+                fileSystem.predicates().hasFilename("settings.gradle.kts")
+            )
+        )
 
-        checkForMissingGradleSettings(rootDirFile, sensorContext)
-
-        val projectConnection = GradleConnector.newConnector()
-            .forProjectDirectory(rootDirFile)
-            .connect()
-
-        projectConnection.newBuild()
-            .forTasks("prepareKotlinBuildScriptModel")
-            .run()
-
-        val models = projectConnection.getModel(KotlinDslScriptsModel::class.java).scriptModels
-        return models.keys.mapNotNull { file ->
-            val predicate = fileSystem.predicates().hasAbsolutePath(file.absolutePath)
-            fileSystem.inputFile(predicate)
+        sensorContext.config()[GRADLE_PROJECT_ROOT_PROPERTY].ifPresent {
+            checkForMissingGradleSettings(File(it), sensorContext)
         }
+
+        return fileSystem.inputFiles(mainFilePredicate)
     }
 
     private fun checkForMissingGradleSettings(rootDirFile: File, sensorContext: SensorContext) {

diff --git a/sonar-kotlin-plugin/build.gradle.kts b/sonar-kotlin-plugin/build.gradle.kts
@@ -116,7 +116,7 @@ tasks.shadowJar {
     exclude("org/jetbrains/kotlin/org/jline/**")
     exclude("org/jetbrains/kotlin/net/jpountz/**")
     doLast {
-        enforceJarSizeAndCheckContent(shadowJar.get().archiveFile.get().asFile, 39_500_000L, 41_000_000L)
+        enforceJarSizeAndCheckContent(shadowJar.get().archiveFile.get().asFile, 37_500_000L, 38_000_000L)
     }
 }
 

diff --git a/sonar-kotlin-plugin/src/main/java/org/sonarsource/kotlin/plugin/KotlinPlugin.kt b/sonar-kotlin-plugin/src/main/java/org/sonarsource/kotlin/plugin/KotlinPlugin.kt
@@ -63,9 +63,7 @@ class KotlinPlugin : Plugin {
             KotlinProfileDefinition::class.java,
         )
 
-        context.bootConfiguration[GRADLE_PROJECT_ROOT_PROPERTY].ifPresent {
-            context.addExtension(KotlinGradleSensor::class.java)
-        }
+        context.addExtension(KotlinGradleSensor::class.java)
 
         if (context.runtime.product != SonarProduct.SONARLINT) {
             context.addExtensions(

diff --git a/sonar-kotlin-plugin/src/test/java/org/sonarsource/kotlin/plugin/KotlinPluginTest.kt b/sonar-kotlin-plugin/src/test/java/org/sonarsource/kotlin/plugin/KotlinPluginTest.kt
@@ -36,24 +36,15 @@ import java.util.Optional
 @ExperimentalTime
 internal class KotlinPluginTest {
     @Test
-    fun testWithoutGradle() {
-        testSonarQube(17)
-    }
-
-    @Test
-    fun testWithGradle() {
-        testSonarQube(18, mapOf(GRADLE_PROJECT_ROOT_PROPERTY to "../"))
+    fun testSonarQube() {
+        testSonarQube(18)
     }
 
     @Test
     fun testSonarLint() {
-        testSonarLint(4)
+        testSonarLint(5)
     }
 
-    @Test
-    fun testSonarLintWithGradle() {
-        testSonarLint(5, mapOf(GRADLE_PROJECT_ROOT_PROPERTY to "../"))
-    }
 
     private fun testSonarQube(expectedExtensionsCount: Int, overrideProperties: Map<String, String> = emptyMap()) {
         val runtime = SonarRuntimeImpl.forSonarQube(Version.create(7, 9), SonarQubeSide.SCANNER, SonarEdition.COMMUNITY)