From 7e21573cf488886baa5b8908c65b9cae0ab49182 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Fri, 8 Dec 2017 23:19:21 +0100 Subject: [PATCH] Convert the rest of the project to intellij repo prepared in buildSrc --- build-common/build.gradle.kts | 14 +- build.gradle.kts | 1 - buildSrc/build.gradle.kts | 3 - .../intellij-sdk/build.gradle.kts | 10 +- buildSrc/src/main/kotlin/instrument.kt | 12 +- .../src/main/kotlin/intellijPluginHelpers.kt | 89 +---- compiler/frontend.script/build.gradle.kts | 2 +- compiler/tests-java8/build.gradle.kts | 1 - eval4j/build.gradle.kts | 14 +- generators/build.gradle.kts | 17 +- generators/test-generator/build.gradle.kts | 9 +- gradle/project-schema.json | 304 +++++------------- idea-runner/build.gradle.kts | 23 +- idea/build.gradle.kts | 73 ++--- idea/formatter/build.gradle.kts | 9 +- idea/ide-common/build.gradle.kts | 13 +- idea/idea-android/build.gradle.kts | 51 ++- .../build.gradle.kts | 18 +- idea/idea-core/build.gradle.kts | 16 +- idea/idea-gradle/build.gradle.kts | 44 ++- idea/idea-jps-common/build.gradle.kts | 13 +- idea/idea-jvm/build.gradle.kts | 25 +- idea/idea-maven/build.gradle.kts | 36 +-- idea/idea-test-framework/build.gradle.kts | 9 +- idea/kotlin-gradle-tooling/build.gradle.kts | 21 +- j2k/build.gradle.kts | 20 +- jps-plugin/build.gradle.kts | 23 +- js/js.ast/build.gradle.kts | 13 +- js/js.dce/build.gradle.kts | 11 +- js/js.frontend/build.gradle.kts | 13 +- js/js.parser/build.gradle.kts | 11 +- js/js.serializer/build.gradle.kts | 11 +- js/js.tests/build.gradle.kts | 16 +- js/js.translator/build.gradle.kts | 13 +- .../tools/kotlin-script-util/build.gradle.kts | 11 +- plugins/allopen/allopen-cli/build.gradle.kts | 14 +- plugins/allopen/allopen-ide/build.gradle.kts | 15 +- .../build.gradle.kts | 26 +- .../android-extensions-idea/build.gradle.kts | 43 +-- .../android-extensions-jps/build.gradle.kts | 32 +- .../build.gradle.kts | 15 +- plugins/kapt3/kapt3-compiler/build.gradle.kts | 21 +- plugins/kapt3/kapt3-idea/build.gradle.kts | 15 +- plugins/lint/build.gradle.kts | 24 +- plugins/noarg/noarg-cli/build.gradle.kts | 13 +- plugins/noarg/noarg-ide/build.gradle.kts | 15 +- .../sam-with-receiver-cli/build.gradle.kts | 13 +- .../source-sections-compiler/build.gradle.kts | 16 +- plugins/uast-kotlin-idea/build.gradle.kts | 9 +- plugins/uast-kotlin/build.gradle.kts | 24 +- .../build.gradle.kts | 11 +- prepare/compiler/build.gradle.kts | 19 +- test-instrumenter/build.gradle.kts | 13 +- ultimate/build.gradle.kts | 116 +++---- ultimate/ultimate-runner/build.gradle.kts | 25 +- 55 files changed, 451 insertions(+), 997 deletions(-) diff --git a/build-common/build.gradle.kts b/build-common/build.gradle.kts index 0a611eb6d99..dec0d91e15a 100644 --- a/build-common/build.gradle.kts +++ b/build-common/build.gradle.kts @@ -3,8 +3,6 @@ description = "Kotlin Build Common" apply { plugin("kotlin") } -configureIntellijPlugin() - dependencies { compileOnly(project(":core:util.runtime")) compileOnly(project(":compiler:util")) @@ -12,21 +10,17 @@ dependencies { compileOnly(project(":compiler:frontend.java")) compileOnly(project(":js:js.serializer")) compileOnly(project(":js:js.frontend")) + compileOnly(intellijDep()) { includeJars("annotations", "asm-all", "trove4j", "util") } compileOnly(project(":kotlin-reflect-api")) + testCompileOnly(project(":compiler:cli-common")) testCompile(projectTests(":compiler:tests-common")) testCompile(commonDep("junit:junit")) testCompile(protobufFull()) testCompile(projectDist(":kotlin-stdlib")) - testCompileOnly(ideaSdkDeps("openapi")) - testRuntime(projectDist(":kotlin-reflect")) -} + testCompileOnly(intellijDep()) { includeJars("openapi") } -afterEvaluate { - dependencies { - compileOnly(intellij { include("annotations.jar", "asm-all.jar", "trove4j.jar", "util.jar") }) - testCompileOnly(intellij { include("openapi.jar") }) - } + testRuntime(projectDist(":kotlin-reflect")) } sourceSets { diff --git a/build.gradle.kts b/build.gradle.kts index dd018fc3890..4688536752c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -114,7 +114,6 @@ extra["JDK_17"] = jdkPath("1.7") extra["JDK_18"] = jdkPath("1.8") extra["JDK_9"] = jdkPathIfFound("9") -extra["versions.intellij"] = "IC-172.4343.14" extra["versions.intellijSdk"] = "172.4343.14" extra["versions.androidBuildTools"] = "r23.0.1" extra["versions.protobuf-java"] = "2.6.1" diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index cb339856b8d..c80b51e7f4b 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -43,8 +43,6 @@ repositories { maven(url = it) } maven(url = "https://dl.bintray.com/kotlin/kotlin-dev") // for dex-method-list - maven(url = "https://oss.sonatype.org/content/repositories/snapshots/") // for intellij plugin - maven(url = "http://dl.bintray.com/jetbrains/intellij-plugin-service") // for intellij plugin maven(url = "https://repo.gradle.org/gradle/libs-releases-local") // for native-platform jcenter() } @@ -58,7 +56,6 @@ dependencies { // compile("org.jetbrains.kotlin:kotlin-gradle-plugin:${rootProject.extra["bootstrap_kotlin_version"]}") compile("com.github.jengelman.gradle.plugins:shadow:${property("versions.shadow")}") compile("org.ow2.asm:asm-all:6.0_BETA") - compile("org.jetbrains.intellij.plugins:gradle-intellij-plugin:${property("versions.intellij-plugin")}") } samWithReceiver { diff --git a/buildSrc/prepare-deps/intellij-sdk/build.gradle.kts b/buildSrc/prepare-deps/intellij-sdk/build.gradle.kts index c42625ac17c..714b88a4e25 100644 --- a/buildSrc/prepare-deps/intellij-sdk/build.gradle.kts +++ b/buildSrc/prepare-deps/intellij-sdk/build.gradle.kts @@ -59,7 +59,7 @@ val copyIntellijSdkSources by tasks.creating { configureExtractFromConfiguration val copyJpsBuildTest by tasks.creating { configureExtractFromConfigurationTask(`jps-build-test`) { it.singleFile } } -fun writeIvyXml(moduleName: String, jarFiles: FileCollection, baseDir: File, sourcesJar: File) { +fun writeIvyXml(moduleName: String, fileName: String, jarFiles: FileCollection, baseDir: File, sourcesJar: File) { with(IvyDescriptorFileGenerator(DefaultIvyPublicationIdentity(customDepsOrg, moduleName, intellijVersion))) { addConfiguration(DefaultIvyConfiguration("default")) addConfiguration(DefaultIvyConfiguration("sources")) @@ -71,7 +71,7 @@ fun writeIvyXml(moduleName: String, jarFiles: FileCollection, baseDir: File, sou } val sourcesArtifactName = sourcesJar.name.removeSuffix(".jar").substringBefore("-") addArtifact(DefaultIvyArtifact(sourcesJar, sourcesArtifactName, "jar", "sources", "sources").also { it.conf = "sources" }) - writeTo(File(customDepsRepoModulesDir, "$moduleName.ivy.xml")) + writeTo(File(customDepsRepoModulesDir, "$fileName.ivy.xml")) } } @@ -89,15 +89,15 @@ val prepareIvyXml by tasks.creating { // outputs.files("$repoDir/intellij.plugin.*.ivy.xml") doFirst { val sourcesFile = File(repoDir, "${sources.name}/${sources.singleFile.name}") - writeIvyXml(intellij.name, + writeIvyXml(intellij.name, intellij.name, files("$intellijSdkDir/lib/").filter { !it.name.startsWith("kotlin-") }, File(intellijSdkDir, "lib"), sourcesFile) File(intellijSdkDir, "plugins").listFiles { it: File -> it.isDirectory }.forEach { - writeIvyXml("intellij.plugin.${it.name}", files("$it/lib/"), File(it, "lib"), sourcesFile) + writeIvyXml(it.name, "intellij.plugin.${it.name}", files("$it/lib/"), File(it, "lib"), sourcesFile) } flatDeps.forEach { - writeIvyXml(it.name, files("$repoDir/${it.name}"), File(repoDir, it.name), sourcesFile) + writeIvyXml(it.name, it.name, files("$repoDir/${it.name}"), File(repoDir, it.name), sourcesFile) } } } diff --git a/buildSrc/src/main/kotlin/instrument.kt b/buildSrc/src/main/kotlin/instrument.kt index 439e2aba16f..a26315e5529 100644 --- a/buildSrc/src/main/kotlin/instrument.kt +++ b/buildSrc/src/main/kotlin/instrument.kt @@ -17,6 +17,7 @@ */ import org.gradle.api.Project +import org.gradle.api.artifacts.Configuration import org.gradle.api.artifacts.ProjectDependency import org.gradle.api.file.ConfigurableFileCollection import org.gradle.api.file.FileCollection @@ -51,6 +52,12 @@ fun Project.configureInstrumentation() { } } + val instrumentationClasspathCfg = configurations.create("instrumentationClasspath") + + dependencies { + instrumentationClasspathCfg(intellijDep()) { includeJars("javac2", "jdom", "asm-all", "jgoodies-forms") } + } + afterEvaluate { the().sourceSets.all { sourceSetParam -> // This copy will ignore filters, but they are unlikely to be used. @@ -66,6 +73,7 @@ fun Project.configureInstrumentation() { instrumentTask.apply { dependsOn(sourceSetParam.classesTaskName).onlyIf { !classesDirsCopy.isEmpty } sourceSet = sourceSetParam + instrumentationClasspath = instrumentationClasspathCfg originalClassesDirs = classesDirsCopy output = instrumentedClassesDir } @@ -88,6 +96,8 @@ open class IntelliJInstrumentCodeTask : ConventionTask() { var sourceSet: SourceSet? = null + var instrumentationClasspath: Configuration? = null + @Input var originalClassesDirs: FileCollection? = null @@ -104,7 +114,7 @@ open class IntelliJInstrumentCodeTask : ConventionTask() { output?.deleteRecursively() copyOriginalClasses() - val classpath = project.intellij { include("javac2.jar", "jdom.jar", "asm-all.jar", "jgoodies-forms.jar") } + val classpath = instrumentationClasspath!! ant.withGroovyBuilder { "taskdef"("name" to "instrumentIdeaExtensions", diff --git a/buildSrc/src/main/kotlin/intellijPluginHelpers.kt b/buildSrc/src/main/kotlin/intellijPluginHelpers.kt index 62a63ef2d07..4e1afb69b95 100644 --- a/buildSrc/src/main/kotlin/intellijPluginHelpers.kt +++ b/buildSrc/src/main/kotlin/intellijPluginHelpers.kt @@ -1,24 +1,20 @@ @file:Suppress("unused") // usages in build scripts are not tracked properly -import org.gradle.api.GradleException import org.gradle.api.Project import org.gradle.api.artifacts.ModuleDependency -import org.gradle.api.file.ConfigurableFileCollection -import org.gradle.api.file.FileTree -import org.gradle.api.tasks.util.PatternFilterable -import org.gradle.kotlin.dsl.configure import org.gradle.kotlin.dsl.extra -import org.gradle.kotlin.dsl.the -import org.jetbrains.intellij.IntelliJPluginExtension -import org.jetbrains.intellij.dependency.PluginDependency import org.gradle.api.artifacts.dsl.RepositoryHandler import org.gradle.api.artifacts.repositories.IvyArtifactRepository +private fun Project.intellijRepoDir() = File("${project.rootDir.absoluteFile}/buildSrc/prepare-deps/intellij-sdk/build/repo") + fun RepositoryHandler.intellijSdkRepo(project: Project): IvyArtifactRepository = ivy { - val baseDir = File("${project.rootDir.absoluteFile}/buildSrc/prepare-deps/intellij-sdk/build/repo") + val baseDir = project.intellijRepoDir() setUrl(baseDir) ivyPattern("${baseDir.canonicalPath}/[organisation]/[revision]/[module].ivy.xml") + ivyPattern("${baseDir.canonicalPath}/[organisation]/[revision]/intellij.plugin.[module].ivy.xml") artifactPattern("${baseDir.canonicalPath}/[organisation]/[revision]/[module]/lib/[artifact](-[classifier]).jar") + artifactPattern("${baseDir.canonicalPath}/[organisation]/[revision]/intellij/plugins/[module]/lib/[artifact](-[classifier]).jar") artifactPattern("${baseDir.canonicalPath}/[organisation]/[revision]/[module]/[artifact].jar") artifactPattern("${baseDir.canonicalPath}/[organisation]/[revision]/[module]/[artifact](-[revision])(-[classifier]).jar") artifactPattern("${baseDir.canonicalPath}/[organisation]/[revision]/sources/[artifact]-[revision]-[classifier].[ext]") @@ -28,6 +24,8 @@ fun Project.intellijDep(module: String = "intellij") = "kotlin.build.custom.deps fun Project.intellijCoreDep() = intellijDep("intellij-core") +fun Project.intellijPluginDep(plugin: String) = intellijDep(plugin) + fun ModuleDependency.includeJars(vararg names: String) { names.forEach { artifact { @@ -37,74 +35,11 @@ fun ModuleDependency.includeJars(vararg names: String) { } } -fun ModuleDependency.includeIntellijCoreJarDependencies(project: Project, jarsFilter: (String) -> Boolean = { true }) = - includeJars(*(project.rootProject.extra["IntellijCoreDependenciesJars"] as List).filter { jarsFilter(it) }.toTypedArray()) +fun ModuleDependency.includeIntellijCoreJarDependencies(project: Project) = + includeJars(*(project.rootProject.extra["IntellijCoreDependenciesJars"] as List).toTypedArray()) -fun Project.configureIntellijPlugin(body: (IntelliJPluginExtension.() -> Unit) = {}) { +fun ModuleDependency.includeIntellijCoreJarDependencies(project: Project, jarsFilterPredicate: (String) -> Boolean) = + includeJars(*(project.rootProject.extra["IntellijCoreDependenciesJars"] as List).filter { jarsFilterPredicate(it) }.toTypedArray()) - plugins.apply("org.jetbrains.intellij") +fun Project.intellijRootDir() = File(intellijRepoDir(), "kotlin.build.custom.deps/${rootProject.extra["versions.intellijSdk"]}/intellij") - configure { - version = rootProject.extra["versions.intellij"] as String - instrumentCode = false - configureDefaultDependencies = false - body() - } - - val intellijTasks = listOf("patchPluginXml", "prepareSandbox", "prepareTestingSandbox", - "verifyPlugin", "runIde", "buildPlugin", "publishPlugin") - intellijTasks.forEach { - tasks.findByName(it)?.also { it.onlyIf { false }; tasks.remove(it) } - ?: logger.warn("intellij task $it not found") - } - configurations.findByName("archives")?.artifacts?.clear() -} - -// reimplementation of helpers from intellij plugin, since it is not convenient to use gradle closures from kotlin build scripts - -fun Project.intellij(filter: (PatternFilterable.() -> Unit) = {}): FileTree { - val jars = the().ideaDependency?.jarFiles?.takeIf { it.isNotEmpty() } - ?: throw GradleException("intellij is not (yet) configured. Please note that you should configure intellij dependencies in the afterEvaluate block") - return files(jars).asFileTree.matching { - exclude("**/kotlin-*.jar") - }.matching(filter) -} - -fun Project.intellijPlugins(vararg pluginNames: String): ConfigurableFileCollection { - val selectedPlugins = arrayListOf() - val invalidPlugins = arrayListOf() - for (pluginName in pluginNames) { - val plugin = the().pluginDependencies.find { it.id == pluginName } - if (plugin == null || plugin.jarFiles.isEmpty()) { - invalidPlugins.add(pluginName) - } - else { - selectedPlugins.add(plugin) - } - } - if (invalidPlugins.isNotEmpty()) { - throw GradleException("intellij plugins $invalidPlugins are not (yet) configured or not found. Please note that you should specify plugins in the intellij.plugins property and configure dependencies to them in the afterEvaluate block") - } - return project.files(selectedPlugins.map { it.jarFiles }) -} - -fun Project.intellijPlugin(pluginName: String, filter: (PatternFilterable.() -> Unit) = {}): FileTree { - val pluginDep = the().pluginDependencies.find { it.id == pluginName }?.takeIf { it.jarFiles.isNotEmpty() } - ?: throw GradleException("intellij plugin '$pluginName' is not (yet) configured or not found. Please note that you should specify plugins in the intellij.plugins property and configure dependencies to them in the afterEvaluate block") - return project.files(pluginDep.jarFiles).asFileTree.matching(filter) -} - -fun Project.intellijExtra(extraName: String, filter: (PatternFilterable.() -> Unit) = {}): FileTree { - val extraDep = the().ideaDependency?.extraDependencies?.find { it.name == extraName }?.takeIf { it.jarFiles.isNotEmpty() } - ?: throw GradleException("intellij extra artifact '$extraName' is not (yet) configured or not found. Please note that you should specify extra dependencies in the intellij.extraDependencies property and configure dependencies to them in the afterEvaluate block") - return project.files(extraDep.jarFiles).asFileTree.matching(filter) -} - -// frequent combinations - -fun Project.intellijCoreJar() = intellijExtra("intellij-core") { include("intellij-core.jar") } -fun Project.intellijCoreJarDependencies(filter: (PatternFilterable.() -> Unit) = {}): FileTree = - intellij { - include(rootProject.extra["IntellijCoreDependencies"] as List) - } - .matching(filter) diff --git a/compiler/frontend.script/build.gradle.kts b/compiler/frontend.script/build.gradle.kts index 423de9565c1..e4f09c4663f 100644 --- a/compiler/frontend.script/build.gradle.kts +++ b/compiler/frontend.script/build.gradle.kts @@ -7,7 +7,7 @@ dependencies { compile(project(":compiler:util")) compile(project(":compiler:frontend")) compile(projectDist(":kotlin-stdlib")) - compile(projectDist(":kotlin-reflect-api")) + compile(project(":kotlin-reflect-api")) compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false } compileOnly(intellijCoreDep()) { includeJars("intellij-core") } } diff --git a/compiler/tests-java8/build.gradle.kts b/compiler/tests-java8/build.gradle.kts index 5ca48c856fb..1cc7d8cde77 100644 --- a/compiler/tests-java8/build.gradle.kts +++ b/compiler/tests-java8/build.gradle.kts @@ -4,7 +4,6 @@ apply { plugin("kotlin") } dependencies { testCompile(projectTests(":compiler:tests-common")) - testCompile(projectTests(":compiler")) testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } testCompile(projectTests(":generators:test-generator")) testRuntime(projectDist(":kotlin-reflect")) diff --git a/eval4j/build.gradle.kts b/eval4j/build.gradle.kts index b9b5355a897..dc2d63db4a1 100644 --- a/eval4j/build.gradle.kts +++ b/eval4j/build.gradle.kts @@ -1,22 +1,14 @@ apply { plugin("kotlin") } -configureIntellijPlugin() - dependencies { compile(projectDist(":kotlin-stdlib")) compile(project(":compiler:backend")) -// compile(files(PathUtil.getJdkClassesRootsFromCurrentJre())) // TODO: make this one work instead of the nex one, since it contains more universal logic - compile(files("${System.getProperty("java.home")}/../lib/tools.jar")) + compile(files(toolsJar())) + compileOnly(intellijDep()) { includeJars("asm-all") } testCompile(projectDist(":kotlin-test:kotlin-test-junit")) testCompile(commonDep("junit:junit")) -} - -afterEvaluate { - dependencies { - compileOnly(intellij { include("asm-all.jar") }) - testCompile(intellij { include("asm-all.jar") }) - } + testCompile(intellijDep()) { includeJars("asm-all") } } sourceSets { diff --git a/generators/build.gradle.kts b/generators/build.gradle.kts index 8313a9113d9..94c95d5870c 100644 --- a/generators/build.gradle.kts +++ b/generators/build.gradle.kts @@ -1,10 +1,6 @@ apply { plugin("kotlin") } -configureIntellijPlugin { - setExtraDependencies("jps-build-test") -} - dependencies { compile(protobufFull()) compile(project(":idea")) @@ -40,19 +36,16 @@ dependencies { compile(projectTests(":plugins:uast-kotlin")) compile(projectTests(":js:js.tests")) compile(projectTests(":generators:test-generator")) + compileOnly(intellijDep("jps-build-test")) compileOnly(project(":kotlin-reflect-api")) + testCompile(project(":idea:idea-test-framework")) { isTransitive = false } testCompile(project(":compiler:incremental-compilation-impl")) testCompile(commonDep("junit:junit")) - testRuntime(projectDist(":kotlin-reflect")) -} + testCompile(intellijDep("jps-build-test")) -afterEvaluate { - dependencies { - compileOnly(intellijExtra("jps-build-test")) - testCompile(intellijExtra("jps-build-test")) - testRuntime(intellij { include("idea_rt.jar") }) - } + testRuntime(intellijDep()) { includeJars("idea_rt") } + testRuntime(projectDist(":kotlin-reflect")) } sourceSets { diff --git a/generators/test-generator/build.gradle.kts b/generators/test-generator/build.gradle.kts index b3add25c734..cdf268fab1e 100644 --- a/generators/test-generator/build.gradle.kts +++ b/generators/test-generator/build.gradle.kts @@ -3,21 +3,14 @@ apply { plugin("kotlin") } jvmTarget = "1.6" -configureIntellijPlugin() - dependencies { + compile(intellijDep()) { includeJars("util") } testCompile(project(":core:util.runtime")) testCompile(projectTests(":compiler:tests-common")) testCompile(projectDist(":kotlin-stdlib")) testCompile(commonDep("junit:junit")) } -afterEvaluate { - dependencies { - compile(intellij { include("util.jar") }) - } -} - sourceSets { "main" { } "test" { projectDefault() } diff --git a/gradle/project-schema.json b/gradle/project-schema.json index f803bfa5974..444114a9c28 100644 --- a/gradle/project-schema.json +++ b/gradle/project-schema.json @@ -24,8 +24,6 @@ "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -47,8 +45,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":android-lint": { @@ -73,14 +70,13 @@ "java": "org.gradle.api.plugins.JavaPluginConvention" }, "configurations": [ + "antLauncherJar", "apiElements", "archives", "compile", "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -102,16 +98,15 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":core": { "conventions": { - + }, "configurations": [ - + ], "extensions": { "ext": "org.gradle.api.plugins.ExtraPropertiesExtension" @@ -140,8 +135,6 @@ "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -162,8 +155,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":examples": { @@ -189,8 +181,6 @@ "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -211,8 +201,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":idea": { @@ -228,9 +217,8 @@ "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", + "instrumentationClasspath", "kapt", "kaptTest", "runtime", @@ -251,8 +239,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":idea-runner": { @@ -267,8 +254,6 @@ "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -289,8 +274,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":j2k": { @@ -305,8 +289,6 @@ "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -328,8 +310,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":jps-plugin": { @@ -344,8 +325,6 @@ "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -367,8 +346,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":js": { @@ -437,8 +415,6 @@ "compileOnly", "default", "distJar", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -461,8 +437,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":kotlin-android-extensions": { @@ -479,8 +454,6 @@ "compileOnly", "compilerDummyJar", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -504,7 +477,6 @@ "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension", "signing": "org.gradle.plugins.signing.SigningExtension" } }, @@ -562,8 +534,6 @@ "compileOnly", "default", "distJar", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -588,8 +558,6 @@ "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" - "reporting": "org.gradle.api.reporting.ReportingExtension", "signing": "org.gradle.plugins.signing.SigningExtension" } }, @@ -822,8 +790,6 @@ "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -848,7 +814,6 @@ "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension", "signing": "org.gradle.plugins.signing.SigningExtension" } }, @@ -872,8 +837,6 @@ "fatJarContentsStripMetadata", "fatJarContentsStripServices", "fatSourcesJarContents", - "idea", - "ideaPlugins", "implementation", "proguardLibraryJars", "runtime", @@ -894,7 +857,6 @@ "ext": "org.gradle.api.plugins.ExtraPropertiesExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension", "signing": "org.gradle.plugins.signing.SigningExtension" } }, @@ -1155,6 +1117,7 @@ "java": "org.gradle.api.plugins.JavaPluginConvention" }, "configurations": [ + "androidSdk", "apiElements", "archives", "compile", @@ -1330,8 +1293,6 @@ "compileOnly", "default", "distJar", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -1353,8 +1314,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":kotlin-reflect": { @@ -1681,8 +1641,6 @@ "compileOnly", "default", "distJar", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -1706,7 +1664,6 @@ "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension", "signing": "org.gradle.plugins.signing.SigningExtension" } }, @@ -2030,8 +1987,6 @@ "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -2053,8 +2008,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":plugins": { @@ -2173,8 +2127,6 @@ "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -2183,6 +2135,7 @@ "runtimeElements", "runtimeJar", "runtimeOnly", + "springClasspath", "testCompile", "testCompileClasspath", "testCompileOnly", @@ -2196,8 +2149,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":compiler:android-tests": { @@ -2212,8 +2164,6 @@ "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -2234,8 +2184,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":compiler:backend": { @@ -2320,8 +2269,6 @@ "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -2343,8 +2290,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":compiler:cli-common": { @@ -2359,8 +2305,6 @@ "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -2381,8 +2325,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":compiler:conditional-preprocessor": { @@ -2397,8 +2340,6 @@ "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -2419,8 +2360,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":compiler:container": { @@ -2435,8 +2375,6 @@ "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -2458,8 +2396,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":compiler:daemon": { @@ -2474,8 +2411,6 @@ "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -2496,8 +2431,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":compiler:daemon-common": { @@ -2512,8 +2446,6 @@ "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -2534,8 +2466,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":compiler:frontend": { @@ -2551,6 +2482,7 @@ "compileOnly", "default", "implementation", + "jflexPath", "kapt", "kaptTest", "runtime", @@ -2831,8 +2763,6 @@ "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -2853,8 +2783,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":compiler:resolution": { @@ -2939,8 +2868,6 @@ "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -2962,8 +2889,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":compiler:tests-common-jvm6": { @@ -3049,8 +2975,6 @@ "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -3071,8 +2995,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":compiler:util": { @@ -3087,8 +3010,6 @@ "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -3109,8 +3030,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":core:builtins": { @@ -3299,6 +3219,26 @@ "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension" } }, + ":custom-dependencies:android-sdk": { + "conventions": { + + }, + "configurations": [ + "androidJar", + "androidPlatform", + "androidSdk", + "android_m2repository_r44", + "build-tools_r23.0.1", + "buildTools", + "dxSources", + "platform-tools_r25.0.3", + "platform_26_r02", + "tools_r24.3.4" + ], + "extensions": { + "ext": "org.gradle.api.plugins.ExtraPropertiesExtension" + } + }, ":custom-dependencies:protobuf-lite": { "conventions": { @@ -3447,8 +3387,6 @@ "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -3470,8 +3408,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":idea:formatter": { @@ -3486,8 +3423,6 @@ "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -3508,8 +3443,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":idea:ide-common": { @@ -3524,8 +3458,6 @@ "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -3546,8 +3478,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":idea:idea-android": { @@ -3556,14 +3487,13 @@ "java": "org.gradle.api.plugins.JavaPluginConvention" }, "configurations": [ + "androidSdk", "apiElements", "archives", "compile", "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -3585,8 +3515,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":idea:idea-android-output-parser": { @@ -3601,8 +3530,6 @@ "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -3623,8 +3550,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":idea:idea-core": { @@ -3639,8 +3565,6 @@ "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -3661,8 +3585,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":idea:idea-gradle": { @@ -3671,15 +3594,15 @@ "java": "org.gradle.api.plugins.JavaPluginConvention" }, "configurations": [ + "androidSdk", "apiElements", "archives", "compile", "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", + "instrumentationClasspath", "kapt", "kaptTest", "runtime", @@ -3700,8 +3623,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":idea:idea-jps-common": { @@ -3716,8 +3638,6 @@ "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -3738,8 +3658,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":idea:idea-jvm": { @@ -3754,8 +3673,6 @@ "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -3776,8 +3693,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":idea:idea-maven": { @@ -3792,8 +3708,6 @@ "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -3815,8 +3729,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":idea:idea-test-framework": { @@ -3831,8 +3744,6 @@ "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -3853,8 +3764,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":idea:kotlin-gradle-tooling": { @@ -3869,8 +3779,6 @@ "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -3892,8 +3800,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":js:js.ast": { @@ -3908,8 +3815,6 @@ "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -3930,8 +3835,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":js:js.dce": { @@ -3946,8 +3850,6 @@ "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -3968,8 +3870,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":js:js.frontend": { @@ -3984,8 +3885,6 @@ "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -4006,8 +3905,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":js:js.parser": { @@ -4022,8 +3920,6 @@ "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -4044,8 +3940,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":js:js.serializer": { @@ -4060,8 +3955,6 @@ "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -4082,8 +3975,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":js:js.tests": { @@ -4092,14 +3984,13 @@ "java": "org.gradle.api.plugins.JavaPluginConvention" }, "configurations": [ + "antLauncherJar", "apiElements", "archives", "compile", "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -4122,8 +4013,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":js:js.translator": { @@ -4138,8 +4028,6 @@ "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -4161,8 +4049,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":kotlin-allopen:plugin-marker": { @@ -4503,6 +4390,7 @@ "java": "org.gradle.api.plugins.JavaPluginConvention" }, "configurations": [ + "androidJar", "apiElements", "archives", "compile", @@ -4510,11 +4398,10 @@ "compileOnly", "default", "distJar", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", + "robolectricClasspath", "runtime", "runtimeClasspath", "runtimeElements", @@ -4534,8 +4421,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":plugins:android-extensions-ide": { @@ -4544,14 +4430,14 @@ "java": "org.gradle.api.plugins.JavaPluginConvention" }, "configurations": [ + "androidJar", + "androidSdk", "apiElements", "archives", "compile", "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -4574,8 +4460,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":plugins:android-extensions-jps": { @@ -4584,14 +4469,13 @@ "java": "org.gradle.api.plugins.JavaPluginConvention" }, "configurations": [ + "androidSdk", "apiElements", "archives", "compile", "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -4613,8 +4497,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":plugins:annotation-based-compiler-plugins-ide-support": { @@ -4629,8 +4512,6 @@ "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -4651,8 +4532,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":plugins:kapt3-idea": { @@ -4667,8 +4547,6 @@ "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -4690,8 +4568,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":plugins:lint": { @@ -4706,8 +4583,6 @@ "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -4728,8 +4603,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":plugins:uast-kotlin": { @@ -4744,8 +4618,6 @@ "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -4767,8 +4639,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":plugins:uast-kotlin-idea": { @@ -5054,8 +4925,6 @@ "compileClasspath", "compileOnly", "default", - "idea", - "ideaPlugins", "implementation", "kapt", "kaptTest", @@ -5076,8 +4945,7 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "intellij": "org.jetbrains.intellij.IntelliJPluginExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension" } }, ":kotlin-test:kotlin-test-js:kotlin-test-js-it": { diff --git a/idea-runner/build.gradle.kts b/idea-runner/build.gradle.kts index 3191c07a01c..8edf13e342b 100644 --- a/idea-runner/build.gradle.kts +++ b/idea-runner/build.gradle.kts @@ -1,26 +1,29 @@ -import org.jetbrains.intellij.IntelliJPluginExtension import org.jetbrains.intellij.tasks.PrepareSandboxTask import org.jetbrains.intellij.tasks.RunIdeTask -apply { plugin("kotlin") } +buildscript { + repositories { + maven(url = "https://oss.sonatype.org/content/repositories/snapshots/") // for intellij plugin + maven(url = "http://dl.bintray.com/jetbrains/intellij-plugin-service") // for intellij plugin + jcenter() + } + dependencies { + classpath("org.jetbrains.intellij.plugins:gradle-intellij-plugin:0.3.0-SNAPSHOT") + } +} -configureIntellijPlugin() +apply { plugin("kotlin") } dependencies { compileOnly(project(":idea")) compileOnly(project(":idea:idea-maven")) compileOnly(project(":idea:idea-gradle")) compileOnly(project(":idea:idea-jvm")) + compileOnly(intellijDep()) runtimeOnly(files(toolsJar())) } -afterEvaluate { - dependencies { - compileOnly(intellij()) - } -} - afterEvaluate { val ideaPluginDir: File by rootProject.extra val ideaSandboxDir: File by rootProject.extra @@ -42,7 +45,7 @@ afterEvaluate { dependsOn(prepareSandbox) group = "intellij" description = "Runs Intellij IDEA with installed plugin." - setIdeaDirectory(the().ideaDependency.classes) + setIdeaDirectory(intellijRootDir()) setConfigDirectory(File(ideaSandboxDir, "config")) setSystemDirectory(ideaSandboxDir) setPluginsDirectory(ideaPluginDir.parent) diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts index b5da1690d56..627daefe5ea 100644 --- a/idea/build.gradle.kts +++ b/idea/build.gradle.kts @@ -1,14 +1,7 @@ import org.gradle.jvm.tasks.Jar -import org.jetbrains.intellij.IntelliJPluginExtension apply { plugin("kotlin") } -configureIntellijPlugin { - setPlugins("android", "copyright", "coverage", "gradle", "Groovy", "IntelliLang", - "java-i18n", "junit", "maven", "properties", "testng") - setExtraDependencies("intellij-core") -} - dependencies { compile(project(":kotlin-stdlib")) compileOnly(project(":kotlin-reflect-api")) @@ -39,6 +32,16 @@ dependencies { compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false } compile("teamcity:markdown") + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } + compileOnly(intellijDep()) { + includeJars("annotations", "openapi", "idea", "velocity", "boot", "gson-2.5", "log4j", "asm-all", + "swingx-core-1.6.2", "jsr305", "forms_rt", "util", "jdom", "trove4j", "guava-21.0") + } + compileOnly(intellijPluginDep("IntelliLang")) + compileOnly(intellijPluginDep("copyright")) + compileOnly(intellijPluginDep("properties")) + compileOnly(intellijPluginDep("java-i18n")) + testCompile(project(":kotlin-test:kotlin-test-junit")) testCompile(projectTests(":compiler:tests-common")) testCompile(project(":idea:idea-test-framework")) { isTransitive = false } @@ -47,23 +50,6 @@ dependencies { testCompile(project(":idea:idea-maven")) { isTransitive = false } testCompile(commonDep("junit:junit")) - testCompileOnly(ideaPluginDeps("gradle-base-services", "gradle-tooling-extension-impl", "gradle-wrapper", plugin = "gradle")) - testCompileOnly(ideaPluginDeps("Groovy", plugin = "Groovy")) - testCompileOnly(ideaPluginDeps("maven", "maven-server-api", plugin = "maven")) - - testCompileOnly(ideaSdkDeps("groovy-all", "velocity", "gson", "jsr305", "idea_rt")) - - testRuntime(ideaSdkDeps("*.jar")) - - testRuntime(ideaPluginDeps("*.jar", plugin = "junit")) - testRuntime(ideaPluginDeps("*.jar", plugin = "properties")) - testRuntime(ideaPluginDeps("*.jar", plugin = "gradle")) - testRuntime(ideaPluginDeps("*.jar", plugin = "Groovy")) - testRuntime(ideaPluginDeps("*.jar", plugin = "coverage")) - testRuntime(ideaPluginDeps("*.jar", plugin = "maven")) - testRuntime(ideaPluginDeps("*.jar", plugin = "android")) - testRuntime(ideaPluginDeps("*.jar", plugin = "testng")) - testRuntime(project(":plugins:kapt3-idea")) { isTransitive = false } testRuntime(projectDist(":kotlin-reflect")) testRuntime(projectDist(":kotlin-preloader")) @@ -85,26 +71,25 @@ dependencies { (rootProject.extra["compilerModules"] as Array).forEach { testCompile(project(it)) } -} + testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } + testCompile(intellijPluginDep("IntelliLang")) + testCompile(intellijPluginDep("copyright")) + testCompile(intellijPluginDep("properties")) + testCompile(intellijPluginDep("java-i18n")) + testCompileOnly(intellijDep()) { includeJars("groovy-all-2.4.6", "velocity", "gson-2.5", "jsr305", "idea_rt", "util", + "log4j") } + testCompileOnly(intellijPluginDep("gradle")) { includeJars("gradle-base-services-3.5", "gradle-tooling-extension-impl", "gradle-wrapper-3.5") } + testCompileOnly(intellijPluginDep("Groovy")) { includeJars("Groovy") } + testCompileOnly(intellijPluginDep("maven")) { includeJars("maven", "maven-server-api") } -afterEvaluate { - dependencies { - compileOnly(intellijCoreJar()) - compileOnly(intellij { - include("annotations.jar", "openapi.jar", "idea.jar", "velocity.jar", "boot.jar", "gson-*.jar", "log4j.jar", "asm-all.jar", - "swingx-core-*.jar", "jsr305.jar", "forms_rt.jar", "util.jar", "jdom.jar", "trove4j.jar", "guava-*.jar") - }) - compileOnly(intellijPlugins("IntelliLang", "copyright", "properties", "java-i18n")) - testCompileOnly(intellijCoreJar()) - testCompile(intellijPlugins("IntelliLang", "copyright", "properties", "java-i18n")) - testCompileOnly(intellij { include("groovy-all-*.jar", "velocity.jar", "gson-*.jar", "jsr305.jar", "idea_rt.jar", "util.jar", - "log4j.jar") }) - testCompileOnly(intellijPlugin("gradle") { include("gradle-base-services-*.jar", "gradle-tooling-extension-impl.jar", "gradle-wrapper-*.jar") }) - testCompileOnly(intellijPlugin("Groovy") { include("Groovy.jar") }) - testCompileOnly(intellijPlugin("maven") { include("maven.jar", "maven-server-api.jar") }) - testRuntime(intellij()) - testRuntime(intellijPlugins("junit", "gradle", "Groovy", "coverage", "maven", "android", "testng")) - } + testRuntime(intellijDep()) + testRuntime(intellijPluginDep("junit")) + testRuntime(intellijPluginDep("gradle")) + testRuntime(intellijPluginDep("Groovy")) + testRuntime(intellijPluginDep("coverage")) + testRuntime(intellijPluginDep("maven")) + testRuntime(intellijPluginDep("android")) + testRuntime(intellijPluginDep("testng")) } val processResources: Copy by tasks @@ -132,7 +117,7 @@ projectTest { dependsOnTaskIfExistsRec("dist", project = rootProject) workingDir = rootDir afterEvaluate { - systemProperty("ideaSdk.path", the().ideaDependency.classes.canonicalPath) + systemProperty("ideaSdk.path", intellijRootDir().canonicalPath) } } diff --git a/idea/formatter/build.gradle.kts b/idea/formatter/build.gradle.kts index 1d819ac24a2..33c0281f21b 100644 --- a/idea/formatter/build.gradle.kts +++ b/idea/formatter/build.gradle.kts @@ -1,17 +1,10 @@ apply { plugin("kotlin") } -configureIntellijPlugin() - dependencies { compile(project(":compiler:util")) compile(project(":compiler:frontend")) -} - -afterEvaluate { - dependencies { - compileOnly(intellij { include("idea.jar", "openapi.jar", "util.jar") }) - } + compileOnly(intellijDep()) { includeJars("idea", "openapi", "util") } } sourceSets { diff --git a/idea/ide-common/build.gradle.kts b/idea/ide-common/build.gradle.kts index f1819af559d..f0c05f88832 100644 --- a/idea/ide-common/build.gradle.kts +++ b/idea/ide-common/build.gradle.kts @@ -1,23 +1,14 @@ apply { plugin("kotlin") } -configureIntellijPlugin { - setExtraDependencies("intellij-core") -} - dependencies { compile(project(":compiler:util")) compile(project(":compiler:frontend")) compile(project(":compiler:frontend.java")) compile(project(":js:js.frontend")) compile(project(":js:js.serializer")) -} - -afterEvaluate { - dependencies { - compileOnly(intellijCoreJar()) - compileOnly(intellij { include("annotations.jar", "guava-*.jar") }) - } + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } + compileOnly(intellijDep()) { includeJars("annotations", "guava-21.0") } } sourceSets { diff --git a/idea/idea-android/build.gradle.kts b/idea/idea-android/build.gradle.kts index 4b3d1535007..ac1112d323f 100644 --- a/idea/idea-android/build.gradle.kts +++ b/idea/idea-android/build.gradle.kts @@ -2,15 +2,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile apply { plugin("kotlin") } -repositories { - androidDxJarRepo(project) -} - -configureIntellijPlugin { - setPlugins("android", "copyright", "coverage", "gradle", "Groovy", "IntelliLang", - "java-decompiler", "java-i18n", "junit", "maven", "properties", "testng") -} - val androidSdk by configurations.creating dependencies { @@ -27,6 +18,11 @@ dependencies { compile(androidDxJar()) + compileOnly(intellijDep()) { includeJars("openapi", "idea", "extensions", "util", "guava-21.0") } + compileOnly(intellijPluginDep("android")) { + includeJars("android", "android-common", "sdk-common", "sdklib", "sdk-tools", "layoutlib-api") + } + testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) testCompile(project(":idea:idea-test-framework")) { isTransitive = false } testCompile(project(":plugins:lint")) { isTransitive = false } @@ -36,30 +32,33 @@ dependencies { testCompile(projectTests(":idea:idea-gradle")) testCompile(commonDep("junit:junit")) + testCompile(intellijDep()) { includeJars("gson-2.5") } + testCompile(intellijPluginDep("properties")) + testCompileOnly(intellijPluginDep("android")) { + includeJars("android", "android-common", "sdk-common", "sdklib", "sdk-tools", "layoutlib-api") + } + testRuntime(projectDist(":kotlin-reflect")) testRuntime(project(":plugins:android-extensions-ide")) testRuntime(project(":plugins:kapt3-idea")) testRuntime(project(":sam-with-receiver-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) testRuntime(project(":allopen-ide-plugin")) - androidSdk(project(":custom-dependencies:android-sdk", configuration = "androidSdk")) -} -afterEvaluate { - dependencies { - compileOnly(intellij { include("openapi.jar", "idea.jar", "extensions.jar", "util.jar", "guava-*.jar") }) - compileOnly(intellijPlugin("android") { - include("android.jar", "android-common.jar", "sdk-common.jar", "sdklib.jar", "sdk-tools.jar", "layoutlib-api.jar") - }) - testCompile(intellij { include("gson-*.jar") }) - testCompile(intellijPlugin("properties")) - testCompileOnly(intellijPlugin("android") { - include("android.jar", "android-common.jar", "sdk-common.jar", "sdklib.jar", "sdk-tools.jar", "layoutlib-api.jar") - }) - testRuntime(intellij()) - testRuntime(intellijPlugins("android", "copyright", "coverage", "gradle", "Groovy", "IntelliLang", - "java-decompiler", "java-i18n", "junit", "maven", "testng")) - } + testRuntime(intellijDep()) + testRuntime(intellijPluginDep("android")) + testRuntime(intellijPluginDep("copyright")) + testRuntime(intellijPluginDep("coverage")) + testRuntime(intellijPluginDep("gradle")) + testRuntime(intellijPluginDep("Groovy")) + testRuntime(intellijPluginDep("IntelliLang")) + testRuntime(intellijPluginDep("java-decompiler")) + testRuntime(intellijPluginDep("java-i18n")) + testRuntime(intellijPluginDep("junit")) + testRuntime(intellijPluginDep("maven")) + testRuntime(intellijPluginDep("testng")) + + androidSdk(project(":custom-dependencies:android-sdk", configuration = "androidSdk")) } sourceSets { diff --git a/idea/idea-android/idea-android-output-parser/build.gradle.kts b/idea/idea-android/idea-android-output-parser/build.gradle.kts index a515ffb62dc..0247c144bff 100644 --- a/idea/idea-android/idea-android-output-parser/build.gradle.kts +++ b/idea/idea-android/idea-android-output-parser/build.gradle.kts @@ -1,22 +1,12 @@ apply { plugin("kotlin") } -configureIntellijPlugin { - setExtraDependencies("intellij-core") - setPlugins("gradle", "android") -} - dependencies { compile(project(":compiler:util")) -} - -afterEvaluate { - dependencies { - compileOnly(intellijCoreJar()) - compileOnly(intellij { include("guava-*.jar") }) - compileOnly(intellijPlugin("gradle") { include("gradle-tooling-api.jar") }) - compileOnly(intellijPlugin("android") { include("android.jar", "android-common.jar", "sdk-common.jar") }) - } + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } + compileOnly(intellijDep()) { includeJars("guava-21.0") } + compileOnly(intellijPluginDep("gradle")) { includeJars("gradle-tooling-api-3.5") } + compileOnly(intellijPluginDep("android")) { includeJars("android", "android-common", "sdk-common") } } sourceSets { diff --git a/idea/idea-core/build.gradle.kts b/idea/idea-core/build.gradle.kts index 4220b985168..0be9627ead1 100644 --- a/idea/idea-core/build.gradle.kts +++ b/idea/idea-core/build.gradle.kts @@ -1,10 +1,5 @@ apply { plugin("kotlin") } -configureIntellijPlugin { - setPlugins("gradle") - setExtraDependencies("intellij-core") -} - dependencies { compile(projectDist(":kotlin-stdlib")) compileOnly(project(":kotlin-reflect-api")) @@ -21,14 +16,9 @@ dependencies { compile(project(":plugins:android-extensions-compiler")) compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false } compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-jdk8")) { isTransitive = false } -} - -afterEvaluate { - dependencies { - compileOnly(intellijCoreJar()) - compileOnly(intellij { include("util.jar", "openapi.jar", "idea.jar", "asm-all.jar", "jdom.jar", "annotations.jar", "trove4j.jar", "guava-*.jar") }) - compileOnly(intellijPlugin("gradle") { include("gradle-tooling-api-*.jar", "gradle.jar") }) - } + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } + compileOnly(intellijDep()) { includeJars("util", "openapi", "idea", "asm-all", "jdom", "annotations", "trove4j", "guava-21.0") } + compileOnly(intellijPluginDep("gradle")) { includeJars("gradle-tooling-api-3.5", "gradle") } } sourceSets { diff --git a/idea/idea-gradle/build.gradle.kts b/idea/idea-gradle/build.gradle.kts index 8ac38d544de..ea8653d0025 100644 --- a/idea/idea-gradle/build.gradle.kts +++ b/idea/idea-gradle/build.gradle.kts @@ -1,9 +1,5 @@ apply { plugin("kotlin") } -configureIntellijPlugin { - setPlugins("android", "coverage", "gradle", "Groovy", "junit", "maven", "properties", "testng") -} - val androidSdk by configurations.creating dependencies { @@ -18,9 +14,18 @@ dependencies { compile(project(":js:js.frontend")) + compileOnly(intellijDep()) { includeJars("openapi", "idea", "external-system-rt", "forms_rt", "extensions", "jdom", "util") } + compileOnly(intellijPluginDep("gradle")) { includeJars("gradle-tooling-api-3.5", "gradle", "gradle-base-services-3.5") } + compileOnly(intellijPluginDep("Groovy")) { includeJars("Groovy") } + compileOnly(intellijPluginDep("junit")) { includeJars("idea-junit") } + testCompile(projectTests(":idea")) testCompile(project(":idea:idea-test-framework")) + testCompile(intellijPluginDep("gradle")) { includeJars("gradle-wrapper-3.5", "gradle-base-services-3.5", "gradle-tooling-extension-impl", "gradle-tooling-api-3.5", "gradle") } + testCompileOnly(intellijPluginDep("Groovy")) { includeJars("Groovy") } + testCompileOnly(intellijDep()) { includeJars("groovy-all-2.4.6", "idea_rt") } + testRuntime(projectDist(":kotlin-reflect")) testRuntime(project(":idea:idea-jvm")) testRuntime(project(":idea:idea-android")) @@ -30,27 +35,18 @@ dependencies { testRuntime(project(":sam-with-receiver-ide-plugin")) testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) - androidSdk(project(":custom-dependencies:android-sdk", configuration = "androidSdk")) -} + testRuntime(intellijDep()) + // TODO: the order of the plugins matters here, consider avoiding order-dependency + testRuntime(intellijPluginDep("junit")) + testRuntime(intellijPluginDep("testng")) { includeJars("jcommander", "resources_en") } + testRuntime(intellijPluginDep("properties")) { includeJars("resources_en") } + testRuntime(intellijPluginDep("gradle")) + testRuntime(intellijPluginDep("Groovy")) + testRuntime(intellijPluginDep("coverage")) { includeJars("jacocoant") } + testRuntime(intellijPluginDep("maven")) + testRuntime(intellijPluginDep("android")) -afterEvaluate { - dependencies { - compileOnly(intellij { include("openapi.jar", "idea.jar", "external-system-rt.jar", "forms_rt.jar", "extensions.jar", "jdom.jar", "util.jar") }) - compileOnly(intellijPlugin("gradle") { include("gradle-tooling-api-*.jar", "gradle.jar", "gradle-base-services-*.jar") }) - compileOnly(intellijPlugin("Groovy") { include("Groovy.jar") }) - compileOnly(intellijPlugin("junit") { include("idea-junit.jar") }) - testCompile(intellijPlugin("gradle") { include("gradle-wrapper-*.jar", "gradle-base-services-*.jar", "gradle-tooling-extension-impl.jar", "gradle-tooling-api-*.jar", "gradle.jar") }) - testCompileOnly(intellijPlugin("Groovy") { include("Groovy.jar") }) - testCompileOnly(intellij { include("groovy-all-*.jar", "idea_rt.jar") }) - testRuntime(intellij()) - // TODO: the order of the plugins matters here, consider avoiding order-dependency - testRuntime(intellijPlugins("junit")) - testRuntime(intellijPlugin("testng") { include("jcommander.jar", "resources_en.jar") }) - testRuntime(intellijPlugin("properties") { include("resources_en.jar") }) - testRuntime(intellijPlugins("gradle", "Groovy")) - testRuntime(intellijPlugin("coverage") { include("jacocoant*.jar") }) - testRuntime(intellijPlugins("maven", "android")) - } + androidSdk(project(":custom-dependencies:android-sdk", configuration = "androidSdk")) } sourceSets { diff --git a/idea/idea-jps-common/build.gradle.kts b/idea/idea-jps-common/build.gradle.kts index 94e4234f599..11220234466 100644 --- a/idea/idea-jps-common/build.gradle.kts +++ b/idea/idea-jps-common/build.gradle.kts @@ -1,23 +1,14 @@ apply { plugin("kotlin") } -configureIntellijPlugin { - setExtraDependencies("intellij-core") -} - dependencies { compile(projectDist(":kotlin-stdlib")) compileOnly(project(":kotlin-reflect-api")) compile(project(":compiler:util")) compile(project(":compiler:cli-common")) compile(project(":compiler:frontend.java")) -} - -afterEvaluate { - dependencies { - compileOnly(intellijCoreJar()) - compileOnly(intellij { include("jdom.jar", "util.jar") }) - } + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } + compileOnly(intellijDep()) { includeJars("jdom", "util") } } sourceSets { diff --git a/idea/idea-jvm/build.gradle.kts b/idea/idea-jvm/build.gradle.kts index ac67d5e8150..f33097eff58 100644 --- a/idea/idea-jvm/build.gradle.kts +++ b/idea/idea-jvm/build.gradle.kts @@ -1,25 +1,22 @@ apply { plugin("kotlin") } -configureIntellijPlugin { - setPlugins("junit", "testng", "coverage", "java-decompiler") -} - dependencies { compile(project(":idea")) compile(project(":compiler:light-classes")) compile(project(":compiler:frontend.java")) -} + compileOnly(intellijDep()) { includeJars("annotations", "openapi", "idea", "extensions", "util", "velocity", "boot", "gson-2.5", + "swingx-core-1.6.2", "forms_rt", "jdom", "log4j", "guava-21.0", "asm-all") } + compileOnly(commonDep("com.google.code.findbugs", "jsr305")) -afterEvaluate { - dependencies { - compileOnly(intellij { include("openapi.jar", "idea.jar", "extensions.jar", "util.jar") }) - - compileOnly(intellijPlugin("junit") { include("idea-junit.jar") }) - compileOnly(intellijPlugin("testng") { include("testng.jar", "testng-plugin.jar") }) - compileOnly(intellijPlugin("coverage") { include("coverage.jar") }) - compileOnly(intellijPlugin("java-decompiler") { include("java-decompiler.jar") }) - } + compileOnly(intellijPluginDep("junit")) { includeJars("idea-junit") } + compileOnly(intellijPluginDep("testng")) { includeJars("testng", "testng-plugin") } + compileOnly(intellijPluginDep("coverage")) { includeJars("coverage") } + compileOnly(intellijPluginDep("java-decompiler")) { includeJars("java-decompiler") } + compileOnly(intellijPluginDep("IntelliLang")) + compileOnly(intellijPluginDep("copyright")) + compileOnly(intellijPluginDep("properties")) + compileOnly(intellijPluginDep("java-i18n")) } diff --git a/idea/idea-maven/build.gradle.kts b/idea/idea-maven/build.gradle.kts index f07983de997..f3aaf309160 100644 --- a/idea/idea-maven/build.gradle.kts +++ b/idea/idea-maven/build.gradle.kts @@ -1,10 +1,6 @@ apply { plugin("kotlin") } -configureIntellijPlugin { - setPlugins("android", "coverage", "gradle", "Groovy", "junit", "maven", "properties", "testng") -} - dependencies { compile(project(":core:util.runtime")) compile(project(":compiler:frontend")) @@ -19,10 +15,16 @@ dependencies { compile(project(":idea:idea-jvm")) compile(project(":idea:idea-jps-common")) + compileOnly(intellijDep()) { includeJars("openapi", "idea", "gson-2.5", "jdom", "extensions", "util") } + compileOnly(intellijPluginDep("maven")) { includeJars("maven", "maven-server-api") } + testCompile(projectTests(":idea")) testCompile(projectTests(":compiler:tests-common")) testCompile(project(":idea:idea-test-framework")) + testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "gson-2.5", "idea_rt") } + testCompileOnly(intellijPluginDep("maven")) { includeJars("maven", "maven-server-api") } + testRuntime(projectDist(":kotlin-reflect")) testRuntime(project(":idea:idea-jvm")) testRuntime(project(":idea:idea-android")) @@ -31,23 +33,17 @@ dependencies { testRuntime(project(":sam-with-receiver-ide-plugin")) testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) -} -afterEvaluate { - dependencies { - compileOnly(intellij { include("openapi.jar", "idea.jar", "gson-*.jar", "jdom.jar", "extensions.jar", "util.jar") }) - compileOnly(intellijPlugin("maven") { include("maven.jar", "maven-server-api.jar") }) - testCompileOnly(intellij { include("openapi.jar", "idea.jar", "gson-*.jar", "idea_rt.jar") }) - testCompileOnly(intellijPlugin("maven") { include("maven.jar", "maven-server-api.jar") }) - testRuntime(intellij()) - // TODO: the order of the plugins matters here, consider avoiding order-dependency - testRuntime(intellijPlugins("junit")) - testRuntime(intellijPlugin("testng") { include("jcommander.jar", "resources_en.jar") }) - testRuntime(intellijPlugin("properties") { include("resources_en.jar") }) - testRuntime(intellijPlugins("gradle", "Groovy")) - testRuntime(intellijPlugin("coverage") { include("jacocoant*.jar") }) - testRuntime(intellijPlugins("maven", "android")) - } + testRuntime(intellijDep()) + // TODO: the order of the plugins matters here, consider avoiding order-dependency + testRuntime(intellijPluginDep("junit")) + testRuntime(intellijPluginDep("testng")) { includeJars("jcommander", "resources_en") } + testRuntime(intellijPluginDep("properties")) { includeJars("resources_en") } + testRuntime(intellijPluginDep("gradle")) + testRuntime(intellijPluginDep("Groovy")) + testRuntime(intellijPluginDep("coverage")) { includeJars("jacocoant") } + testRuntime(intellijPluginDep("maven")) + testRuntime(intellijPluginDep("android")) } sourceSets { diff --git a/idea/idea-test-framework/build.gradle.kts b/idea/idea-test-framework/build.gradle.kts index 1863000e42e..e10e3a3bcfb 100644 --- a/idea/idea-test-framework/build.gradle.kts +++ b/idea/idea-test-framework/build.gradle.kts @@ -1,8 +1,6 @@ apply { plugin("kotlin") } -configureIntellijPlugin() - dependencies { compile(project(":compiler:frontend")) compile(project(":compiler:frontend.script")) @@ -14,12 +12,7 @@ dependencies { compile(project(":kotlin-test:kotlin-test-jvm")) compileOnly(project(":kotlin-reflect-api")) compile(commonDep("junit:junit")) -} - -afterEvaluate { - dependencies { - compileOnly(intellij { include("openapi.jar", "idea.jar", "log4j.jar") }) - } + compileOnly(intellijDep()) { includeJars("openapi", "idea", "log4j") } } sourceSets { diff --git a/idea/kotlin-gradle-tooling/build.gradle.kts b/idea/kotlin-gradle-tooling/build.gradle.kts index 65cbb8b7ffc..384b4f17116 100644 --- a/idea/kotlin-gradle-tooling/build.gradle.kts +++ b/idea/kotlin-gradle-tooling/build.gradle.kts @@ -5,24 +5,15 @@ apply { plugin("kotlin") } jvmTarget = "1.6" -configureIntellijPlugin { - setPlugins("gradle") -} - dependencies { compile(projectDist(":kotlin-stdlib")) compile(project(":compiler:cli-common")) -} - -afterEvaluate { - dependencies { - compile(intellijPlugin("gradle") { - include("gradle-tooling-api-*.jar", - "gradle-tooling-extension-api.jar", - "gradle.jar", - "gradle-core-*.jar", - "gradle-base-services-groovy-*.jar") - }) + compile(intellijPluginDep("gradle")) { + includeJars("gradle-tooling-api-3.5", + "gradle-tooling-extension-api", + "gradle", + "gradle-core-3.5", + "gradle-base-services-groovy-3.5") } } diff --git a/j2k/build.gradle.kts b/j2k/build.gradle.kts index 755bcfe137f..1064961466b 100644 --- a/j2k/build.gradle.kts +++ b/j2k/build.gradle.kts @@ -17,36 +17,30 @@ val usedIntellijPlugins = arrayOf( "java-i18n", "java-decompiler") -configureIntellijPlugin { - setPlugins(*usedIntellijPlugins) - setExtraDependencies("intellij-core") -} - dependencies { compile(projectDist(":kotlin-stdlib")) compile(project(":compiler:frontend")) compile(project(":compiler:frontend.java")) compile(project(":compiler:light-classes")) compile(project(":compiler:util")) + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } + testCompile(project(":idea")) testCompile(project(":idea:idea-test-framework")) testCompile(project(":compiler:light-classes")) testCompile(projectDist(":kotlin-test:kotlin-test-junit")) testCompile(commonDep("junit:junit")) + + testRuntime(project(":plugins:kapt3-idea")) { isTransitive = false } testRuntime(project(":idea:idea-jvm")) testRuntime(project(":idea:idea-android")) testRuntime(project(":plugins:android-extensions-ide")) testRuntime(project(":sam-with-receiver-ide-plugin")) testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) - testRuntime(project(":plugins:kapt3-idea")) { isTransitive = false } -} - -afterEvaluate { - dependencies { - compileOnly(intellijCoreJar()) - testRuntime(intellij()) - testRuntime(intellijPlugins(*usedIntellijPlugins)) + testRuntime(intellijDep()) + usedIntellijPlugins.forEach { + testRuntime(intellijPluginDep(it)) } } diff --git a/jps-plugin/build.gradle.kts b/jps-plugin/build.gradle.kts index 2dd0c406389..197b71e0952 100644 --- a/jps-plugin/build.gradle.kts +++ b/jps-plugin/build.gradle.kts @@ -2,10 +2,6 @@ apply { plugin("kotlin") } val compilerModules: Array by rootProject.extra -configureIntellijPlugin { - setExtraDependencies("intellij-core", "jps-standalone", "jps-build-test") -} - dependencies { compile(project(":kotlin-build-common")) compile(project(":core:descriptors")) @@ -16,6 +12,8 @@ dependencies { compile(project(":compiler:frontend.java")) compile(projectRuntimeJar(":kotlin-preloader")) compile(project(":idea:idea-jps-common")) + compileOnly(intellijDep()) { includeJars("jdom", "trove4j", "jps-model", "openapi", "util") } + compileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") } testCompileOnly(project(":kotlin-reflect-api")) testCompile(project(":compiler:incremental-compilation-impl")) testCompile(projectTests(":compiler:tests-common")) @@ -23,24 +21,17 @@ dependencies { testCompile(commonDep("junit:junit")) testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) testCompile(projectTests(":kotlin-build-common")) + testCompileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") } + testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "log4j") } + testCompile(intellijDep("jps-build-test")) compilerModules.forEach { testRuntime(project(it)) } + testRuntime(intellijDep()) + testRuntime(intellijCoreDep()) { includeJars("intellij-core") } testRuntime(projectDist(":kotlin-reflect")) } -afterEvaluate { - dependencies { - compileOnly(intellij { include("jdom.jar", "trove4j.jar", "jps-model.jar", "openapi.jar", "util.jar") }) - compileOnly(intellijExtra("jps-standalone") { include("jps-builders.jar", "jps-builders-6.jar") }) - testCompileOnly(intellijExtra("jps-standalone") { include("jps-builders.jar", "jps-builders-6.jar") }) - testCompileOnly(intellij { include("openapi.jar", "idea.jar", "log4j.jar") }) - testCompile(intellijExtra("jps-build-test")) - testRuntime(intellij()) - testRuntime(intellijCoreJar()) - } -} - sourceSets { "main" { projectDefault() } "test" { diff --git a/js/js.ast/build.gradle.kts b/js/js.ast/build.gradle.kts index a6d707f37ae..f0ed3bb19f6 100644 --- a/js/js.ast/build.gradle.kts +++ b/js/js.ast/build.gradle.kts @@ -3,20 +3,11 @@ apply { plugin("kotlin") } jvmTarget = "1.6" -configureIntellijPlugin { - setExtraDependencies("intellij-core") -} - dependencies { compile(project(":compiler:util")) compile(project(":compiler:frontend")) -} - -afterEvaluate { - dependencies { - compileOnly(intellijCoreJar()) - compileOnly(intellij { include("trove4j.jar")} ) - } + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } + compileOnly(intellijDep()) { includeJars("trove4j") } } sourceSets { diff --git a/js/js.dce/build.gradle.kts b/js/js.dce/build.gradle.kts index ba315d930c4..08bdaa883df 100644 --- a/js/js.dce/build.gradle.kts +++ b/js/js.dce/build.gradle.kts @@ -1,20 +1,11 @@ apply { plugin("kotlin") } -configureIntellijPlugin { - setExtraDependencies("intellij-core") -} - dependencies { compile(project(":compiler:util")) compile(project(":js:js.ast")) compile(project(":js:js.translator")) -} - -afterEvaluate { - dependencies { - compileOnly(intellijCoreJar()) - } + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } } sourceSets { diff --git a/js/js.frontend/build.gradle.kts b/js/js.frontend/build.gradle.kts index 49a9d778e99..218a83f6d9d 100644 --- a/js/js.frontend/build.gradle.kts +++ b/js/js.frontend/build.gradle.kts @@ -3,23 +3,14 @@ apply { plugin("kotlin") } jvmTarget = "1.6" -configureIntellijPlugin { - setExtraDependencies("intellij-core") -} - dependencies { compile(project(":compiler:util")) compile(project(":compiler:frontend")) compile(project(":js:js.ast")) compile(project(":js:js.parser")) compile(project(":js:js.serializer")) -} - -afterEvaluate { - dependencies { - compileOnly(intellijCoreJar()) - compileOnly(intellij { include("guava-*.jar")} ) - } + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } + compileOnly(intellijDep()) { includeJars("guava-21.0") } } sourceSets { diff --git a/js/js.parser/build.gradle.kts b/js/js.parser/build.gradle.kts index d07bfb450ee..83301a4ca3b 100644 --- a/js/js.parser/build.gradle.kts +++ b/js/js.parser/build.gradle.kts @@ -1,19 +1,10 @@ apply { plugin("kotlin") } -configureIntellijPlugin { - setExtraDependencies("intellij-core") -} - dependencies { compile(project(":compiler:util")) compile(project(":js:js.ast")) -} - -afterEvaluate { - dependencies { - compileOnly(intellijCoreJar()) - } + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } } sourceSets { diff --git a/js/js.serializer/build.gradle.kts b/js/js.serializer/build.gradle.kts index b4d961529fb..1d25bdd3bc8 100644 --- a/js/js.serializer/build.gradle.kts +++ b/js/js.serializer/build.gradle.kts @@ -3,21 +3,12 @@ apply { plugin("kotlin") } jvmTarget = "1.6" -configureIntellijPlugin { - setExtraDependencies("intellij-core") -} - dependencies { compile(project(":compiler:util")) compile(project(":compiler:frontend")) compile(project(":compiler:serialization")) compile(project(":js:js.ast")) -} - -afterEvaluate { - dependencies { - compileOnly(intellijCoreJar()) - } + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } } sourceSets { diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts index d07806386bc..6a00ffbdfe8 100644 --- a/js/js.tests/build.gradle.kts +++ b/js/js.tests/build.gradle.kts @@ -12,10 +12,6 @@ node { apply { plugin("kotlin") } -configureIntellijPlugin { - setExtraDependencies("intellij-core") -} - val antLauncherJar by configurations.creating dependencies { @@ -24,12 +20,15 @@ dependencies { testCompileOnly(project(":compiler:frontend")) testCompileOnly(project(":compiler:cli")) testCompileOnly(project(":compiler:util")) + testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } + testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "idea_rt", "util") } testCompile(project(":js:js.translator")) testCompile(project(":js:js.serializer")) testCompile(project(":js:js.dce")) testCompile(commonDep("junit:junit")) testCompile(projectTests(":kotlin-build-common")) testCompile(projectTests(":generators:test-generator")) + testRuntime(projectDist(":kotlin-stdlib")) testRuntime(projectDist(":kotlin-stdlib-js")) testRuntime(projectDist(":kotlin-test:kotlin-test-js")) // to be sure that kotlin-test-js built before tests runned @@ -37,19 +36,12 @@ dependencies { testRuntime(projectDist(":kotlin-preloader")) // it's required for ant tests testRuntime(project(":compiler:backend-common")) testRuntime(commonDep("org.fusesource.jansi", "jansi")) + testRuntime(intellijDep()) antLauncherJar(commonDep("org.apache.ant", "ant")) antLauncherJar(files(toolsJar())) } -afterEvaluate { - dependencies { - testCompileOnly(intellijCoreJar()) - testCompileOnly(intellij { include("openapi.jar", "idea.jar", "idea_rt.jar", "util.jar") }) - testRuntime(intellij()) - } -} - sourceSets { "main" {} diff --git a/js/js.translator/build.gradle.kts b/js/js.translator/build.gradle.kts index f07d0b2b9e5..575e16deb0b 100644 --- a/js/js.translator/build.gradle.kts +++ b/js/js.translator/build.gradle.kts @@ -8,10 +8,6 @@ apply { plugin("kotlin") } jvmTarget = "1.6" -configureIntellijPlugin { - setExtraDependencies("intellij-core") -} - dependencies { compile(project(":core:descriptors")) compile(project(":compiler:util")) @@ -20,13 +16,8 @@ dependencies { compile(project(":js:js.ast")) compile(project(":js:js.frontend")) compile(project(":js:js.parser")) -} - -afterEvaluate { - dependencies { - compileOnly(intellijCoreJar()) - compileOnly(intellij { include("trove4j.jar", "guava-*.jar")} ) - } + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } + compileOnly(intellijDep()) { includeJars("trove4j", "guava-21.0") } } sourceSets { diff --git a/libraries/tools/kotlin-script-util/build.gradle.kts b/libraries/tools/kotlin-script-util/build.gradle.kts index aa358cb8336..7fc97d949ee 100644 --- a/libraries/tools/kotlin-script-util/build.gradle.kts +++ b/libraries/tools/kotlin-script-util/build.gradle.kts @@ -3,8 +3,6 @@ description = "Kotlin scripting support utilities" apply { plugin("kotlin") } -configureIntellijPlugin() - dependencies { compile(project(":kotlin-stdlib")) compile(project(":kotlin-script-runtime")) @@ -22,13 +20,8 @@ dependencies { testRuntime("com.jcabi:jcabi-aether:0.10.1") testRuntime("org.sonatype.aether:aether-api:1.13.1") testRuntime("org.apache.maven:maven-core:3.0.3") -} - -afterEvaluate { - dependencies { - compileOnly(intellij { include("openapi.jar", "util.jar") }) - testCompile(intellij { include("openapi.jar", "util.jar") }) - } + compileOnly(intellijDep()) { includeJars("openapi", "util") } + testCompile(intellijDep()) { includeJars("openapi", "util") } } projectTest { diff --git a/plugins/allopen/allopen-cli/build.gradle.kts b/plugins/allopen/allopen-cli/build.gradle.kts index ac9158bed14..aebbf24164f 100644 --- a/plugins/allopen/allopen-cli/build.gradle.kts +++ b/plugins/allopen/allopen-cli/build.gradle.kts @@ -3,13 +3,11 @@ description = "Kotlin AllOpen Compiler Plugin" apply { plugin("kotlin") } -configureIntellijPlugin { - setExtraDependencies("intellij-core") -} - dependencies { compileOnly(project(":compiler:plugin-api")) compileOnly(project(":compiler:frontend")) + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } + runtime(projectRuntimeJar(":kotlin-compiler")) runtime(projectDist(":kotlin-stdlib")) @@ -19,13 +17,7 @@ dependencies { testCompile(projectTests(":compiler:tests-common")) testCompile(commonDep("junit:junit")) - testRuntime(ideaSdkDeps("*.jar")) -} - -afterEvaluate { - dependencies { - compileOnly(intellijCoreJar()) - } + testRuntime(intellijDep()) } sourceSets { diff --git a/plugins/allopen/allopen-ide/build.gradle.kts b/plugins/allopen/allopen-ide/build.gradle.kts index 4e94e1b275a..1a230334c97 100644 --- a/plugins/allopen/allopen-ide/build.gradle.kts +++ b/plugins/allopen/allopen-ide/build.gradle.kts @@ -5,10 +5,6 @@ apply { plugin("kotlin") } jvmTarget = "1.6" -configureIntellijPlugin { - setPlugins("gradle", "maven") -} - dependencies { compile(project(":kotlin-allopen-compiler-plugin")) compile(project(":compiler:util")) @@ -17,14 +13,9 @@ dependencies { compile(project(":idea")) compile(project(":idea:idea-jps-common")) compile(project(":plugins:annotation-based-compiler-plugins-ide-support")) -} - -afterEvaluate { - dependencies { - compileOnly(intellij { include("openapi.jar", "idea.jar") }) - compileOnly(intellijPlugin("maven") { include("maven.jar") }) - compileOnly(intellijPlugin("gradle") { include("gradle-tooling-api-*.jar", "gradle.jar") }) - } + compileOnly(intellijDep()) { includeJars("openapi", "idea") } + compileOnly(intellijPluginDep("maven")) { includeJars("maven") } + compileOnly(intellijPluginDep("gradle")) { includeJars("gradle-tooling-api-3.5", "gradle") } } sourceSets { diff --git a/plugins/android-extensions/android-extensions-compiler/build.gradle.kts b/plugins/android-extensions/android-extensions-compiler/build.gradle.kts index 673575811f7..602c806b98a 100644 --- a/plugins/android-extensions/android-extensions-compiler/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-compiler/build.gradle.kts @@ -3,9 +3,8 @@ description = "Kotlin Android Extensions Compiler" apply { plugin("kotlin") } -configureIntellijPlugin { - setExtraDependencies("intellij-core") -} +val robolectricClasspath by configurations.creating +val androidJar by configurations.creating dependencies { compile(project(":compiler:util")) @@ -14,23 +13,22 @@ dependencies { compile(project(":compiler:frontend.java")) compile(project(":compiler:backend")) compileOnly(project(":kotlin-android-extensions-runtime")) + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } + compileOnly(intellijDep()) { includeJars("asm-all") } testCompile(project(":compiler:util")) testCompile(project(":compiler:backend")) testCompile(project(":compiler:cli")) testCompile(project(":compiler:tests-common")) + testCompile(project(":kotlin-android-extensions-runtime")) testCompile(projectTests(":compiler:tests-common")) testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) testCompile(commonDep("junit:junit")) - testRuntime(ideaPluginDeps("idea-junit", "resources_en", plugin = "junit")) - testCompile(project(":kotlin-android-extensions-runtime")) -} -afterEvaluate { - dependencies { - compileOnly(intellijCoreJar()) - compileOnly(intellij { include("asm-all.jar") }) - } + testRuntime(intellijPluginDep("junit")) { includeJars("idea-junit", "resources_en") } + + robolectricClasspath(commonDep("org.robolectric", "robolectric")) + androidJar(project(":custom-dependencies:android-sdk", configuration = "androidJar")) } sourceSets { @@ -54,4 +52,10 @@ projectTest { environment("ANDROID_EXTENSIONS_RUNTIME_CLASSES", getSourceSetsFrom(":kotlin-android-extensions-runtime")["main"].output.classesDirs.asPath) dependsOnTaskIfExistsRec("dist", project = rootProject) workingDir = rootDir + doFirst { + val androidPluginPath = File(intellijRootDir(), "plugins/android").canonicalPath + systemProperty("ideaSdk.androidPlugin.path", androidPluginPath) + systemProperty("robolectric.classpath", robolectricClasspath.asPath) + systemProperty("android.jar", androidJar.singleFile.canonicalPath) + } } \ No newline at end of file diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts b/plugins/android-extensions/android-extensions-idea/build.gradle.kts index c5cc26ba0de..8610f08bace 100644 --- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts @@ -5,12 +5,8 @@ apply { plugin("kotlin") } jvmTarget = "1.6" -configureIntellijPlugin { - setPlugins("android", "copyright", "coverage", "gradle", "Groovy", "IntelliLang", - "java-decompiler", "java-i18n", "junit", "maven", "properties", "testng") -} - val androidSdk by configurations.creating +val androidJar by configurations.creating dependencies { compile(project(":compiler:util")) @@ -20,6 +16,9 @@ dependencies { compile(project(":idea:idea-gradle")) compile(project(":plugins:android-extensions-compiler")) compileOnly(project(":kotlin-android-extensions-runtime")) + compileOnly(intellijPluginDep("android")) { includeJars("android.jar", "android-common.jar", "sdk-common.jar", "sdk-tools.jar") } + compileOnly(intellijPluginDep("Groovy")) { includeJars("Groovy.jar") } + compileOnly(intellijDep()) { includeJars("extensions.jar", "openapi.jar", "util.jar", "idea.jar") } testCompile(project(":compiler:tests-common")) testCompile(project(":compiler:cli")) @@ -32,27 +31,32 @@ dependencies { testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) testCompile(commonDep("junit:junit")) testRuntime(projectDist(":kotlin-reflect")) + testCompile(intellijPluginDep("android")) { includeJars("android.jar", "android-common.jar", "sdk-common.jar", "sdk-tools.jar") } + testCompile(intellijPluginDep("Groovy")) { includeJars("Groovy.jar") } + testCompile(intellijDep()) { includeJars("extensions.jar") } + testRuntime(project(":idea:idea-jvm")) testRuntime(project(":plugins:android-extensions-jps")) testRuntime(project(":sam-with-receiver-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":plugins:lint")) - androidSdk(project(":custom-dependencies:android-sdk", configuration = "androidSdk")) -} + testRuntime(intellijDep()) + testRuntime(intellijPluginDep("junit")) + testRuntime(intellijPluginDep("IntelliLang")) + testRuntime(intellijPluginDep("testng")) + testRuntime(intellijPluginDep("copyright")) + testRuntime(intellijPluginDep("properties")) + testRuntime(intellijPluginDep("java-i18n")) + testRuntime(intellijPluginDep("gradle")) + testRuntime(intellijPluginDep("Groovy")) + testRuntime(intellijPluginDep("coverage")) + testRuntime(intellijPluginDep("java-decompiler")) + testRuntime(intellijPluginDep("maven")) + testRuntime(intellijPluginDep("android")) -afterEvaluate { - dependencies { - compileOnly(intellijPlugin("android") { include("android.jar", "android-common.jar", "sdk-common.jar", "sdk-tools.jar") }) - compileOnly(intellijPlugin("Groovy") { include("Groovy.jar") }) - compileOnly(intellij { include("extensions.jar", "openapi.jar", "util.jar", "idea.jar")} ) - testCompile(intellijPlugin("android") { include("android.jar", "android-common.jar", "sdk-common.jar", "sdk-tools.jar") }) - testCompile(intellijPlugin("Groovy") { include("Groovy.jar") }) - testCompile(intellij { include("extensions.jar")} ) - testRuntime(intellij()) - testRuntime(intellijPlugins("junit", "IntelliLang", "testng", "copyright", "properties", "java-i18n", - "gradle", "Groovy", "coverage", "java-decompiler", "maven", "android")) - } + androidSdk(project(":custom-dependencies:android-sdk", configuration = "androidSdk")) + androidJar(project(":custom-dependencies:android-sdk", configuration = "androidJar")) } sourceSets { @@ -68,6 +72,7 @@ projectTest { workingDir = rootDir doFirst { systemProperty("android.sdk", androidSdk.singleFile.canonicalPath) + systemProperty("android.jar", androidJar.singleFile.canonicalPath) } } diff --git a/plugins/android-extensions/android-extensions-jps/build.gradle.kts b/plugins/android-extensions/android-extensions-jps/build.gradle.kts index e57990037b8..19329945a2b 100644 --- a/plugins/android-extensions/android-extensions-jps/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-jps/build.gradle.kts @@ -1,34 +1,31 @@ apply { plugin("kotlin") } -configureIntellijPlugin { - setPlugins("android") -} +val androidSdk by configurations.creating dependencies { compile(project(":compiler:util")) compile(project(":jps-plugin")) compile(project(":plugins:android-extensions-compiler")) - compile(ideaPluginDeps("android-jps-plugin", plugin = "android", subdir = "lib/jps")) + compileOnly(intellijDep()) { includeJars("openapi", "jps-builders") } + compileOnly(intellijPluginDep("android")) { includeJars("jps/android-jps-plugin") } + compile(intellijPluginDep("android")) { includeJars("jps/android-jps-plugin") } testCompile(projectTests(":jps-plugin")) testCompile(project(":compiler:tests-common")) testCompile(commonDep("junit:junit")) testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) testCompile(projectTests(":kotlin-build-common")) -} + testCompileOnly(intellijDep()) { includeJars("openapi", "jps-builders") } + testCompileOnly(intellijDep("jps-build-test")) { includeJars("jps-build-test") } -afterEvaluate { - dependencies { - compileOnly(intellij { include("openapi.jar", "jps-builders.jar") }) - compile(intellijPlugin("android") { include("**/android-jps-plugin.jar") }) - testCompileOnly(intellijExtra("jps-build-test") { include("jps-build-test.jar") } ) - testRuntime(intellijPlugin("android")) - testRuntime(intellijCoreJar()) - testRuntime(intellij()) - testRuntime(intellijExtra("jps-build-test")) - testRuntime(intellijExtra("jps-standalone")) - } + testRuntime(intellijPluginDep("android")) + testRuntime(intellijCoreDep()) { includeJars("intellij-core") } + testRuntime(intellijDep()) + testRuntime(intellijDep("jps-build-test")) + testRuntime(intellijDep("jps-standalone")) + + androidSdk(project(":custom-dependencies:android-sdk", configuration = "androidSdk")) } sourceSets { @@ -38,6 +35,9 @@ sourceSets { projectTest { workingDir = rootDir + doFirst { + systemProperty("android.sdk", androidSdk.singleFile.canonicalPath) + } } testsJar {} \ No newline at end of file diff --git a/plugins/annotation-based-compiler-plugins-ide-support/build.gradle.kts b/plugins/annotation-based-compiler-plugins-ide-support/build.gradle.kts index 4b6f961b8a1..8ca4c204dc0 100644 --- a/plugins/annotation-based-compiler-plugins-ide-support/build.gradle.kts +++ b/plugins/annotation-based-compiler-plugins-ide-support/build.gradle.kts @@ -3,10 +3,6 @@ apply { plugin("kotlin") } jvmTarget = "1.6" -configureIntellijPlugin { - setPlugins("gradle", "maven") -} - dependencies { compile(project(":compiler:util")) compile(project(":compiler:frontend")) @@ -15,15 +11,10 @@ dependencies { compile(project(":idea:idea-jps-common")) compile(project(":idea:idea-gradle")) compile(project(":idea:idea-maven")) -} - -afterEvaluate { - dependencies { - compileOnly(intellijPlugin("maven") { include("maven.jar", "maven-server-api.jar") }) - compileOnly(intellijPlugin("gradle") { include("gradle-tooling-api-*.jar", "gradle.jar") }) - compileOnly(intellij { include("openapi.jar", "idea.jar", "extensions.jar", "jdom.jar", "util.jar") }) + compileOnly(intellijPluginDep("maven")) { includeJars("maven.jar", "maven-server-api.jar") } + compileOnly(intellijPluginDep("gradle")) { includeJars("gradle-tooling-api-3.5.jar", "gradle.jar") } + compileOnly(intellijDep()) { includeJars("openapi.jar", "idea.jar", "extensions.jar", "jdom.jar", "util.jar") } } -} sourceSets { "main" { projectDefault() } diff --git a/plugins/kapt3/kapt3-compiler/build.gradle.kts b/plugins/kapt3/kapt3-compiler/build.gradle.kts index af95613ccd7..6986bb1ea1b 100644 --- a/plugins/kapt3/kapt3-compiler/build.gradle.kts +++ b/plugins/kapt3/kapt3-compiler/build.gradle.kts @@ -3,10 +3,6 @@ description = "Annotation Processor for Kotlin" apply { plugin("kotlin") } -configureIntellijPlugin { - setExtraDependencies("intellij-core") -} - dependencies { compile(project(":compiler:util")) compile(project(":compiler:cli")) @@ -14,25 +10,18 @@ dependencies { compile(project(":compiler:frontend")) compile(project(":compiler:frontend.java")) compile(project(":compiler:plugin-api")) + compileOnly(project(":kotlin-annotation-processing-runtime")) + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } + compileOnly(intellijDep()) { includeJars("asm-all") } testCompile(project(":compiler:tests-common")) testCompile(projectTests(":compiler:tests-common")) - - compileOnly(project(":kotlin-annotation-processing-runtime")) - testCompile(commonDep("junit:junit")) + testCompile(intellijCoreDep()) { includeJars("intellij-core") } + testCompile(intellijDep()) { includeJars("idea", "idea_rt", "openapi") } testCompile(project(":kotlin-annotation-processing-runtime")) } -afterEvaluate { - dependencies { - compileOnly(intellijCoreJar()) - compileOnly(intellij { include("asm-all.jar") }) - testCompile(intellijCoreJar()) - testCompile(intellij { include("idea.jar", "idea_rt.jar", "openapi.jar") }) - } -} - sourceSets { "main" { projectDefault() } "test" { projectDefault() } diff --git a/plugins/kapt3/kapt3-idea/build.gradle.kts b/plugins/kapt3/kapt3-idea/build.gradle.kts index 135098b7743..d677a7133e8 100644 --- a/plugins/kapt3/kapt3-idea/build.gradle.kts +++ b/plugins/kapt3/kapt3-idea/build.gradle.kts @@ -3,24 +3,15 @@ apply { plugin("kotlin") } jvmTarget = "1.6" -configureIntellijPlugin { - setPlugins("android", "gradle") -} - dependencies { compile(projectDist(":kotlin-stdlib")) compile(project(":compiler:frontend")) compile(project(":idea")) { isTransitive = false } compile(project(":idea:kotlin-gradle-tooling")) compile(project(":kotlin-annotation-processing")) -} - -afterEvaluate { - dependencies { - compileOnly(intellij { include("openapi.jar", "external-system-rt.jar", "util.jar") }) - compileOnly(intellijPlugin("gradle") { include("gradle-core-*.jar", "gradle-tooling-api-*.jar", "gradle.jar") }) - compileOnly(intellijPlugin("android") { include("android.jar", "android-common.jar", "sdklib.jar", "sdk-common.jar", "sdk-tools.jar") }) - } + compileOnly(intellijDep()) { includeJars("openapi", "external-system-rt", "util") } + compileOnly(intellijPluginDep("gradle")) { includeJars("gradle-core-3.5", "gradle-tooling-api-3.5", "gradle") } + compileOnly(intellijPluginDep("android")) { includeJars("android", "android-common", "sdklib", "sdk-common", "sdk-tools") } } sourceSets { diff --git a/plugins/lint/build.gradle.kts b/plugins/lint/build.gradle.kts index e946d11e686..5809a439dda 100644 --- a/plugins/lint/build.gradle.kts +++ b/plugins/lint/build.gradle.kts @@ -4,31 +4,17 @@ apply { plugin("java") } -repositories { - androidDxJarRepo(project) -} - -configureIntellijPlugin { - setExtraDependencies("intellij-core") - setPlugins("android") -} - dependencies { compile(project(":compiler:frontend")) compile(project(":idea")) compile(project(":idea:idea-core")) compile(project(":idea:idea-android")) compile(project(":plugins:uast-kotlin")) -} - -afterEvaluate { - dependencies { - compileOnly(intellijCoreJar()) - compileOnly(intellij { include("util.jar", "guava-*.jar", "openapi.jar", "idea.jar", "asm-all.jar") }) - compileOnly(intellijPlugin("android") { - include("android.jar", "android-common.jar", "sdklib.jar", "sdk-common.jar", "sdk-tools.jar", - "repository.jar", "lombok-ast-*.jar", "layoutlib-api.jar", "kxml2-*.jar") - }) + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } + compileOnly(intellijDep()) { includeJars("util", "guava-21.0", "openapi", "idea", "asm-all") } + compileOnly(intellijPluginDep("android")) { + includeJars("android", "android-common", "sdklib", "sdk-common", "sdk-tools", + "repository", "lombok-ast-0.2.3", "layoutlib-api", "kxml2-2.3.0") } } diff --git a/plugins/noarg/noarg-cli/build.gradle.kts b/plugins/noarg/noarg-cli/build.gradle.kts index 2df8b08e629..ff27354e3ad 100644 --- a/plugins/noarg/noarg-cli/build.gradle.kts +++ b/plugins/noarg/noarg-cli/build.gradle.kts @@ -3,16 +3,14 @@ description = "Kotlin NoArg Compiler Plugin" apply { plugin("kotlin") } -configureIntellijPlugin { - setExtraDependencies("intellij-core") -} - dependencies { compileOnly(project(":compiler:frontend")) compileOnly(project(":compiler:frontend.java")) compileOnly(project(":compiler:backend")) compileOnly(project(":compiler:util")) compileOnly(project(":compiler:plugin-api")) + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } + compileOnly(intellijDep()) { includeJars("asm-all") } runtime(projectRuntimeJar(":kotlin-compiler")) runtime(projectDist(":kotlin-stdlib")) @@ -25,13 +23,6 @@ dependencies { testRuntime(ideaSdkDeps("*.jar")) } -afterEvaluate { - dependencies { - compileOnly(intellijCoreJar()) - compileOnly(intellij { include("asm-all.jar") }) - } -} - sourceSets { "main" { projectDefault() } "test" { projectDefault() } diff --git a/plugins/noarg/noarg-ide/build.gradle.kts b/plugins/noarg/noarg-ide/build.gradle.kts index 5606b11f456..30958f58643 100644 --- a/plugins/noarg/noarg-ide/build.gradle.kts +++ b/plugins/noarg/noarg-ide/build.gradle.kts @@ -5,10 +5,6 @@ apply { plugin("kotlin") } jvmTarget = "1.6" -configureIntellijPlugin { - setPlugins("gradle", "maven") -} - dependencies { compile(project(":kotlin-noarg-compiler-plugin")) compile(project(":compiler:util")) @@ -19,15 +15,10 @@ dependencies { compile(project(":idea")) compile(project(":idea:idea-jps-common")) compile(project(":plugins:annotation-based-compiler-plugins-ide-support")) -} - -afterEvaluate { - dependencies { - compileOnly(intellij { include("openapi.jar", "idea.jar") }) - compileOnly(intellijPlugin("maven") { include("maven.jar") }) - compileOnly(intellijPlugin("gradle") { include("gradle-tooling-api-*.jar", "gradle.jar") }) + compileOnly(intellijDep()) { includeJars("openapi.jar", "idea.jar") } + compileOnly(intellijPluginDep("maven")) { includeJars("maven.jar") } + compileOnly(intellijPluginDep("gradle")) { includeJars("gradle-tooling-api-3.5.jar", "gradle.jar") } } -} sourceSets { "main" { projectDefault() } diff --git a/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts b/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts index f959829af24..a6081d2f452 100644 --- a/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts +++ b/plugins/sam-with-receiver/sam-with-receiver-cli/build.gradle.kts @@ -3,14 +3,11 @@ description = "Kotlin SamWithReceiver Compiler Plugin" apply { plugin("kotlin") } -configureIntellijPlugin { - setExtraDependencies("intellij-core") -} - dependencies { compileOnly(project(":compiler:frontend")) compileOnly(project(":compiler:frontend.java")) compileOnly(project(":compiler:plugin-api")) + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } runtime(projectRuntimeJar(":kotlin-compiler")) runtime(projectDist(":kotlin-stdlib")) runtime(projectDist(":kotlin-reflect")) @@ -20,13 +17,7 @@ dependencies { testCompile(project(":compiler:tests-common")) testCompile(projectTests(":compiler:tests-common")) testCompile(commonDep("junit:junit")) - testRuntime(ideaSdkDeps("*.jar")) -} - -afterEvaluate { - dependencies { - compileOnly(intellijCoreJar()) - } + testRuntime(intellijDep()) } sourceSets { diff --git a/plugins/source-sections/source-sections-compiler/build.gradle.kts b/plugins/source-sections/source-sections-compiler/build.gradle.kts index fccd83cc866..3b5b7c0689d 100644 --- a/plugins/source-sections/source-sections-compiler/build.gradle.kts +++ b/plugins/source-sections/source-sections-compiler/build.gradle.kts @@ -3,15 +3,13 @@ description = "Kotlin SourceSections Compiler Plugin" apply { plugin("kotlin") } -configureIntellijPlugin { - setExtraDependencies("intellij-core") -} - dependencies { compileOnly(project(":compiler:frontend")) compileOnly(project(":compiler:frontend.script")) compileOnly(project(":compiler:plugin-api")) + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } + testCompile(project(":compiler:frontend")) testCompile(project(":compiler:frontend.script")) testCompile(project(":compiler:plugin-api")) @@ -23,17 +21,11 @@ dependencies { testCompile(project(":kotlin-daemon-client")) testCompile(projectTests(":compiler:tests-common")) testCompile(commonDep("junit:junit")) + testCompile(intellijCoreDep()) { includeJars("intellij-core") } + testCompile(intellijDep()) { includeJars("idea", "idea_rt", "openapi", "log4j", "jdom", "jps-model") } testRuntime(projectDist(":kotlin-reflect")) } -afterEvaluate { - dependencies { - compileOnly(intellijCoreJar()) - testCompile(intellijCoreJar()) - testCompile(intellij { include("idea.jar", "idea_rt.jar", "openapi.jar", "log4j.jar", "jdom.jar", "jps-model.jar") }) - } -} - sourceSets { "main" { projectDefault() } "test" { projectDefault() } diff --git a/plugins/uast-kotlin-idea/build.gradle.kts b/plugins/uast-kotlin-idea/build.gradle.kts index 0f90c4760bc..34cb2ec4749 100644 --- a/plugins/uast-kotlin-idea/build.gradle.kts +++ b/plugins/uast-kotlin-idea/build.gradle.kts @@ -1,8 +1,6 @@ apply { plugin("kotlin") } -configureIntellijPlugin() - dependencies { compile(projectDist(":kotlin-stdlib")) compile(project(":core:util.runtime")) @@ -10,12 +8,7 @@ dependencies { compile(project(":compiler:frontend.java")) compile(project(":idea:ide-common")) compile(project(":plugins:uast-kotlin")) -} - -afterEvaluate { - dependencies { - compileOnly(intellij { include("openapi.jar", "util.jar") }) - } + compileOnly(intellijDep()) { includeJars("openapi", "util") } } sourceSets { diff --git a/plugins/uast-kotlin/build.gradle.kts b/plugins/uast-kotlin/build.gradle.kts index a7c8e9bf3c7..023049e97c0 100644 --- a/plugins/uast-kotlin/build.gradle.kts +++ b/plugins/uast-kotlin/build.gradle.kts @@ -1,10 +1,6 @@ apply { plugin("kotlin") } -configureIntellijPlugin { - setPlugins("junit", "gradle", "Groovy", "properties") -} - dependencies { compile(projectDist(":kotlin-stdlib")) compile(project(":core:util.runtime")) @@ -12,12 +8,16 @@ dependencies { compile(project(":compiler:frontend")) compile(project(":compiler:frontend.java")) compile(project(":compiler:light-classes")) + compileOnly(intellijDep()) { includeJars("openapi", "idea", "util", "extensions", "asm-all") } + testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) testCompile(projectTests(":compiler:tests-common")) testCompile(commonDep("junit:junit")) testCompile(project(":compiler:util")) testCompile(project(":compiler:cli")) testCompile(project(":idea:idea-test-framework")) + testCompileOnly(intellijDep()) { includeJars("idea_rt") } + testRuntime(projectDist(":kotlin-reflect")) testRuntime(project(":idea:idea-android")) testRuntime(project(":idea:idea-gradle")) @@ -26,16 +26,12 @@ dependencies { testRuntime(project(":allopen-ide-plugin")) testRuntime(project(":noarg-ide-plugin")) testRuntime(project(":plugins:android-extensions-ide")) -} - -afterEvaluate { - dependencies { - compileOnly(intellij { include("openapi.jar", "idea.jar", "util.jar", "extensions.jar", "asm-all.jar") }) - testCompileOnly(intellij { include("idea_rt.jar") }) - testRuntime(project(":plugins:kapt3-idea")) - testRuntime(intellij()) - testRuntime(intellijPlugins("junit", "gradle", "Groovy", "properties")) - } + testRuntime(project(":plugins:kapt3-idea")) + testRuntime(intellijDep()) + testRuntime(intellijPluginDep("junit")) + testRuntime(intellijPluginDep("gradle")) + testRuntime(intellijPluginDep("Groovy")) + testRuntime(intellijPluginDep("properties")) } sourceSets { diff --git a/prepare/android-extensions-compiler-gradle/build.gradle.kts b/prepare/android-extensions-compiler-gradle/build.gradle.kts index 9bb2ab2330c..e179fa83e69 100644 --- a/prepare/android-extensions-compiler-gradle/build.gradle.kts +++ b/prepare/android-extensions-compiler-gradle/build.gradle.kts @@ -5,10 +5,6 @@ description = "Kotlin Android Extensions Compiler" apply { plugin("kotlin") } -configureIntellijPlugin { - setExtraDependencies("intellij-core") -} - dependencies { compileOnly(project(":compiler:util")) compileOnly(project(":compiler:plugin-api")) @@ -18,12 +14,7 @@ dependencies { compileOnly(project(":kotlin-android-extensions-runtime")) runtime(projectRuntimeJar(":kotlin-compiler-embeddable")) compileOnly(commonDep("com.google.android", "android")) -} - -afterEvaluate { - dependencies { - compileOnly(intellijCoreJar()) - } + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } } sourceSets { diff --git a/prepare/compiler/build.gradle.kts b/prepare/compiler/build.gradle.kts index 81dca8bbbb0..3202c6cc8d4 100644 --- a/prepare/compiler/build.gradle.kts +++ b/prepare/compiler/build.gradle.kts @@ -51,10 +51,6 @@ val compiledModulesSources = compilerModules.map { project(it).the().sourceSets.getByName("main").allSource } -configureIntellijPlugin { - setExtraDependencies("intellij-core", "jps-standalone") -} - dependencies { compilerModules.forEach { fatJarContents(project(it)) { isTransitive = false } @@ -82,16 +78,11 @@ dependencies { compile(project(":kotlin-stdlib")) compile(project(":kotlin-script-runtime")) compile(project(":kotlin-reflect")) -} - -afterEvaluate { - dependencies { - fatJarContents(intellijCoreJar()) - fatJarContents(intellijCoreJarDependencies { exclude("jdom.jar", "log4j.jar") }) - fatJarContents(intellij { include("jna-platform.jar") }) - fatJarContentsStripServices(intellijExtra("jps-standalone") { include("jps-model.jar") }) - fatJarContentsStripMetadata(intellij { include("oromatcher.jar", "jdom.jar", "log4j.jar") }) - } + fatJarContents(intellijCoreDep()) { includeJars("intellij-core") } + fatJarContents(intellijDep()) { includeIntellijCoreJarDependencies(project, { !(it.startsWith("jdom") || it.startsWith("log4j")) }) } + fatJarContents(intellijDep()) { includeJars("jna-platform") } + fatJarContentsStripServices(intellijDep("jps-standalone")) { includeJars("jps-model") } + fatJarContentsStripMetadata(intellijDep()) { includeJars("oromatcher", "jdom", "log4j") } } diff --git a/test-instrumenter/build.gradle.kts b/test-instrumenter/build.gradle.kts index ffec95d5df0..70047c8871d 100644 --- a/test-instrumenter/build.gradle.kts +++ b/test-instrumenter/build.gradle.kts @@ -3,19 +3,10 @@ import org.gradle.jvm.tasks.Jar plugins { java } apply { plugin("kotlin") } -configureIntellijPlugin { - setExtraDependencies("intellij-core") -} - dependencies { compile(project(":kotlin-stdlib")) -} - -afterEvaluate { - dependencies { - compileOnly(intellijCoreJar()) - compileOnly(intellij { include("asm-all.jar") }) - } + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } + compileOnly(intellijDep()) { includeJars("asm-all") } } sourceSets { diff --git a/ultimate/build.gradle.kts b/ultimate/build.gradle.kts index f874a122aa2..30017fa3897 100644 --- a/ultimate/build.gradle.kts +++ b/ultimate/build.gradle.kts @@ -6,36 +6,6 @@ description = "Kotlin IDEA Ultimate plugin" apply { plugin("kotlin") - plugin("org.jetbrains.intellij") -} - -configureIntellijPlugin { - version = (rootProject.extra["versions.intellij"] as String).replaceFirst("IC-", "IU-") - setExtraDependencies("intellij-core") - setPlugins("CSS", - "DatabaseTools", - "JavaEE", - "jsp", - "PersistenceSupport", - "Spring", - "properties", - "java-i18n", - "gradle", - "Groovy", - "junit", - "uml", - "JavaScriptLanguage", - "JavaScriptDebugger", - "properties", - "coverage", - "maven", - "android", - "testng", - "IntelliLang", - "testng", - "copyright", - "java-decompiler", - "NodeJS:${rootProject.extra["versions.idea.NodeJS"]}") } val ideaProjectResources = project(":idea").the().sourceSets["main"].output.resourcesDir @@ -59,6 +29,23 @@ dependencies { compile(project(":idea:idea-core")) { isTransitive = false } compile(project(":idea:ide-common")) { isTransitive = false } compile(project(":idea:idea-gradle")) { isTransitive = false } + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } + compileOnly(intellijDep()) { includeJars("annotations", "trove4j", "openapi", "idea", "util", "jdom") } + compileOnly(intellijPluginDep("CSS")) + compileOnly(intellijPluginDep("DatabaseTools")) + compileOnly(intellijPluginDep("JavaEE")) + compileOnly(intellijPluginDep("jsp")) + compileOnly(intellijPluginDep("PersistenceSupport")) + compileOnly(intellijPluginDep("Spring")) + compileOnly(intellijPluginDep("properties")) + compileOnly(intellijPluginDep("java-i18n")) + compileOnly(intellijPluginDep("gradle")) + compileOnly(intellijPluginDep("Groovy")) + compileOnly(intellijPluginDep("junit")) + compileOnly(intellijPluginDep("uml")) + compileOnly(intellijPluginDep("JavaScriptLanguage")) + compileOnly(intellijPluginDep("JavaScriptDebugger")) + compileOnly(intellijPluginDep("NodeJS")) testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) testCompile(project(":idea:idea-test-framework")) { isTransitive = false } @@ -97,52 +84,31 @@ dependencies { springClasspath(commonDep("org.springframework", "spring-context")) springClasspath(commonDep("org.springframework", "spring-tx")) springClasspath(commonDep("org.springframework", "spring-web")) -} -afterEvaluate { - dependencies { - compileOnly(intellijCoreJar()) - compileOnly(intellij { include("annotations.jar", "trove4j.jar", "openapi.jar", "idea.jar", "util.jar", "jdom.jar") }) - compileOnly(intellijPlugin("CSS")) - compileOnly(intellijPlugin("DatabaseTools")) - compileOnly(intellijPlugin("JavaEE")) - compileOnly(intellijPlugin("jsp")) - compileOnly(intellijPlugin("PersistenceSupport")) - compileOnly(intellijPlugin("Spring")) - compileOnly(intellijPlugin("properties")) - compileOnly(intellijPlugin("java-i18n")) - compileOnly(intellijPlugin("gradle")) - compileOnly(intellijPlugin("Groovy")) - compileOnly(intellijPlugin("junit")) - compileOnly(intellijPlugin("uml")) - compileOnly(intellijPlugin("JavaScriptLanguage")) - compileOnly(intellijPlugin("JavaScriptDebugger")) - compileOnly(intellijPlugin("NodeJS")) - testCompileOnly(intellij { include("gson-*.jar", "annotations.jar", "trove4j.jar", "openapi.jar", "idea.jar", "util.jar", "jdom.jar") }) - testRuntime(intellij()) - testCompile(intellijPlugin("CSS")) - testCompile(intellijPlugin("DatabaseTools")) - testCompile(intellijPlugin("JavaEE")) - testCompile(intellijPlugin("jsp")) - testCompile(intellijPlugin("PersistenceSupport")) - testCompile(intellijPlugin("Spring")) - testCompile(intellijPlugin("properties")) - testCompile(intellijPlugin("java-i18n")) - testCompile(intellijPlugin("gradle")) - testCompile(intellijPlugin("Groovy")) - testCompile(intellijPlugin("junit")) - testCompile(intellijPlugin("uml")) - testCompile(intellijPlugin("JavaScriptLanguage")) - testCompile(intellijPlugin("JavaScriptDebugger")) - testCompile(intellijPlugin("NodeJS")) - testRuntime(intellijPlugin("coverage")) - testRuntime(intellijPlugin("maven")) - testRuntime(intellijPlugin("android")) - testRuntime(intellijPlugin("testng")) - testRuntime(intellijPlugin("IntelliLang")) - testRuntime(intellijPlugin("copyright")) - testRuntime(intellijPlugin("java-decompiler")) - } + testCompileOnly(intellijDep()) { includeJars("gson-2.5", "annotations", "trove4j", "openapi", "idea", "util", "jdom") } + testRuntime(intellijDep()) + testCompile(intellijPluginDep("CSS")) + testCompile(intellijPluginDep("DatabaseTools")) + testCompile(intellijPluginDep("JavaEE")) + testCompile(intellijPluginDep("jsp")) + testCompile(intellijPluginDep("PersistenceSupport")) + testCompile(intellijPluginDep("Spring")) + testCompile(intellijPluginDep("properties")) + testCompile(intellijPluginDep("java-i18n")) + testCompile(intellijPluginDep("gradle")) + testCompile(intellijPluginDep("Groovy")) + testCompile(intellijPluginDep("junit")) + testCompile(intellijPluginDep("uml")) + testCompile(intellijPluginDep("JavaScriptLanguage")) + testCompile(intellijPluginDep("JavaScriptDebugger")) + testCompile(intellijPluginDep("NodeJS")) + testRuntime(intellijPluginDep("coverage")) + testRuntime(intellijPluginDep("maven")) + testRuntime(intellijPluginDep("android")) + testRuntime(intellijPluginDep("testng")) + testRuntime(intellijPluginDep("IntelliLang")) + testRuntime(intellijPluginDep("copyright")) + testRuntime(intellijPluginDep("java-decompiler")) } val preparedResources = File(buildDir, "prepResources") diff --git a/ultimate/ultimate-runner/build.gradle.kts b/ultimate/ultimate-runner/build.gradle.kts index 0336eabc159..01618ab09c5 100644 --- a/ultimate/ultimate-runner/build.gradle.kts +++ b/ultimate/ultimate-runner/build.gradle.kts @@ -1,13 +1,19 @@ -import org.jetbrains.intellij.IntelliJPluginExtension import org.jetbrains.intellij.tasks.PrepareSandboxTask import org.jetbrains.intellij.tasks.RunIdeTask -apply { plugin("kotlin") } - -configureIntellijPlugin { - version = (rootProject.extra["versions.intellij"] as String).replaceFirst("IC-", "IU-") +buildscript { + repositories { + maven(url = "https://oss.sonatype.org/content/repositories/snapshots/") // for intellij plugin + maven(url = "http://dl.bintray.com/jetbrains/intellij-plugin-service") // for intellij plugin + jcenter() + } + dependencies { + classpath("org.jetbrains.intellij.plugins:gradle-intellij-plugin:0.3.0-SNAPSHOT") + } } +apply { plugin("kotlin") } + dependencies { compileOnly(project(":idea")) compileOnly(project(":idea:idea-maven")) @@ -15,12 +21,7 @@ dependencies { compileOnly(project(":idea:idea-jvm")) runtimeOnly(files(toolsJar())) -} - -afterEvaluate { - dependencies { - compileOnly(intellij()) - } + compileOnly(intellijDep()) } afterEvaluate { @@ -44,7 +45,7 @@ afterEvaluate { dependsOn(prepareSandbox) group = "intellij" description = "Runs Intellij IDEA Ultimate with installed plugin." - setIdeaDirectory(the().ideaDependency.classes) + setIdeaDirectory(intellijRootDir()) setConfigDirectory(File(ideaUltimateSandboxDir, "config")) setSystemDirectory(ideaUltimateSandboxDir) setPluginsDirectory(ideaUltimatePluginDir.parent)