From e29151a1f066a71ffc75d0996779a214f7ab01b5 Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Tue, 4 Sep 2018 23:13:00 +0300 Subject: [PATCH] Apply java plugin to kotlin-compiler project to fool idea import java plugin makes idea import dependencies on this project as source (with empty sources however), this prevents reindexing of kotlin-compiler.jar after build on every change in compiler modules --- prepare/compiler/build.gradle.kts | 15 ++++++--------- prepare/compiler/build.gradle.kts.173 | 15 ++++++--------- prepare/compiler/build.gradle.kts.181 | 15 ++++++--------- 3 files changed, 18 insertions(+), 27 deletions(-) diff --git a/prepare/compiler/build.gradle.kts b/prepare/compiler/build.gradle.kts index e1f9bd325db..939e14ddf1a 100644 --- a/prepare/compiler/build.gradle.kts +++ b/prepare/compiler/build.gradle.kts @@ -7,7 +7,9 @@ import org.gradle.api.file.DuplicatesStrategy description = "Kotlin Compiler" plugins { - maven + // HACK: java plugin makes idea import dependencies on this project as source (with empty sources however), + // this prevents reindexing of kotlin-compiler.jar after build on every change in compiler modules + java } // You can run Gradle with "-Pkotlin.build.proguard=true" to enable ProGuard run on kotlin-compiler.jar (on TeamCity, ProGuard always runs) @@ -25,12 +27,9 @@ val fatSourcesJarContents by configurations.creating val fatJar by configurations.creating val compilerJar by configurations.creating val runtimeJar by configurations.creating -val libraries by configurations.creating - -val compile by configurations.creating { - the() - .conf2ScopeMappings - .addMapping(0, this, COMPILE) +val compile by configurations // maven plugin writes pom compile scope from compile configuration by default +val libraries by configurations.creating { + extendsFrom(compile) } val default by configurations @@ -49,7 +48,6 @@ val compiledModulesSources = compilerModules.map { } dependencies { - // Maven plugin generates pom compile dependencies from compile configuration compile(project(":kotlin-stdlib")) compile(project(":kotlin-script-runtime")) compile(project(":kotlin-reflect")) @@ -120,7 +118,6 @@ val proguard by task { System.setProperty("kotlin-compiler-jar", outputJar.canonicalPath) } - libraryjars(mapOf("filter" to "!META-INF/versions/**"), compile) libraryjars(mapOf("filter" to "!META-INF/versions/**"), libraries) printconfiguration("$buildDir/compiler.pro.dump") diff --git a/prepare/compiler/build.gradle.kts.173 b/prepare/compiler/build.gradle.kts.173 index 0ed65d91f16..970fffd59f8 100644 --- a/prepare/compiler/build.gradle.kts.173 +++ b/prepare/compiler/build.gradle.kts.173 @@ -7,7 +7,9 @@ import org.gradle.api.file.DuplicatesStrategy description = "Kotlin Compiler" plugins { - maven + // HACK: java plugin makes idea import dependencies on this project as source (with empty sources however), + // this prevents reindexing of kotlin-compiler.jar after build on every change in compiler modules + java } // You can run Gradle with "-Pkotlin.build.proguard=true" to enable ProGuard run on kotlin-compiler.jar (on TeamCity, ProGuard always runs) @@ -25,12 +27,9 @@ val fatSourcesJarContents by configurations.creating val fatJar by configurations.creating val compilerJar by configurations.creating val runtimeJar by configurations.creating -val libraries by configurations.creating - -val compile by configurations.creating { - the() - .conf2ScopeMappings - .addMapping(0, this, COMPILE) +val compile by configurations // maven plugin writes pom compile scope from compile configuration by default +val libraries by configurations.creating { + extendsFrom(compile) } val default by configurations @@ -49,7 +48,6 @@ val compiledModulesSources = compilerModules.map { } dependencies { - // Maven plugin generates pom compile dependencies from compile configuration compile(project(":kotlin-stdlib")) compile(project(":kotlin-script-runtime")) compile(project(":kotlin-reflect")) @@ -120,7 +118,6 @@ val proguard by task { System.setProperty("kotlin-compiler-jar", outputJar.canonicalPath) } - libraryjars(mapOf("filter" to "!META-INF/versions/**"), compile) libraryjars(mapOf("filter" to "!META-INF/versions/**"), libraries) printconfiguration("$buildDir/compiler.pro.dump") diff --git a/prepare/compiler/build.gradle.kts.181 b/prepare/compiler/build.gradle.kts.181 index bcd979dae23..9ba6e63c171 100644 --- a/prepare/compiler/build.gradle.kts.181 +++ b/prepare/compiler/build.gradle.kts.181 @@ -7,7 +7,9 @@ import org.gradle.api.file.DuplicatesStrategy description = "Kotlin Compiler" plugins { - maven + // HACK: java plugin makes idea import dependencies on this project as source (with empty sources however), + // this prevents reindexing of kotlin-compiler.jar after build on every change in compiler modules + java } // You can run Gradle with "-Pkotlin.build.proguard=true" to enable ProGuard run on kotlin-compiler.jar (on TeamCity, ProGuard always runs) @@ -25,12 +27,9 @@ val fatSourcesJarContents by configurations.creating val fatJar by configurations.creating val compilerJar by configurations.creating val runtimeJar by configurations.creating -val libraries by configurations.creating - -val compile by configurations.creating { - the() - .conf2ScopeMappings - .addMapping(0, this, COMPILE) +val compile by configurations // maven plugin writes pom compile scope from compile configuration by default +val libraries by configurations.creating { + extendsFrom(compile) } val default by configurations @@ -49,7 +48,6 @@ val compiledModulesSources = compilerModules.map { } dependencies { - // Maven plugin generates pom compile dependencies from compile configuration compile(project(":kotlin-stdlib")) compile(project(":kotlin-script-runtime")) compile(project(":kotlin-reflect")) @@ -120,7 +118,6 @@ val proguard by task { System.setProperty("kotlin-compiler-jar", outputJar.canonicalPath) } - libraryjars(mapOf("filter" to "!META-INF/versions/**"), compile) libraryjars(mapOf("filter" to "!META-INF/versions/**"), libraries) printconfiguration("$buildDir/compiler.pro.dump")