(WIP) cleanup dependencies

SonarSource · Nov 28, 2024 · 7d1370b · 7d1370b
1 parent 6c4600d
commit 7d1370b
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 31 deletions.
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -810,29 +810,29 @@
             <sha256 value="2ff6e25ce9d8b3bc43423d5552bbe6e3ba1e37f588601e3b651d240a06aec5d2" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="analysis-api-platform-interface-for-ide" version="2.0.21">
-         <artifact name="analysis-api-platform-interface-for-ide-2.0.21.jar">
-            <sha256 value="91f42f11a73ebd5de4c1c654abe1a5127568c30a3ef41ac72017fc3275fad56b" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="analysis-api-for-ide" version="2.0.21">
+         <artifact name="analysis-api-for-ide-2.0.21.jar">
+            <sha256 value="3a9436ea39d53eb6686557124a26a914747b1b87acf93fe93d88d8df3db9c467" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="analysis-api-standalone-for-ide" version="2.0.21">
-         <artifact name="analysis-api-standalone-for-ide-2.0.21.jar">
-            <sha256 value="6045d797d9b64f238e13d75ea9b7de07ca76f8b7a7376a1ba0bde617c32ae2f7" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="analysis-api-impl-base-for-ide" version="2.0.21">
+         <artifact name="analysis-api-impl-base-for-ide-2.0.21.jar">
+            <sha256 value="507088828a8cc64d727954ded1ba752fb9076d770578c41b892fb70c263af2d6" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="high-level-api-fir-for-ide" version="2.0.21">
-         <artifact name="high-level-api-fir-for-ide-2.0.21.jar">
+      <component group="org.jetbrains.kotlin" name="analysis-api-k2-for-ide" version="2.0.21">
+         <artifact name="analysis-api-k2-for-ide-2.0.21.jar">
             <sha256 value="7bdd4d25d5ab7e2e79ff101ca1827ab67d4da3dfab69fd77ce5de37f1c5cdcb0" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="high-level-api-for-ide" version="2.0.21">
-         <artifact name="high-level-api-for-ide-2.0.21.jar">
-            <sha256 value="3a9436ea39d53eb6686557124a26a914747b1b87acf93fe93d88d8df3db9c467" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="analysis-api-platform-interface-for-ide" version="2.0.21">
+         <artifact name="analysis-api-platform-interface-for-ide-2.0.21.jar">
+            <sha256 value="91f42f11a73ebd5de4c1c654abe1a5127568c30a3ef41ac72017fc3275fad56b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.jetbrains.kotlin" name="high-level-api-impl-base-for-ide" version="2.0.21">
-         <artifact name="high-level-api-impl-base-for-ide-2.0.21.jar">
-            <sha256 value="507088828a8cc64d727954ded1ba752fb9076d770578c41b892fb70c263af2d6" origin="Generated by Gradle"/>
+      <component group="org.jetbrains.kotlin" name="analysis-api-standalone-for-ide" version="2.0.21">
+         <artifact name="analysis-api-standalone-for-ide-2.0.21.jar">
+            <sha256 value="6045d797d9b64f238e13d75ea9b7de07ca76f8b7a7376a1ba0bde617c32ae2f7" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.jetbrains.kotlin" name="kotlin-android-extensions" version="1.9.23">

diff --git a/sonar-kotlin-api/build.gradle.kts b/sonar-kotlin-api/build.gradle.kts
@@ -3,27 +3,25 @@ plugins {
 }
 
 dependencies {
-    // TODO https://github.com/JetBrains/kotlin/commit/3ad9798a17ad9eb68cdb1e9f8f1a69584151bfd4
     listOf(
-        // TODO high-level-api => analysis-api ?
-        "org.jetbrains.kotlin:high-level-api-for-ide",
-        "org.jetbrains.kotlin:analysis-api-fe10-for-ide",
-//        "org.jetbrains.kotlin:analysis-api-k2-for-ide", // not needed ?
-        // TODO high-level-api => analysis-api-k2 ?
-        "org.jetbrains.kotlin:high-level-api-fir-for-ide", // needed for K2
-//        "org.jetbrains.kotlin:high-level-api-for-ide", // not needed ?
-        "org.jetbrains.kotlin:low-level-api-fir-for-ide", // needed for K2
-//        "org.jetbrains.kotlin:analysis-project-structure-for-ide", // not needed ?
-        "org.jetbrains.kotlin:symbol-light-classes-for-ide",
+        // Source of these artifacts is
+        // https://github.com/JetBrains/kotlin/tree/v2.0.21/prepare/ide-plugin-dependencies
+        // where ones whose name contains "high-level" are deprecated and should not be used - see
+        // https://github.com/JetBrains/kotlin/commit/3ad9798a17ad9eb68cdb1e9f8f1a69584151bfd4
         "org.jetbrains.kotlin:analysis-api-standalone-for-ide",
         "org.jetbrains.kotlin:analysis-api-platform-interface-for-ide",
-        // TODO high-level-api-impl-base => analysis-api-impl-base ?
-        "org.jetbrains.kotlin:high-level-api-impl-base-for-ide"
-//        "org.jetbrains.kotlin:analysis-api-for-ide" // not needed ?
+        "org.jetbrains.kotlin:analysis-api-for-ide", // old name "high-level-api-for-ide"
+        "org.jetbrains.kotlin:analysis-api-impl-base-for-ide", // old name "high-level-api-impl-base"
+        "org.jetbrains.kotlin:analysis-api-fe10-for-ide", // old name "high-level-api-fe10"
+        "org.jetbrains.kotlin:analysis-api-k2-for-ide", // old name "high-level-api-k2"
+        "org.jetbrains.kotlin:low-level-api-fir-for-ide",
+        "org.jetbrains.kotlin:symbol-light-classes-for-ide"
     ).forEach {
         val kotlinVersion: String by project.ext
-        // https://youtrack.jetbrains.com/issue/KT-61639/Standalone-Analysis-API-cannot-find-transitive-dependencies
-        api("$it:$kotlinVersion") { isTransitive = false }
+        api("$it:$kotlinVersion") {
+            // https://youtrack.jetbrains.com/issue/KT-61639/Standalone-Analysis-API-cannot-find-transitive-dependencies
+            isTransitive = false
+        }
     }
 
     compileOnly(libs.sonar.plugin.api)

diff --git a/sonar-kotlin-plugin/build.gradle.kts b/sonar-kotlin-plugin/build.gradle.kts
@@ -102,8 +102,10 @@ tasks.shadowJar {
 //    exclude("org/jetbrains/kotlin/codegen/*.class") // ?
 //    exclude("org/jetbrains/kotlin/backend/**") // ?
     dependencies {
-        exclude(dependency("org.jetbrains.kotlin:high-level-api-fir-for-ide"))
+        // include only K1, and exclude K2 for the time being
+        exclude(dependency("org.jetbrains.kotlin:analysis-api-k2-for-ide"))
         exclude(dependency("org.jetbrains.kotlin:low-level-api-fir-for-ide"))
+        exclude(dependency("org.jetbrains.kotlin:symbol-light-classes-for-ide"))
     }
     doLast {
 //        enforceJarSizeAndCheckContent(shadowJar.get().archiveFile.get().asFile, 52_500_000L, 53_000_000L)