Remove idea-gradle-tooling-api.jar from IDEA 2020

Because gradle-6.1.jar is now bundled into idea-gradle plugin (cherry picked from commit 04c924a)
JetBrains · Mar 18, 2020 · 703be29 · 703be29
1 parent 5519806
commit 703be29
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 13 deletions.
diff --git a/idea/idea-gradle-tooling-api/build.gradle.kts b/idea/idea-gradle-tooling-api/build.gradle.kts
@@ -3,19 +3,23 @@ plugins {
     id("jps-compatible")
 }
 
-dependencies {
-    compileOnly(intellijPluginDep("gradle"))
-}
+// BUNCH 193: this module is no longer needed since IDEA 2020.1
+Platform[193].orLower {
+    dependencies {
+        compileOnly(intellijPluginDep("gradle"))
+    }
 
-sourceSets {
-    "main" { projectDefault() }
-    "test" { projectDefault() }
-}
+    sourceSets {
+        "main" { projectDefault() }
+        "test" { projectDefault() }
+    }
 
-runtimeJar()
+    runtimeJar()
 
-sourcesJar()
+    sourcesJar()
 
-javadocJar()
+    javadocJar()
+
+    apply(from = "$rootDir/gradle/kotlinPluginPublication.gradle.kts")
+}
 
-apply(from = "$rootDir/gradle/kotlinPluginPublication.gradle.kts")
diff --git a/idea/idea-gradle-tooling-api/src/org/gradle/tooling/model/kotlin/dsl/EditorPosition.java.201 b/idea/idea-gradle-tooling-api/src/org/gradle/tooling/model/kotlin/dsl/EditorPosition.java.201
diff --git a/idea/idea-gradle-tooling-api/src/org/gradle/tooling/model/kotlin/dsl/EditorReport.java.201 b/idea/idea-gradle-tooling-api/src/org/gradle/tooling/model/kotlin/dsl/EditorReport.java.201
diff --git a/...-gradle-tooling-api/src/org/gradle/tooling/model/kotlin/dsl/EditorReportSeverity.java.201 b/...-gradle-tooling-api/src/org/gradle/tooling/model/kotlin/dsl/EditorReportSeverity.java.201
diff --git a/...le-tooling-api/src/org/gradle/tooling/model/kotlin/dsl/KotlinDslModelsParameters.java.201 b/...le-tooling-api/src/org/gradle/tooling/model/kotlin/dsl/KotlinDslModelsParameters.java.201
diff --git a/...-gradle-tooling-api/src/org/gradle/tooling/model/kotlin/dsl/KotlinDslScriptModel.java.201 b/...-gradle-tooling-api/src/org/gradle/tooling/model/kotlin/dsl/KotlinDslScriptModel.java.201
diff --git a/...gradle-tooling-api/src/org/gradle/tooling/model/kotlin/dsl/KotlinDslScriptsModel.java.201 b/...gradle-tooling-api/src/org/gradle/tooling/model/kotlin/dsl/KotlinDslScriptsModel.java.201
diff --git a/idea/idea-gradle/build.gradle.kts b/idea/idea-gradle/build.gradle.kts
@@ -10,7 +10,9 @@ dependencies {
     compileOnly(project(":idea:idea-jvm"))
     compileOnly(project(":idea:idea-native")) { isTransitive = false }
     compile(project(":idea:kotlin-gradle-tooling"))
-    compile(project(":idea:idea-gradle-tooling-api"))
+    Platform[193].orLower {
+        compile(project(":idea:idea-gradle-tooling-api"))
+    }
 
     compile(project(":compiler:frontend"))
     compile(project(":compiler:frontend.java"))

diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts
@@ -162,7 +162,10 @@ dependencies {
     gradleToolingModel(project(":plugins:android-extensions-ide")) { isTransitive = false }
     gradleToolingModel(project(":noarg-ide-plugin")) { isTransitive = false }
     gradleToolingModel(project(":allopen-ide-plugin")) { isTransitive = false }
-    gradleToolingModel(project(":idea:idea-gradle-tooling-api")) { isTransitive = false }
+
+    Platform[193].orLower {
+        gradleToolingModel(project(":idea:idea-gradle-tooling-api")) { isTransitive = false }
+    }
 
     jpsPlugin(project(":kotlin-jps-plugin")) { isTransitive = false }