WIP

SonarSource · Jan 30, 2025 · f35fb8d · f35fb8d
1 parent 96db204
commit f35fb8d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -167,15 +167,15 @@ qa_plug_pub_lin_task:
     GRADLE_TASK: ":its:plugin:test"
     matrix:
       - SQ_VERSION: "DEV"
-      - SQ_VERSION: "LATEST_RELEASE[9.9]"
+      - SQ_VERSION: "LATEST_RELEASE[25.1]"
       - SQ_VERSION: "LATEST_RELEASE"
   <<: *LINUX_6_CPU_12G_JAVA_17
   <<: *GRADLE_ITS_TEMPLATE
 
 qa_plug_pub_win_task:
   <<: *QA_TASK_FILTER
   env:
-    SQ_VERSION: LATEST_RELEASE[9.9]
+    SQ_VERSION: LATEST_RELEASE
     GRADLE_TASK: ":its:plugin:test"
     ITS_PROJECT: "plugin"
   <<: *WINDOWS_16_CPU_32G

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
@@ -19,7 +19,6 @@ package org.sonarsource.kotlin.plugin
 import org.sonar.api.Plugin
 import org.sonar.api.SonarProduct
 import org.sonar.api.config.PropertyDefinition
-import org.sonar.api.resources.Qualifiers
 import org.sonarsource.kotlin.api.common.KOTLIN_FILE_SUFFIXES_DEFAULT_VALUE
 import org.sonarsource.kotlin.api.common.KOTLIN_FILE_SUFFIXES_KEY
 import org.sonarsource.kotlin.api.common.KotlinLanguage
@@ -79,30 +78,30 @@ class KotlinPlugin : Plugin {
                     .subCategory(GENERAL)
                     .category(KOTLIN_CATEGORY)
                     .multiValues(true)
-                    .onQualifiers(Qualifiers.PROJECT)
+                    .onConfigScopes(setOf(PropertyDefinition.ConfigScope.PROJECT))
                     .build(),
                 PropertyDefinition.builder(DetektSensor.REPORT_PROPERTY_KEY)
                     .name("Detekt Report Files")
                     .description("Paths (absolute or relative) to checkstyle xml files with Detekt issues.")
                     .category(EXTERNAL_ANALYZERS_CATEGORY)
                     .subCategory(KOTLIN_SUBCATEGORY)
-                    .onQualifiers(Qualifiers.PROJECT)
+                    .onConfigScopes(setOf(PropertyDefinition.ConfigScope.PROJECT))
                     .multiValues(true)
                     .build(),
                 PropertyDefinition.builder(AndroidLintSensor.REPORT_PROPERTY_KEY)
                     .name("Android Lint Report Files")
                     .description("Paths (absolute or relative) to xml files with Android Lint issues.")
                     .category(EXTERNAL_ANALYZERS_CATEGORY)
                     .subCategory(ANDROID_SUBCATEGORY)
-                    .onQualifiers(Qualifiers.PROJECT)
+                    .onConfigScopes(setOf(PropertyDefinition.ConfigScope.PROJECT))
                     .multiValues(true)
                     .build(),
                 PropertyDefinition.builder(KtlintSensor.REPORT_PROPERTY_KEY)
                     .name("Ktlint Report Files")
                     .description("Paths (absolute or relative) to checkstyle xml or json files with Ktlint issues.")
                     .category(EXTERNAL_ANALYZERS_CATEGORY)
                     .subCategory(KOTLIN_SUBCATEGORY)
-                    .onQualifiers(Qualifiers.PROJECT)
+                    .onConfigScopes(setOf(PropertyDefinition.ConfigScope.PROJECT))
                     .multiValues(true)
                     .build()
             )