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

Because gradle-6.1.jar is now bundled into idea-gradle plugin
This commit is contained in:
Natalia Selezneva
2020-03-04 14:21:50 +03:00
parent 33368590e4
commit 04c924a119
10 changed files with 31 additions and 18 deletions
+18 -14
View File
@@ -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() }
}
runtimeJar()
sourcesJar()
javadocJar()
apply(from = "$rootDir/gradle/kotlinPluginPublication.gradle.kts")
}
sourceSets {
"main" { projectDefault() }
"test" { projectDefault() }
}
runtimeJar()
sourcesJar()
javadocJar()
apply(from = "$rootDir/gradle/kotlinPluginPublication.gradle.kts")
+3 -1
View File
@@ -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"))
+6 -2
View File
@@ -21,7 +21,9 @@ dependencies {
testRuntimeOnly(project(":nj2k:nj2k-services"))
testRuntimeOnly(project(":kotlin-reflect"))
testRuntimeOnly(project(":idea:kotlin-gradle-tooling"))
testRuntimeOnly(project(":idea:idea-gradle-tooling-api"))
Platform[193].orLower {
testRuntimeOnly(project(":idea:idea-gradle-tooling-api"))
}
testRuntimeOnly(project(":kotlin-gradle-statistics"))
testImplementation(intellijPluginDep("gradle"))
@@ -46,7 +48,9 @@ dependencies {
testCompileOnly(intellijDep())
testCompileOnly(project(":nj2k"))
testCompileOnly(project(":idea:idea-gradle-tooling-api"))
Platform[193].orLower {
testCompileOnly(project(":idea:idea-gradle-tooling-api"))
}
testCompileOnly(intellijDep()) { includeJars("slf4j-api-1.7.25") }
}
+4 -1
View File
@@ -165,7 +165,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 }