diff --git a/idea/idea-gradle-tooling-api/build.gradle.kts b/idea/idea-gradle-tooling-api/build.gradle.kts index 0bef85815ba..ed9d74a21ff 100644 --- 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() } + } + + 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") 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 new file mode 100644 index 00000000000..e69de29bb2d 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 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/idea-gradle-tooling-api/src/org/gradle/tooling/model/kotlin/dsl/EditorReportSeverity.java.201 b/idea/idea-gradle-tooling-api/src/org/gradle/tooling/model/kotlin/dsl/EditorReportSeverity.java.201 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/idea-gradle-tooling-api/src/org/gradle/tooling/model/kotlin/dsl/KotlinDslModelsParameters.java.201 b/idea/idea-gradle-tooling-api/src/org/gradle/tooling/model/kotlin/dsl/KotlinDslModelsParameters.java.201 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/idea-gradle-tooling-api/src/org/gradle/tooling/model/kotlin/dsl/KotlinDslScriptModel.java.201 b/idea/idea-gradle-tooling-api/src/org/gradle/tooling/model/kotlin/dsl/KotlinDslScriptModel.java.201 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/idea-gradle-tooling-api/src/org/gradle/tooling/model/kotlin/dsl/KotlinDslScriptsModel.java.201 b/idea/idea-gradle-tooling-api/src/org/gradle/tooling/model/kotlin/dsl/KotlinDslScriptsModel.java.201 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/idea/idea-gradle/build.gradle.kts b/idea/idea-gradle/build.gradle.kts index e30e03720ab..1b9e9090aae 100644 --- 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/idea/performanceTests/build.gradle.kts b/idea/performanceTests/build.gradle.kts index 47392758774..82991ee245f 100644 --- a/idea/performanceTests/build.gradle.kts +++ b/idea/performanceTests/build.gradle.kts @@ -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") } } diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts index 1fe6e32aac4..dcf86c84358 100644 --- a/prepare/idea-plugin/build.gradle.kts +++ b/prepare/idea-plugin/build.gradle.kts @@ -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 }