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:
@@ -3,19 +3,23 @@ plugins {
|
|||||||
id("jps-compatible")
|
id("jps-compatible")
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
// BUNCH 193: this module is no longer needed since IDEA 2020.1
|
||||||
compileOnly(intellijPluginDep("gradle"))
|
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")
|
|
||||||
|
|||||||
@@ -10,7 +10,9 @@ dependencies {
|
|||||||
compileOnly(project(":idea:idea-jvm"))
|
compileOnly(project(":idea:idea-jvm"))
|
||||||
compileOnly(project(":idea:idea-native")) { isTransitive = false }
|
compileOnly(project(":idea:idea-native")) { isTransitive = false }
|
||||||
compile(project(":idea:kotlin-gradle-tooling"))
|
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"))
|
||||||
compile(project(":compiler:frontend.java"))
|
compile(project(":compiler:frontend.java"))
|
||||||
|
|||||||
@@ -21,7 +21,9 @@ dependencies {
|
|||||||
testRuntimeOnly(project(":nj2k:nj2k-services"))
|
testRuntimeOnly(project(":nj2k:nj2k-services"))
|
||||||
testRuntimeOnly(project(":kotlin-reflect"))
|
testRuntimeOnly(project(":kotlin-reflect"))
|
||||||
testRuntimeOnly(project(":idea:kotlin-gradle-tooling"))
|
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"))
|
testRuntimeOnly(project(":kotlin-gradle-statistics"))
|
||||||
|
|
||||||
testImplementation(intellijPluginDep("gradle"))
|
testImplementation(intellijPluginDep("gradle"))
|
||||||
@@ -46,7 +48,9 @@ dependencies {
|
|||||||
|
|
||||||
testCompileOnly(intellijDep())
|
testCompileOnly(intellijDep())
|
||||||
testCompileOnly(project(":nj2k"))
|
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") }
|
testCompileOnly(intellijDep()) { includeJars("slf4j-api-1.7.25") }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -165,7 +165,10 @@ dependencies {
|
|||||||
gradleToolingModel(project(":plugins:android-extensions-ide")) { isTransitive = false }
|
gradleToolingModel(project(":plugins:android-extensions-ide")) { isTransitive = false }
|
||||||
gradleToolingModel(project(":noarg-ide-plugin")) { isTransitive = false }
|
gradleToolingModel(project(":noarg-ide-plugin")) { isTransitive = false }
|
||||||
gradleToolingModel(project(":allopen-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 }
|
jpsPlugin(project(":kotlin-jps-plugin")) { isTransitive = false }
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user