From c85f56a0a83c23bff48a4cb3f7f9868f7b0d4d5d Mon Sep 17 00:00:00 2001 From: Andrey Uskov Date: Fri, 23 Nov 2018 18:37:58 +0300 Subject: [PATCH] Remove some bunches for build scripts. --- compiler/frontend.java/build.gradle.kts | 5 +- compiler/frontend.java/build.gradle.kts.181 | 22 -- generators/build.gradle.kts | 8 +- generators/build.gradle.kts.as31 | 54 ----- generators/build.gradle.kts.as32 | 54 ----- generators/build.gradle.kts.as33 | 54 ----- generators/build.gradle.kts.as34 | 54 ----- idea/build.gradle.kts | 7 +- idea/build.gradle.kts.173 | 201 ---------------- idea/build.gradle.kts.as31 | 202 ---------------- idea/build.gradle.kts.as32 | 202 ---------------- idea/build.gradle.kts.as33 | 201 ---------------- idea/build.gradle.kts.as34 | 201 ---------------- .../build.gradle.kts | 9 +- .../build.gradle.kts.as33 | 25 -- .../build.gradle.kts.as34 | 25 -- idea/idea-gradle/build.gradle.kts | 4 +- idea/idea-gradle/build.gradle.kts.as31 | 75 ------ idea/idea-gradle/build.gradle.kts.as32 | 75 ------ idea/idea-gradle/build.gradle.kts.as33 | 75 ------ idea/idea-gradle/build.gradle.kts.as34 | 75 ------ j2k/build.gradle.kts | 14 +- j2k/build.gradle.kts.173 | 76 ------ j2k/build.gradle.kts.as31 | 77 ------ j2k/build.gradle.kts.as32 | 78 ------ j2k/build.gradle.kts.as33 | 78 ------ j2k/build.gradle.kts.as34 | 78 ------ jps-plugin/build.gradle.kts | 20 +- jps-plugin/build.gradle.kts.173 | 57 ----- jps-plugin/build.gradle.kts.as31 | 56 ----- jps-plugin/build.gradle.kts.as32 | 56 ----- jps-plugin/build.gradle.kts.as33 | 55 ----- jps-plugin/build.gradle.kts.as34 | 55 ----- .../tools/kotlin-script-util/build.gradle.kts | 7 +- .../kotlin-script-util/build.gradle.kts.173 | 41 ---- .../kotlin-script-util/build.gradle.kts.as32 | 41 ---- ultimate/build.gradle.kts.as31 | 222 +---------------- ultimate/build.gradle.kts.as32 | 223 +----------------- 38 files changed, 58 insertions(+), 2804 deletions(-) delete mode 100644 compiler/frontend.java/build.gradle.kts.181 delete mode 100644 generators/build.gradle.kts.as31 delete mode 100644 generators/build.gradle.kts.as32 delete mode 100644 generators/build.gradle.kts.as33 delete mode 100644 generators/build.gradle.kts.as34 delete mode 100644 idea/build.gradle.kts.173 delete mode 100644 idea/build.gradle.kts.as31 delete mode 100644 idea/build.gradle.kts.as32 delete mode 100644 idea/build.gradle.kts.as33 delete mode 100644 idea/build.gradle.kts.as34 delete mode 100644 idea/idea-android/idea-android-output-parser/build.gradle.kts.as33 delete mode 100644 idea/idea-android/idea-android-output-parser/build.gradle.kts.as34 delete mode 100644 idea/idea-gradle/build.gradle.kts.as31 delete mode 100644 idea/idea-gradle/build.gradle.kts.as32 delete mode 100644 idea/idea-gradle/build.gradle.kts.as33 delete mode 100644 idea/idea-gradle/build.gradle.kts.as34 delete mode 100644 j2k/build.gradle.kts.173 delete mode 100644 j2k/build.gradle.kts.as31 delete mode 100644 j2k/build.gradle.kts.as32 delete mode 100644 j2k/build.gradle.kts.as33 delete mode 100644 j2k/build.gradle.kts.as34 delete mode 100644 jps-plugin/build.gradle.kts.173 delete mode 100644 jps-plugin/build.gradle.kts.as31 delete mode 100644 jps-plugin/build.gradle.kts.as32 delete mode 100644 jps-plugin/build.gradle.kts.as33 delete mode 100644 jps-plugin/build.gradle.kts.as34 delete mode 100644 libraries/tools/kotlin-script-util/build.gradle.kts.173 delete mode 100644 libraries/tools/kotlin-script-util/build.gradle.kts.as32 diff --git a/compiler/frontend.java/build.gradle.kts b/compiler/frontend.java/build.gradle.kts index cb52a995460..abdb8394049 100644 --- a/compiler/frontend.java/build.gradle.kts +++ b/compiler/frontend.java/build.gradle.kts @@ -1,4 +1,3 @@ - plugins { kotlin("jvm") id("jps-compatible") @@ -10,7 +9,9 @@ dependencies { compile(project(":core:descriptors")) compile(project(":core:descriptors.jvm")) compile(project(":compiler:util")) - compile("javax.annotation:jsr250-api:1.0") + if (Platform[182].orHigher()) { + compile("javax.annotation:jsr250-api:1.0") + } compile(project(":compiler:frontend")) compileOnly(intellijCoreDep()) { includeJars("intellij-core") } compileOnly(intellijDep()) { includeJars("annotations", "asm-all", "trove4j", "guava", rootProject = rootProject) } diff --git a/compiler/frontend.java/build.gradle.kts.181 b/compiler/frontend.java/build.gradle.kts.181 deleted file mode 100644 index 3917f2b3c12..00000000000 --- a/compiler/frontend.java/build.gradle.kts.181 +++ /dev/null @@ -1,22 +0,0 @@ - -plugins { - kotlin("jvm") - id("jps-compatible") -} - -jvmTarget = "1.6" - -dependencies { - compile(project(":core:descriptors")) - compile(project(":core:descriptors.jvm")) - compile(project(":compiler:util")) - compile(project(":compiler:frontend")) - compileOnly(intellijCoreDep()) { includeJars("intellij-core") } - compileOnly(intellijDep()) { includeJars("annotations", "asm-all", "trove4j", "guava", rootProject = rootProject) } -} - -sourceSets { - "main" { projectDefault() } - "test" {} -} - diff --git a/generators/build.gradle.kts b/generators/build.gradle.kts index dc7f3f28578..63eb714f52d 100644 --- a/generators/build.gradle.kts +++ b/generators/build.gradle.kts @@ -1,4 +1,3 @@ - plugins { kotlin("jvm") id("jps-compatible") @@ -30,12 +29,15 @@ dependencies { compile(projectTests(":kotlin-sam-with-receiver-compiler-plugin")) compile(projectTests(":generators:test-generator")) builtinsCompile("org.jetbrains.kotlin:kotlin-stdlib:$bootstrapKotlinVersion") - testCompileOnly(intellijDep("jps-build-test")) testCompileOnly(project(":kotlin-reflect-api")) - testCompile(intellijDep("jps-build-test")) testCompile(builtinsSourceSet.output) testRuntime(intellijDep()) { includeJars("idea_rt") } testRuntime(project(":kotlin-reflect")) + + if (Ide.IJ()) { + testCompileOnly(intellijDep("jps-build-test")) + testCompile(intellijDep("jps-build-test")) + } } diff --git a/generators/build.gradle.kts.as31 b/generators/build.gradle.kts.as31 deleted file mode 100644 index a71a5602e6b..00000000000 --- a/generators/build.gradle.kts.as31 +++ /dev/null @@ -1,54 +0,0 @@ - -plugins { - kotlin("jvm") - id("jps-compatible") -} - -sourceSets { - "main" { } - "test" { projectDefault() } -} - -val builtinsSourceSet = sourceSets.create("builtins") { - java.srcDir("builtins") -} -val builtinsCompile by configurations - -dependencies { - compile(projectTests(":compiler:cli")) - compile(projectTests(":idea:idea-maven")) - compile(projectTests(":j2k")) - compile(projectTests(":idea:idea-android")) - compile(projectTests(":jps-plugin")) - compile(projectTests(":plugins:android-extensions-compiler")) - compile(projectTests(":plugins:android-extensions-ide")) - compile(projectTests(":plugins:android-extensions-jps")) - compile(projectTests(":kotlin-annotation-processing")) - compile(projectTests(":kotlin-annotation-processing-cli")) - compile(projectTests(":kotlin-allopen-compiler-plugin")) - compile(projectTests(":kotlin-noarg-compiler-plugin")) - compile(projectTests(":kotlin-sam-with-receiver-compiler-plugin")) - compile(projectTests(":generators:test-generator")) - builtinsCompile("org.jetbrains.kotlin:kotlin-stdlib:$bootstrapKotlinVersion") - // testCompileOnly(intellijDep("jps-build-test")) - testCompileOnly(project(":kotlin-reflect-api")) - testCompile(builtinsSourceSet.output) - testRuntime(intellijDep()) { includeJars("idea_rt") } - testRuntime(project(":kotlin-reflect")) -} - - -projectTest { - workingDir = rootDir -} - -val generateTests by generator("org.jetbrains.kotlin.generators.tests.GenerateTestsKt") - -val generateProtoBuf by generator("org.jetbrains.kotlin.generators.protobuf.GenerateProtoBufKt") -val generateProtoBufCompare by generator("org.jetbrains.kotlin.generators.protobuf.GenerateProtoBufCompare") - -val generateGradleOptions by generator("org.jetbrains.kotlin.generators.arguments.GenerateGradleOptionsKt") - -val generateBuiltins by generator("org.jetbrains.kotlin.generators.builtins.generateBuiltIns.GenerateBuiltInsKt", builtinsSourceSet) - -testsJar() diff --git a/generators/build.gradle.kts.as32 b/generators/build.gradle.kts.as32 deleted file mode 100644 index 8c8551287fd..00000000000 --- a/generators/build.gradle.kts.as32 +++ /dev/null @@ -1,54 +0,0 @@ - -plugins { - kotlin("jvm") - id("jps-compatible") -} - -sourceSets { - "main" { } - "test" { projectDefault() } -} - -val builtinsSourceSet = sourceSets.create("builtins") { - java.srcDir("builtins") -} -val builtinsCompile by configurations - -dependencies { - compile(projectTests(":compiler:cli")) - compile(projectTests(":idea:idea-maven")) - compile(projectTests(":j2k")) - compile(projectTests(":idea:idea-android")) - compile(projectTests(":jps-plugin")) - compile(projectTests(":plugins:android-extensions-compiler")) - compile(projectTests(":plugins:android-extensions-ide")) - compile(projectTests(":plugins:android-extensions-jps")) - compile(projectTests(":kotlin-annotation-processing")) - compile(projectTests(":kotlin-annotation-processing-cli")) - compile(projectTests(":kotlin-allopen-compiler-plugin")) - compile(projectTests(":kotlin-noarg-compiler-plugin")) - compile(projectTests(":kotlin-sam-with-receiver-compiler-plugin")) - compile(projectTests(":generators:test-generator")) - // testCompileOnly(intellijDep("jps-build-test")) - builtinsCompile("org.jetbrains.kotlin:kotlin-stdlib:$bootstrapKotlinVersion") - testCompileOnly(project(":kotlin-reflect-api")) - testCompile(builtinsSourceSet.output) - testRuntime(intellijDep()) { includeJars("idea_rt") } - testRuntime(project(":kotlin-reflect")) -} - - -projectTest { - workingDir = rootDir -} - -val generateTests by generator("org.jetbrains.kotlin.generators.tests.GenerateTestsKt") - -val generateProtoBuf by generator("org.jetbrains.kotlin.generators.protobuf.GenerateProtoBufKt") -val generateProtoBufCompare by generator("org.jetbrains.kotlin.generators.protobuf.GenerateProtoBufCompare") - -val generateGradleOptions by generator("org.jetbrains.kotlin.generators.arguments.GenerateGradleOptionsKt") - -val generateBuiltins by generator("org.jetbrains.kotlin.generators.builtins.generateBuiltIns.GenerateBuiltInsKt", builtinsSourceSet) - -testsJar() diff --git a/generators/build.gradle.kts.as33 b/generators/build.gradle.kts.as33 deleted file mode 100644 index 8c8551287fd..00000000000 --- a/generators/build.gradle.kts.as33 +++ /dev/null @@ -1,54 +0,0 @@ - -plugins { - kotlin("jvm") - id("jps-compatible") -} - -sourceSets { - "main" { } - "test" { projectDefault() } -} - -val builtinsSourceSet = sourceSets.create("builtins") { - java.srcDir("builtins") -} -val builtinsCompile by configurations - -dependencies { - compile(projectTests(":compiler:cli")) - compile(projectTests(":idea:idea-maven")) - compile(projectTests(":j2k")) - compile(projectTests(":idea:idea-android")) - compile(projectTests(":jps-plugin")) - compile(projectTests(":plugins:android-extensions-compiler")) - compile(projectTests(":plugins:android-extensions-ide")) - compile(projectTests(":plugins:android-extensions-jps")) - compile(projectTests(":kotlin-annotation-processing")) - compile(projectTests(":kotlin-annotation-processing-cli")) - compile(projectTests(":kotlin-allopen-compiler-plugin")) - compile(projectTests(":kotlin-noarg-compiler-plugin")) - compile(projectTests(":kotlin-sam-with-receiver-compiler-plugin")) - compile(projectTests(":generators:test-generator")) - // testCompileOnly(intellijDep("jps-build-test")) - builtinsCompile("org.jetbrains.kotlin:kotlin-stdlib:$bootstrapKotlinVersion") - testCompileOnly(project(":kotlin-reflect-api")) - testCompile(builtinsSourceSet.output) - testRuntime(intellijDep()) { includeJars("idea_rt") } - testRuntime(project(":kotlin-reflect")) -} - - -projectTest { - workingDir = rootDir -} - -val generateTests by generator("org.jetbrains.kotlin.generators.tests.GenerateTestsKt") - -val generateProtoBuf by generator("org.jetbrains.kotlin.generators.protobuf.GenerateProtoBufKt") -val generateProtoBufCompare by generator("org.jetbrains.kotlin.generators.protobuf.GenerateProtoBufCompare") - -val generateGradleOptions by generator("org.jetbrains.kotlin.generators.arguments.GenerateGradleOptionsKt") - -val generateBuiltins by generator("org.jetbrains.kotlin.generators.builtins.generateBuiltIns.GenerateBuiltInsKt", builtinsSourceSet) - -testsJar() diff --git a/generators/build.gradle.kts.as34 b/generators/build.gradle.kts.as34 deleted file mode 100644 index 8c8551287fd..00000000000 --- a/generators/build.gradle.kts.as34 +++ /dev/null @@ -1,54 +0,0 @@ - -plugins { - kotlin("jvm") - id("jps-compatible") -} - -sourceSets { - "main" { } - "test" { projectDefault() } -} - -val builtinsSourceSet = sourceSets.create("builtins") { - java.srcDir("builtins") -} -val builtinsCompile by configurations - -dependencies { - compile(projectTests(":compiler:cli")) - compile(projectTests(":idea:idea-maven")) - compile(projectTests(":j2k")) - compile(projectTests(":idea:idea-android")) - compile(projectTests(":jps-plugin")) - compile(projectTests(":plugins:android-extensions-compiler")) - compile(projectTests(":plugins:android-extensions-ide")) - compile(projectTests(":plugins:android-extensions-jps")) - compile(projectTests(":kotlin-annotation-processing")) - compile(projectTests(":kotlin-annotation-processing-cli")) - compile(projectTests(":kotlin-allopen-compiler-plugin")) - compile(projectTests(":kotlin-noarg-compiler-plugin")) - compile(projectTests(":kotlin-sam-with-receiver-compiler-plugin")) - compile(projectTests(":generators:test-generator")) - // testCompileOnly(intellijDep("jps-build-test")) - builtinsCompile("org.jetbrains.kotlin:kotlin-stdlib:$bootstrapKotlinVersion") - testCompileOnly(project(":kotlin-reflect-api")) - testCompile(builtinsSourceSet.output) - testRuntime(intellijDep()) { includeJars("idea_rt") } - testRuntime(project(":kotlin-reflect")) -} - - -projectTest { - workingDir = rootDir -} - -val generateTests by generator("org.jetbrains.kotlin.generators.tests.GenerateTestsKt") - -val generateProtoBuf by generator("org.jetbrains.kotlin.generators.protobuf.GenerateProtoBufKt") -val generateProtoBufCompare by generator("org.jetbrains.kotlin.generators.protobuf.GenerateProtoBufCompare") - -val generateGradleOptions by generator("org.jetbrains.kotlin.generators.arguments.GenerateGradleOptionsKt") - -val generateBuiltins by generator("org.jetbrains.kotlin.generators.builtins.generateBuiltIns.GenerateBuiltInsKt", builtinsSourceSet) - -testsJar() diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts index 7fd622ce897..93049ec5c01 100644 --- a/idea/build.gradle.kts +++ b/idea/build.gradle.kts @@ -104,13 +104,16 @@ dependencies { testCompileOnly(commonDep("com.google.code.findbugs", "jsr305")) testCompileOnly(intellijPluginDep("gradle")) testCompileOnly(intellijPluginDep("Groovy")) - testCompileOnly(intellijPluginDep("maven")) + + if (Ide.IJ()) { + testCompileOnly(intellijPluginDep("maven")) + testRuntime(intellijPluginDep("maven")) + } testRuntime(intellijPluginDep("junit")) testRuntime(intellijPluginDep("gradle")) testRuntime(intellijPluginDep("Groovy")) testRuntime(intellijPluginDep("coverage")) - testRuntime(intellijPluginDep("maven")) testRuntime(intellijPluginDep("android")) testRuntime(intellijPluginDep("smali")) testRuntime(intellijPluginDep("testng")) diff --git a/idea/build.gradle.kts.173 b/idea/build.gradle.kts.173 deleted file mode 100644 index e6e2293a283..00000000000 --- a/idea/build.gradle.kts.173 +++ /dev/null @@ -1,201 +0,0 @@ -import org.gradle.jvm.tasks.Jar - -plugins { - kotlin("jvm") - id("jps-compatible") -} - -repositories { - maven("https://jetbrains.bintray.com/markdown") -} - -dependencies { - testRuntime(intellijDep()) - - compile(project(":kotlin-stdlib-jdk8")) - compileOnly(project(":kotlin-reflect-api")) - compile(project(":core:descriptors")) - compile(project(":core:descriptors.jvm")) - compile(project(":compiler:backend")) - compile(project(":compiler:cli-common")) - compile(project(":compiler:frontend")) - compile(project(":compiler:frontend.java")) - compile(project(":compiler:frontend.script")) - compile(project(":js:js.frontend")) - compile(project(":js:js.serializer")) - compile(project(":compiler:light-classes")) - compile(project(":compiler:util")) - compile(project(":kotlin-build-common")) - compile(project(":compiler:daemon-common")) - compile(projectRuntimeJar(":kotlin-daemon-client")) - compile(project(":kotlin-compiler-runner")) { isTransitive = false } - compile(project(":compiler:plugin-api")) - compile(project(":eval4j")) - compile(project(":j2k")) - compile(project(":idea:formatter")) - compile(project(":idea:fir-view")) - compile(project(":idea:idea-core")) - compile(project(":idea:ide-common")) - compile(project(":idea:idea-jps-common")) - compile(project(":idea:kotlin-gradle-tooling")) - compile(project(":plugins:uast-kotlin")) - compile(project(":plugins:uast-kotlin-idea")) - compile(project(":kotlin-script-util")) { isTransitive = false } - compile(project(":kotlin-scripting-intellij")) - - compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false } - - compileOnly(project(":kotlin-daemon-client")) - - compileOnly(intellijDep()) - compileOnly(commonDep("org.jetbrains", "markdown")) - compileOnly(commonDep("com.google.code.findbugs", "jsr305")) - 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(projectTests(":idea:idea-test-framework")) { isTransitive = false } - testCompile(project(":idea:idea-jvm")) { isTransitive = false } - testCompile(project(":idea:idea-gradle")) { isTransitive = false } - testCompile(project(":idea:idea-maven")) { isTransitive = false } - testCompile(project(":idea:idea-native")) { isTransitive = false } - testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } - testCompile(commonDep("junit:junit")) - - testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } - testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } - - testRuntime(commonDep("org.jetbrains", "markdown")) - testRuntime(project(":plugins:kapt3-idea")) { isTransitive = false } - testRuntime(project(":kotlin-reflect")) - testRuntime(project(":kotlin-preloader")) - - testCompile(project(":kotlin-sam-with-receiver-compiler-plugin")) { isTransitive = false } - - testRuntime(project(":plugins:android-extensions-compiler")) - testRuntime(project(":plugins:android-extensions-ide")) { isTransitive = false } - testRuntime(project(":allopen-ide-plugin")) { isTransitive = false } - testRuntime(project(":kotlin-allopen-compiler-plugin")) - testRuntime(project(":noarg-ide-plugin")) { isTransitive = false } - testRuntime(project(":kotlin-noarg-compiler-plugin")) - testRuntime(project(":kotlin-scripting-idea")) { isTransitive = false } - testRuntime(project(":kotlin-scripting-compiler")) - testRuntime(project(":plugins:annotation-based-compiler-plugins-ide-support")) { isTransitive = false } - testRuntime(project(":sam-with-receiver-ide-plugin")) { isTransitive = false } - testRuntime(project(":kotlinx-serialization-compiler-plugin")) - testRuntime(project(":kotlinx-serialization-ide-plugin")) { isTransitive = false } - testRuntime(project(":idea:idea-android")) { isTransitive = false } - testRuntime(project(":plugins:lint")) { isTransitive = false } - testRuntime(project(":plugins:uast-kotlin")) - - (rootProject.extra["compilerModules"] as Array).forEach { - testRuntime(project(it)) - } - - testCompile(intellijPluginDep("IntelliLang")) - testCompile(intellijPluginDep("copyright")) - testCompile(intellijPluginDep("properties")) - testCompile(intellijPluginDep("java-i18n")) - testCompile(intellijPluginDep("stream-debugger")) - testCompileOnly(intellijDep()) - testCompileOnly(commonDep("com.google.code.findbugs", "jsr305")) - testCompileOnly(intellijPluginDep("gradle")) - testCompileOnly(intellijPluginDep("Groovy")) - testCompileOnly(intellijPluginDep("maven")) - - testRuntime(intellijPluginDep("junit")) - testRuntime(intellijPluginDep("gradle")) - testRuntime(intellijPluginDep("Groovy")) - testRuntime(intellijPluginDep("coverage")) - testRuntime(intellijPluginDep("maven")) - testRuntime(intellijPluginDep("android")) - testRuntime(intellijPluginDep("testng")) -} - -sourceSets { - "main" { - projectDefault() - java.srcDirs( - "idea-completion/src", - "idea-live-templates/src", - "idea-repl/src" - ) - resources.srcDirs( - "idea-completion/resources", - "idea-live-templates/resources", - "idea-repl/resources" - ) - } - "test" { - projectDefault() - java.srcDirs( - "idea-completion/tests", - "idea-live-templates/tests" - ) - } - -} - -val performanceTestCompile by configurations.creating { - extendsFrom(configurations["testCompile"]) -} - -val performanceTestRuntime by configurations.creating { - extendsFrom(configurations["testRuntime"]) -} - -val performanceTest by run { - val sourceSets = javaPluginConvention().sourceSets - sourceSets.creating { - compileClasspath += sourceSets["test"].output - compileClasspath += sourceSets["main"].output - runtimeClasspath += sourceSets["test"].output - runtimeClasspath += sourceSets["main"].output - java.srcDirs("performanceTests") - } -} - -projectTest { - dependsOn(":dist") - workingDir = rootDir -} - - -projectTest(taskName = "performanceTest") { - dependsOn(":dist") - dependsOn(performanceTest.output) - testClassesDirs = performanceTest.output.classesDirs - classpath = performanceTest.runtimeClasspath - workingDir = rootDir - - jvmArgs?.removeAll { it.startsWith("-Xmx") } - - maxHeapSize = "3g" - jvmArgs("-XX:SoftRefLRUPolicyMSPerMB=50") - jvmArgs( - "-XX:ReservedCodeCacheSize=240m", - "-XX:+UseCompressedOops", - "-XX:+UseConcMarkSweepGC" - ) - jvmArgs("-XX:+UnlockCommercialFeatures", "-XX:+FlightRecorder") - - if (hasProperty("perf.flight.recorder.override")) { - jvmArgs(property("perf.flight.recorder.override")) - } else { - val settings = if (hasProperty("perf.flight.recorder.settings")) ",settings=${property("perf.flight.recorder.settings")}" else "" - jvmArgs("-XX:StartFlightRecording=delay=15m,duration=5h,filename=perf.jfr$settings") - } - - doFirst { - systemProperty("idea.home.path", intellijRootDir().canonicalPath) - } -} - -testsJar {} - -classesDirsArtifact() -configureInstrumentation() - diff --git a/idea/build.gradle.kts.as31 b/idea/build.gradle.kts.as31 deleted file mode 100644 index f04bde29e97..00000000000 --- a/idea/build.gradle.kts.as31 +++ /dev/null @@ -1,202 +0,0 @@ -import org.gradle.jvm.tasks.Jar - -plugins { - kotlin("jvm") - id("jps-compatible") -} - -repositories { - maven("https://jetbrains.bintray.com/markdown") -} - -dependencies { - testRuntime(intellijDep()) - - compile(project(":kotlin-stdlib-jdk8")) - compileOnly(project(":kotlin-reflect-api")) - compile(project(":core:descriptors")) - compile(project(":core:descriptors.jvm")) - compile(project(":compiler:backend")) - compile(project(":compiler:cli-common")) - compile(project(":compiler:frontend")) - compile(project(":compiler:frontend.java")) - compile(project(":compiler:frontend.script")) - compile(project(":js:js.frontend")) - compile(project(":js:js.serializer")) - compile(project(":compiler:light-classes")) - compile(project(":compiler:util")) - compile(project(":kotlin-build-common")) - compile(project(":compiler:daemon-common")) - compile(projectRuntimeJar(":kotlin-daemon-client")) - compile(project(":kotlin-compiler-runner")) { isTransitive = false } - compile(project(":compiler:plugin-api")) - compile(project(":eval4j")) - compile(project(":j2k")) - compile(project(":idea:formatter")) - compile(project(":idea:fir-view")) - compile(project(":idea:idea-core")) - compile(project(":idea:ide-common")) - compile(project(":idea:idea-jps-common")) - compile(project(":idea:kotlin-gradle-tooling")) - compile(project(":plugins:uast-kotlin")) - compile(project(":plugins:uast-kotlin-idea")) - compile(project(":kotlin-script-util")) { isTransitive = false } - compile(project(":kotlin-scripting-intellij")) - - compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false } - - compileOnly(project(":kotlin-daemon-client")) - - compileOnly(intellijDep()) - compileOnly(commonDep("org.jetbrains", "markdown")) - compileOnly(commonDep("com.google.code.findbugs", "jsr305")) - 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(projectTests(":idea:idea-test-framework")) { isTransitive = false } - testCompile(project(":idea:idea-jvm")) { isTransitive = false } - testCompile(project(":idea:idea-gradle")) { isTransitive = false } - testCompile(project(":idea:idea-maven")) { isTransitive = false } - testCompile(project(":idea:idea-native")) { isTransitive = false } - testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } - testCompile(commonDep("junit:junit")) - - testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } - testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } - - testRuntime(commonDep("org.jetbrains", "markdown")) - testRuntime(project(":plugins:kapt3-idea")) { isTransitive = false } - testRuntime(project(":kotlin-reflect")) - testRuntime(project(":kotlin-preloader")) - - testCompile(project(":kotlin-sam-with-receiver-compiler-plugin")) { isTransitive = false } - - testRuntime(project(":plugins:android-extensions-compiler")) - testRuntime(project(":plugins:android-extensions-ide")) { isTransitive = false } - testRuntime(project(":allopen-ide-plugin")) { isTransitive = false } - testRuntime(project(":kotlin-allopen-compiler-plugin")) - testRuntime(project(":noarg-ide-plugin")) { isTransitive = false } - testRuntime(project(":kotlin-noarg-compiler-plugin")) - testRuntime(project(":kotlin-scripting-idea")) { isTransitive = false } - testRuntime(project(":kotlin-scripting-compiler")) - testRuntime(project(":plugins:annotation-based-compiler-plugins-ide-support")) { isTransitive = false } - testRuntime(project(":sam-with-receiver-ide-plugin")) { isTransitive = false } - testRuntime(project(":kotlinx-serialization-compiler-plugin")) - testRuntime(project(":kotlinx-serialization-ide-plugin")) { isTransitive = false } - testRuntime(project(":idea:idea-android")) { isTransitive = false } - testRuntime(project(":plugins:lint")) { isTransitive = false } - testRuntime(project(":plugins:uast-kotlin")) - - (rootProject.extra["compilerModules"] as Array).forEach { - testRuntime(project(it)) - } - - testCompile(intellijPluginDep("IntelliLang")) - testCompile(intellijPluginDep("copyright")) - testCompile(intellijPluginDep("properties")) - testCompile(intellijPluginDep("java-i18n")) - testCompile(intellijPluginDep("stream-debugger")) - testCompileOnly(intellijDep()) - testCompileOnly(commonDep("com.google.code.findbugs", "jsr305")) - testCompileOnly(intellijPluginDep("gradle")) - testCompileOnly(intellijPluginDep("Groovy")) - //testCompileOnly(intellijPluginDep("maven")) - - testRuntime(intellijPluginDep("junit")) - testRuntime(intellijPluginDep("gradle")) - testRuntime(intellijPluginDep("Groovy")) - testRuntime(intellijPluginDep("coverage")) - //testRuntime(intellijPluginDep("maven")) - testRuntime(intellijPluginDep("android")) - testRuntime(intellijPluginDep("smali")) - testRuntime(intellijPluginDep("testng")) -} - -sourceSets { - "main" { - projectDefault() - java.srcDirs( - "idea-completion/src", - "idea-live-templates/src", - "idea-repl/src" - ) - resources.srcDirs( - "idea-completion/resources", - "idea-live-templates/resources", - "idea-repl/resources" - ) - } - "test" { - projectDefault() - java.srcDirs( - "idea-completion/tests", - "idea-live-templates/tests" - ) - } - -} - -val performanceTestCompile by configurations.creating { - extendsFrom(configurations["testCompile"]) -} - -val performanceTestRuntime by configurations.creating { - extendsFrom(configurations["testRuntime"]) -} - -val performanceTest by run { - val sourceSets = javaPluginConvention().sourceSets - sourceSets.creating { - compileClasspath += sourceSets["test"].output - compileClasspath += sourceSets["main"].output - runtimeClasspath += sourceSets["test"].output - runtimeClasspath += sourceSets["main"].output - java.srcDirs("performanceTests") - } -} - -projectTest { - dependsOn(":dist") - workingDir = rootDir -} - - -projectTest(taskName = "performanceTest") { - dependsOn(":dist") - dependsOn(performanceTest.output) - testClassesDirs = performanceTest.output.classesDirs - classpath = performanceTest.runtimeClasspath - workingDir = rootDir - - jvmArgs?.removeAll { it.startsWith("-Xmx") } - - maxHeapSize = "3g" - jvmArgs("-XX:SoftRefLRUPolicyMSPerMB=50") - jvmArgs( - "-XX:ReservedCodeCacheSize=240m", - "-XX:+UseCompressedOops", - "-XX:+UseConcMarkSweepGC" - ) - jvmArgs("-XX:+UnlockCommercialFeatures", "-XX:+FlightRecorder") - - if (hasProperty("perf.flight.recorder.override")) { - jvmArgs(property("perf.flight.recorder.override")) - } else { - val settings = if (hasProperty("perf.flight.recorder.settings")) ",settings=${property("perf.flight.recorder.settings")}" else "" - jvmArgs("-XX:StartFlightRecording=delay=15m,duration=5h,filename=perf.jfr$settings") - } - - doFirst { - systemProperty("idea.home.path", intellijRootDir().canonicalPath) - } -} - -testsJar {} - -classesDirsArtifact() -configureInstrumentation() - diff --git a/idea/build.gradle.kts.as32 b/idea/build.gradle.kts.as32 deleted file mode 100644 index c8fc6767e61..00000000000 --- a/idea/build.gradle.kts.as32 +++ /dev/null @@ -1,202 +0,0 @@ -import org.gradle.jvm.tasks.Jar - -plugins { - kotlin("jvm") - id("jps-compatible") -} - -repositories { - maven("https://jetbrains.bintray.com/markdown") -} - -dependencies { - testRuntime(intellijDep()) - - compile(project(":kotlin-stdlib-jdk8")) - compileOnly(project(":kotlin-reflect-api")) - compile(project(":core:descriptors")) - compile(project(":core:descriptors.jvm")) - compile(project(":compiler:backend")) - compile(project(":compiler:cli-common")) - compile(project(":compiler:frontend")) - compile(project(":compiler:frontend.java")) - compile(project(":compiler:frontend.script")) - compile(project(":js:js.frontend")) - compile(project(":js:js.serializer")) - compile(project(":compiler:light-classes")) - compile(project(":compiler:util")) - compile(project(":kotlin-build-common")) - compile(project(":compiler:daemon-common")) - compile(projectRuntimeJar(":kotlin-daemon-client")) - compile(project(":kotlin-compiler-runner")) { isTransitive = false } - compile(project(":compiler:plugin-api")) - compile(project(":eval4j")) - compile(project(":j2k")) - compile(project(":idea:formatter")) - compile(project(":idea:fir-view")) - compile(project(":idea:idea-core")) - compile(project(":idea:ide-common")) - compile(project(":idea:idea-jps-common")) - compile(project(":idea:kotlin-gradle-tooling")) - compile(project(":plugins:uast-kotlin")) - compile(project(":plugins:uast-kotlin-idea")) - compile(project(":kotlin-script-util")) { isTransitive = false } - compile(project(":kotlin-scripting-intellij")) - - compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false } - - compileOnly(project(":kotlin-daemon-client")) - - compileOnly(intellijDep()) - compileOnly(commonDep("org.jetbrains", "markdown")) - compileOnly(commonDep("com.google.code.findbugs", "jsr305")) - 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(projectTests(":idea:idea-test-framework")) { isTransitive = false } - testCompile(project(":idea:idea-jvm")) { isTransitive = false } - testCompile(project(":idea:idea-gradle")) { isTransitive = false } - testCompile(project(":idea:idea-maven")) { isTransitive = false } - testCompile(project(":idea:idea-native")) { isTransitive = false } - testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } - testCompile(commonDep("junit:junit")) - - testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } - testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } - - testRuntime(commonDep("org.jetbrains", "markdown")) - testRuntime(project(":plugins:kapt3-idea")) { isTransitive = false } - testRuntime(project(":kotlin-reflect")) - testRuntime(project(":kotlin-preloader")) - - testCompile(project(":kotlin-sam-with-receiver-compiler-plugin")) { isTransitive = false } - - testRuntime(project(":plugins:android-extensions-compiler")) - testRuntime(project(":plugins:android-extensions-ide")) { isTransitive = false } - testRuntime(project(":allopen-ide-plugin")) { isTransitive = false } - testRuntime(project(":kotlin-allopen-compiler-plugin")) - testRuntime(project(":noarg-ide-plugin")) { isTransitive = false } - testRuntime(project(":kotlin-noarg-compiler-plugin")) - testRuntime(project(":plugins:annotation-based-compiler-plugins-ide-support")) { isTransitive = false } - testRuntime(project(":sam-with-receiver-ide-plugin")) { isTransitive = false } - testRuntime(project(":kotlin-scripting-idea")) { isTransitive = false } - testRuntime(project(":kotlin-scripting-compiler")) - testRuntime(project(":kotlinx-serialization-compiler-plugin")) - testRuntime(project(":kotlinx-serialization-ide-plugin")) { isTransitive = false } - testRuntime(project(":idea:idea-android")) { isTransitive = false } - testRuntime(project(":plugins:lint")) { isTransitive = false } - testRuntime(project(":plugins:uast-kotlin")) - - (rootProject.extra["compilerModules"] as Array).forEach { - testRuntime(project(it)) - } - - testCompile(intellijPluginDep("IntelliLang")) - testCompile(intellijPluginDep("copyright")) - testCompile(intellijPluginDep("properties")) - testCompile(intellijPluginDep("java-i18n")) - testCompile(intellijPluginDep("stream-debugger")) - testCompileOnly(intellijDep()) - testCompileOnly(commonDep("com.google.code.findbugs", "jsr305")) - testCompileOnly(intellijPluginDep("gradle")) - testCompileOnly(intellijPluginDep("Groovy")) - //testCompileOnly(intellijPluginDep("maven")) - - testRuntime(intellijPluginDep("junit")) - testRuntime(intellijPluginDep("gradle")) - testRuntime(intellijPluginDep("Groovy")) - testRuntime(intellijPluginDep("coverage")) - //testRuntime(intellijPluginDep("maven")) - testRuntime(intellijPluginDep("android")) - testRuntime(intellijPluginDep("smali")) - testRuntime(intellijPluginDep("testng")) -} - -sourceSets { - "main" { - projectDefault() - java.srcDirs( - "idea-completion/src", - "idea-live-templates/src", - "idea-repl/src" - ) - resources.srcDirs( - "idea-completion/resources", - "idea-live-templates/resources", - "idea-repl/resources" - ) - } - "test" { - projectDefault() - java.srcDirs( - "idea-completion/tests", - "idea-live-templates/tests" - ) - } - -} - -val performanceTestCompile by configurations.creating { - extendsFrom(configurations["testCompile"]) -} - -val performanceTestRuntime by configurations.creating { - extendsFrom(configurations["testRuntime"]) -} - -val performanceTest by run { - val sourceSets = javaPluginConvention().sourceSets - sourceSets.creating { - compileClasspath += sourceSets["test"].output - compileClasspath += sourceSets["main"].output - runtimeClasspath += sourceSets["test"].output - runtimeClasspath += sourceSets["main"].output - java.srcDirs("performanceTests") - } -} - -projectTest { - dependsOn(":dist") - workingDir = rootDir -} - - -projectTest(taskName = "performanceTest") { - dependsOn(":dist") - dependsOn(performanceTest.output) - testClassesDirs = performanceTest.output.classesDirs - classpath = performanceTest.runtimeClasspath - workingDir = rootDir - - jvmArgs?.removeAll { it.startsWith("-Xmx") } - - maxHeapSize = "3g" - jvmArgs("-XX:SoftRefLRUPolicyMSPerMB=50") - jvmArgs( - "-XX:ReservedCodeCacheSize=240m", - "-XX:+UseCompressedOops", - "-XX:+UseConcMarkSweepGC" - ) - jvmArgs("-XX:+UnlockCommercialFeatures", "-XX:+FlightRecorder") - - if (hasProperty("perf.flight.recorder.override")) { - jvmArgs(property("perf.flight.recorder.override")) - } else { - val settings = if (hasProperty("perf.flight.recorder.settings")) ",settings=${property("perf.flight.recorder.settings")}" else "" - jvmArgs("-XX:StartFlightRecording=delay=15m,duration=5h,filename=perf.jfr$settings") - } - - doFirst { - systemProperty("idea.home.path", intellijRootDir().canonicalPath) - } -} - -testsJar {} - -classesDirsArtifact() -configureInstrumentation() - diff --git a/idea/build.gradle.kts.as33 b/idea/build.gradle.kts.as33 deleted file mode 100644 index 6b2c67a8620..00000000000 --- a/idea/build.gradle.kts.as33 +++ /dev/null @@ -1,201 +0,0 @@ -import org.gradle.jvm.tasks.Jar - -plugins { - kotlin("jvm") - id("jps-compatible") -} - -repositories { - maven("https://jetbrains.bintray.com/markdown") -} - -dependencies { - testRuntime(intellijDep()) - - compile(project(":kotlin-stdlib-jdk8")) - compileOnly(project(":kotlin-reflect-api")) - compile(project(":core:descriptors")) - compile(project(":core:descriptors.jvm")) - compile(project(":compiler:backend")) - compile(project(":compiler:cli-common")) - compile(project(":compiler:frontend")) - compile(project(":compiler:frontend.java")) - compile(project(":compiler:frontend.script")) - compile(project(":js:js.frontend")) - compile(project(":js:js.serializer")) - compile(project(":compiler:light-classes")) - compile(project(":compiler:util")) - compile(project(":kotlin-build-common")) - compile(project(":compiler:daemon-common")) - compile(projectRuntimeJar(":kotlin-daemon-client")) - compile(project(":kotlin-compiler-runner")) { isTransitive = false } - compile(project(":compiler:plugin-api")) - compile(project(":eval4j")) - compile(project(":j2k")) - compile(project(":idea:formatter")) - compile(project(":idea:fir-view")) - compile(project(":idea:idea-core")) - compile(project(":idea:ide-common")) - compile(project(":idea:idea-jps-common")) - compile(project(":idea:kotlin-gradle-tooling")) - compile(project(":plugins:uast-kotlin")) - compile(project(":plugins:uast-kotlin-idea")) - compile(project(":kotlin-script-util")) { isTransitive = false } - compile(project(":kotlin-scripting-intellij")) - - compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false } - - compileOnly(project(":kotlin-daemon-client")) - - compileOnly(intellijDep()) - compileOnly(commonDep("org.jetbrains", "markdown")) - compileOnly(commonDep("com.google.code.findbugs", "jsr305")) - 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(projectTests(":idea:idea-test-framework")) { isTransitive = false } - testCompile(project(":idea:idea-jvm")) { isTransitive = false } - testCompile(project(":idea:idea-gradle")) { isTransitive = false } - testCompile(project(":idea:idea-maven")) { isTransitive = false } - testCompile(project(":idea:idea-native")) { isTransitive = false } - testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } - testCompile(commonDep("junit:junit")) - - testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } - testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } - - testRuntime(commonDep("org.jetbrains", "markdown")) - testRuntime(project(":plugins:kapt3-idea")) { isTransitive = false } - testRuntime(project(":kotlin-reflect")) - testRuntime(project(":kotlin-preloader")) - - testCompile(project(":kotlin-sam-with-receiver-compiler-plugin")) { isTransitive = false } - - testRuntime(project(":plugins:android-extensions-compiler")) - testRuntime(project(":plugins:android-extensions-ide")) { isTransitive = false } - testRuntime(project(":allopen-ide-plugin")) { isTransitive = false } - testRuntime(project(":kotlin-allopen-compiler-plugin")) - testRuntime(project(":noarg-ide-plugin")) { isTransitive = false } - testRuntime(project(":kotlin-noarg-compiler-plugin")) - testRuntime(project(":plugins:annotation-based-compiler-plugins-ide-support")) { isTransitive = false } - testRuntime(project(":kotlin-scripting-idea")) { isTransitive = false } - testRuntime(project(":kotlin-scripting-compiler")) - testRuntime(project(":sam-with-receiver-ide-plugin")) { isTransitive = false } - testRuntime(project(":kotlinx-serialization-compiler-plugin")) - testRuntime(project(":kotlinx-serialization-ide-plugin")) { isTransitive = false } - testRuntime(project(":idea:idea-android")) { isTransitive = false } - testRuntime(project(":plugins:lint")) { isTransitive = false } - testRuntime(project(":plugins:uast-kotlin")) - - (rootProject.extra["compilerModules"] as Array).forEach { - testRuntime(project(it)) - } - - testCompile(intellijPluginDep("IntelliLang")) - testCompile(intellijPluginDep("copyright")) - testCompile(intellijPluginDep("properties")) - testCompile(intellijPluginDep("java-i18n")) - testCompile(intellijPluginDep("stream-debugger")) - testCompileOnly(intellijDep()) - testCompileOnly(commonDep("com.google.code.findbugs", "jsr305")) - testCompileOnly(intellijPluginDep("gradle")) - testCompileOnly(intellijPluginDep("Groovy")) - //testCompileOnly(intellijPluginDep("maven")) - - testRuntime(intellijPluginDep("junit")) - testRuntime(intellijPluginDep("gradle")) - testRuntime(intellijPluginDep("Groovy")) - testRuntime(intellijPluginDep("coverage")) - //testRuntime(intellijPluginDep("maven")) - testRuntime(intellijPluginDep("android")) - testRuntime(intellijPluginDep("smali")) - testRuntime(intellijPluginDep("testng")) -} - -sourceSets { - "main" { - projectDefault() - java.srcDirs( - "idea-completion/src", - "idea-live-templates/src", - "idea-repl/src" - ) - resources.srcDirs( - "idea-completion/resources", - "idea-live-templates/resources", - "idea-repl/resources" - ) - } - "test" { - projectDefault() - java.srcDirs( - "idea-completion/tests", - "idea-live-templates/tests" - ) - } - -} - -val performanceTestCompile by configurations.creating { - extendsFrom(configurations["testCompile"]) -} - -val performanceTestRuntime by configurations.creating { - extendsFrom(configurations["testRuntime"]) -} - -val performanceTest by run { - sourceSets.creating { - compileClasspath += sourceSets["test"].output - compileClasspath += sourceSets["main"].output - runtimeClasspath += sourceSets["test"].output - runtimeClasspath += sourceSets["main"].output - java.srcDirs("performanceTests") - } -} - -projectTest { - dependsOn(":dist") - workingDir = rootDir -} - - -projectTest(taskName = "performanceTest") { - dependsOn(":dist") - dependsOn(performanceTest.output) - testClassesDirs = performanceTest.output.classesDirs - classpath = performanceTest.runtimeClasspath - workingDir = rootDir - - jvmArgs?.removeAll { it.startsWith("-Xmx") } - - maxHeapSize = "3g" - jvmArgs("-XX:SoftRefLRUPolicyMSPerMB=50") - jvmArgs( - "-XX:ReservedCodeCacheSize=240m", - "-XX:+UseCompressedOops", - "-XX:+UseConcMarkSweepGC" - ) - jvmArgs("-XX:+UnlockCommercialFeatures", "-XX:+FlightRecorder") - - if (hasProperty("perf.flight.recorder.override")) { - jvmArgs(property("perf.flight.recorder.override")) - } else { - val settings = if (hasProperty("perf.flight.recorder.settings")) ",settings=${property("perf.flight.recorder.settings")}" else "" - jvmArgs("-XX:StartFlightRecording=delay=15m,duration=5h,filename=perf.jfr$settings") - } - - doFirst { - systemProperty("idea.home.path", intellijRootDir().canonicalPath) - } -} - -testsJar {} - -classesDirsArtifact() -configureInstrumentation() - diff --git a/idea/build.gradle.kts.as34 b/idea/build.gradle.kts.as34 deleted file mode 100644 index 6b2c67a8620..00000000000 --- a/idea/build.gradle.kts.as34 +++ /dev/null @@ -1,201 +0,0 @@ -import org.gradle.jvm.tasks.Jar - -plugins { - kotlin("jvm") - id("jps-compatible") -} - -repositories { - maven("https://jetbrains.bintray.com/markdown") -} - -dependencies { - testRuntime(intellijDep()) - - compile(project(":kotlin-stdlib-jdk8")) - compileOnly(project(":kotlin-reflect-api")) - compile(project(":core:descriptors")) - compile(project(":core:descriptors.jvm")) - compile(project(":compiler:backend")) - compile(project(":compiler:cli-common")) - compile(project(":compiler:frontend")) - compile(project(":compiler:frontend.java")) - compile(project(":compiler:frontend.script")) - compile(project(":js:js.frontend")) - compile(project(":js:js.serializer")) - compile(project(":compiler:light-classes")) - compile(project(":compiler:util")) - compile(project(":kotlin-build-common")) - compile(project(":compiler:daemon-common")) - compile(projectRuntimeJar(":kotlin-daemon-client")) - compile(project(":kotlin-compiler-runner")) { isTransitive = false } - compile(project(":compiler:plugin-api")) - compile(project(":eval4j")) - compile(project(":j2k")) - compile(project(":idea:formatter")) - compile(project(":idea:fir-view")) - compile(project(":idea:idea-core")) - compile(project(":idea:ide-common")) - compile(project(":idea:idea-jps-common")) - compile(project(":idea:kotlin-gradle-tooling")) - compile(project(":plugins:uast-kotlin")) - compile(project(":plugins:uast-kotlin-idea")) - compile(project(":kotlin-script-util")) { isTransitive = false } - compile(project(":kotlin-scripting-intellij")) - - compile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false } - - compileOnly(project(":kotlin-daemon-client")) - - compileOnly(intellijDep()) - compileOnly(commonDep("org.jetbrains", "markdown")) - compileOnly(commonDep("com.google.code.findbugs", "jsr305")) - 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(projectTests(":idea:idea-test-framework")) { isTransitive = false } - testCompile(project(":idea:idea-jvm")) { isTransitive = false } - testCompile(project(":idea:idea-gradle")) { isTransitive = false } - testCompile(project(":idea:idea-maven")) { isTransitive = false } - testCompile(project(":idea:idea-native")) { isTransitive = false } - testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } - testCompile(commonDep("junit:junit")) - - testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } - testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } - - testRuntime(commonDep("org.jetbrains", "markdown")) - testRuntime(project(":plugins:kapt3-idea")) { isTransitive = false } - testRuntime(project(":kotlin-reflect")) - testRuntime(project(":kotlin-preloader")) - - testCompile(project(":kotlin-sam-with-receiver-compiler-plugin")) { isTransitive = false } - - testRuntime(project(":plugins:android-extensions-compiler")) - testRuntime(project(":plugins:android-extensions-ide")) { isTransitive = false } - testRuntime(project(":allopen-ide-plugin")) { isTransitive = false } - testRuntime(project(":kotlin-allopen-compiler-plugin")) - testRuntime(project(":noarg-ide-plugin")) { isTransitive = false } - testRuntime(project(":kotlin-noarg-compiler-plugin")) - testRuntime(project(":plugins:annotation-based-compiler-plugins-ide-support")) { isTransitive = false } - testRuntime(project(":kotlin-scripting-idea")) { isTransitive = false } - testRuntime(project(":kotlin-scripting-compiler")) - testRuntime(project(":sam-with-receiver-ide-plugin")) { isTransitive = false } - testRuntime(project(":kotlinx-serialization-compiler-plugin")) - testRuntime(project(":kotlinx-serialization-ide-plugin")) { isTransitive = false } - testRuntime(project(":idea:idea-android")) { isTransitive = false } - testRuntime(project(":plugins:lint")) { isTransitive = false } - testRuntime(project(":plugins:uast-kotlin")) - - (rootProject.extra["compilerModules"] as Array).forEach { - testRuntime(project(it)) - } - - testCompile(intellijPluginDep("IntelliLang")) - testCompile(intellijPluginDep("copyright")) - testCompile(intellijPluginDep("properties")) - testCompile(intellijPluginDep("java-i18n")) - testCompile(intellijPluginDep("stream-debugger")) - testCompileOnly(intellijDep()) - testCompileOnly(commonDep("com.google.code.findbugs", "jsr305")) - testCompileOnly(intellijPluginDep("gradle")) - testCompileOnly(intellijPluginDep("Groovy")) - //testCompileOnly(intellijPluginDep("maven")) - - testRuntime(intellijPluginDep("junit")) - testRuntime(intellijPluginDep("gradle")) - testRuntime(intellijPluginDep("Groovy")) - testRuntime(intellijPluginDep("coverage")) - //testRuntime(intellijPluginDep("maven")) - testRuntime(intellijPluginDep("android")) - testRuntime(intellijPluginDep("smali")) - testRuntime(intellijPluginDep("testng")) -} - -sourceSets { - "main" { - projectDefault() - java.srcDirs( - "idea-completion/src", - "idea-live-templates/src", - "idea-repl/src" - ) - resources.srcDirs( - "idea-completion/resources", - "idea-live-templates/resources", - "idea-repl/resources" - ) - } - "test" { - projectDefault() - java.srcDirs( - "idea-completion/tests", - "idea-live-templates/tests" - ) - } - -} - -val performanceTestCompile by configurations.creating { - extendsFrom(configurations["testCompile"]) -} - -val performanceTestRuntime by configurations.creating { - extendsFrom(configurations["testRuntime"]) -} - -val performanceTest by run { - sourceSets.creating { - compileClasspath += sourceSets["test"].output - compileClasspath += sourceSets["main"].output - runtimeClasspath += sourceSets["test"].output - runtimeClasspath += sourceSets["main"].output - java.srcDirs("performanceTests") - } -} - -projectTest { - dependsOn(":dist") - workingDir = rootDir -} - - -projectTest(taskName = "performanceTest") { - dependsOn(":dist") - dependsOn(performanceTest.output) - testClassesDirs = performanceTest.output.classesDirs - classpath = performanceTest.runtimeClasspath - workingDir = rootDir - - jvmArgs?.removeAll { it.startsWith("-Xmx") } - - maxHeapSize = "3g" - jvmArgs("-XX:SoftRefLRUPolicyMSPerMB=50") - jvmArgs( - "-XX:ReservedCodeCacheSize=240m", - "-XX:+UseCompressedOops", - "-XX:+UseConcMarkSweepGC" - ) - jvmArgs("-XX:+UnlockCommercialFeatures", "-XX:+FlightRecorder") - - if (hasProperty("perf.flight.recorder.override")) { - jvmArgs(property("perf.flight.recorder.override")) - } else { - val settings = if (hasProperty("perf.flight.recorder.settings")) ",settings=${property("perf.flight.recorder.settings")}" else "" - jvmArgs("-XX:StartFlightRecording=delay=15m,duration=5h,filename=perf.jfr$settings") - } - - doFirst { - systemProperty("idea.home.path", intellijRootDir().canonicalPath) - } -} - -testsJar {} - -classesDirsArtifact() -configureInstrumentation() - 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 c24a5fa9d42..99cd18f5524 100644 --- a/idea/idea-android/idea-android-output-parser/build.gradle.kts +++ b/idea/idea-android/idea-android-output-parser/build.gradle.kts @@ -1,4 +1,3 @@ - plugins { kotlin("jvm") } @@ -14,7 +13,13 @@ dependencies { } sourceSets { - "main" { projectDefault() } + if (Ide.IJ()) { + "main" { + projectDefault() + } + } else { + "main" {} + } "test" {} } diff --git a/idea/idea-android/idea-android-output-parser/build.gradle.kts.as33 b/idea/idea-android/idea-android-output-parser/build.gradle.kts.as33 deleted file mode 100644 index f4a76a3ba5f..00000000000 --- a/idea/idea-android/idea-android-output-parser/build.gradle.kts.as33 +++ /dev/null @@ -1,25 +0,0 @@ - -plugins { - kotlin("jvm") -} - -apply { plugin("jps-compatible") } - -dependencies { - compile(project(":compiler:util")) - compileOnly(intellijCoreDep()) { includeJars("intellij-core") } - compileOnly(intellijDep()) - compileOnly(intellijPluginDep("gradle")) - compileOnly(intellijPluginDep("android")) -} - -sourceSets { - "main" {} - "test" {} -} - -runtimeJar { - archiveName = "android-output-parser-ide.jar" -} - -ideaPlugin() diff --git a/idea/idea-android/idea-android-output-parser/build.gradle.kts.as34 b/idea/idea-android/idea-android-output-parser/build.gradle.kts.as34 deleted file mode 100644 index f4a76a3ba5f..00000000000 --- a/idea/idea-android/idea-android-output-parser/build.gradle.kts.as34 +++ /dev/null @@ -1,25 +0,0 @@ - -plugins { - kotlin("jvm") -} - -apply { plugin("jps-compatible") } - -dependencies { - compile(project(":compiler:util")) - compileOnly(intellijCoreDep()) { includeJars("intellij-core") } - compileOnly(intellijDep()) - compileOnly(intellijPluginDep("gradle")) - compileOnly(intellijPluginDep("android")) -} - -sourceSets { - "main" {} - "test" {} -} - -runtimeJar { - archiveName = "android-output-parser-ide.jar" -} - -ideaPlugin() diff --git a/idea/idea-gradle/build.gradle.kts b/idea/idea-gradle/build.gradle.kts index 1eabaf34ee1..1ee11069553 100644 --- a/idea/idea-gradle/build.gradle.kts +++ b/idea/idea-gradle/build.gradle.kts @@ -52,7 +52,9 @@ dependencies { testRuntime(intellijPluginDep("gradle")) testRuntime(intellijPluginDep("Groovy")) testRuntime(intellijPluginDep("coverage")) - testRuntime(intellijPluginDep("maven")) + if (Ide.IJ()) { + testRuntime(intellijPluginDep("maven")) + } testRuntime(intellijPluginDep("android")) testRuntime(intellijPluginDep("smali")) } diff --git a/idea/idea-gradle/build.gradle.kts.as31 b/idea/idea-gradle/build.gradle.kts.as31 deleted file mode 100644 index dbf27511683..00000000000 --- a/idea/idea-gradle/build.gradle.kts.as31 +++ /dev/null @@ -1,75 +0,0 @@ -plugins { - kotlin("jvm") - id("jps-compatible") -} - -dependencies { - testRuntime(intellijDep()) - - compileOnly(project(":idea")) - compileOnly(project(":idea:idea-jvm")) - compile(project(":idea:kotlin-gradle-tooling")) - - compile(project(":compiler:frontend")) - compile(project(":compiler:frontend.java")) - compile(project(":compiler:frontend.script")) - - compile(project(":js:js.frontend")) - - compileOnly(intellijDep()) - compileOnly(intellijPluginDep("gradle")) - compileOnly(intellijPluginDep("Groovy")) - compileOnly(intellijPluginDep("junit")) - compileOnly(intellijPluginDep("testng")) - - testCompile(projectTests(":idea")) - testCompile(projectTests(":idea:idea-test-framework")) - - testCompile(intellijPluginDep("gradle")) - testCompileOnly(intellijPluginDep("Groovy")) - testCompileOnly(intellijDep()) - - testCompile(project(":idea:idea-native")) { isTransitive = false } - testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } - testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } - testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } - - testRuntime(project(":kotlin-reflect")) - testRuntime(project(":idea:idea-jvm")) - testRuntime(project(":idea:idea-android")) - testRuntime(project(":plugins:kapt3-idea")) - testRuntime(project(":plugins:android-extensions-ide")) - testRuntime(project(":plugins:lint")) - testRuntime(project(":sam-with-receiver-ide-plugin")) - testRuntime(project(":allopen-ide-plugin")) - testRuntime(project(":noarg-ide-plugin")) - testRuntime(project(":kotlin-scripting-idea")) - testRuntime(project(":kotlinx-serialization-ide-plugin")) - // TODO: the order of the plugins matters here, consider avoiding order-dependency - testRuntime(intellijPluginDep("junit")) - testRuntime(intellijPluginDep("testng")) - testRuntime(intellijPluginDep("properties")) - testRuntime(intellijPluginDep("gradle")) - testRuntime(intellijPluginDep("Groovy")) - testRuntime(intellijPluginDep("coverage")) - //testRuntime(intellijPluginDep("maven")) - testRuntime(intellijPluginDep("android")) - testRuntime(intellijPluginDep("smali")) -} - -sourceSets { - "main" { - projectDefault() - resources.srcDir("res") - } - "test" { projectDefault() } -} - -testsJar() - -projectTest { - workingDir = rootDir - useAndroidSdk() -} - -configureInstrumentation() diff --git a/idea/idea-gradle/build.gradle.kts.as32 b/idea/idea-gradle/build.gradle.kts.as32 deleted file mode 100644 index dbf27511683..00000000000 --- a/idea/idea-gradle/build.gradle.kts.as32 +++ /dev/null @@ -1,75 +0,0 @@ -plugins { - kotlin("jvm") - id("jps-compatible") -} - -dependencies { - testRuntime(intellijDep()) - - compileOnly(project(":idea")) - compileOnly(project(":idea:idea-jvm")) - compile(project(":idea:kotlin-gradle-tooling")) - - compile(project(":compiler:frontend")) - compile(project(":compiler:frontend.java")) - compile(project(":compiler:frontend.script")) - - compile(project(":js:js.frontend")) - - compileOnly(intellijDep()) - compileOnly(intellijPluginDep("gradle")) - compileOnly(intellijPluginDep("Groovy")) - compileOnly(intellijPluginDep("junit")) - compileOnly(intellijPluginDep("testng")) - - testCompile(projectTests(":idea")) - testCompile(projectTests(":idea:idea-test-framework")) - - testCompile(intellijPluginDep("gradle")) - testCompileOnly(intellijPluginDep("Groovy")) - testCompileOnly(intellijDep()) - - testCompile(project(":idea:idea-native")) { isTransitive = false } - testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } - testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } - testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } - - testRuntime(project(":kotlin-reflect")) - testRuntime(project(":idea:idea-jvm")) - testRuntime(project(":idea:idea-android")) - testRuntime(project(":plugins:kapt3-idea")) - testRuntime(project(":plugins:android-extensions-ide")) - testRuntime(project(":plugins:lint")) - testRuntime(project(":sam-with-receiver-ide-plugin")) - testRuntime(project(":allopen-ide-plugin")) - testRuntime(project(":noarg-ide-plugin")) - testRuntime(project(":kotlin-scripting-idea")) - testRuntime(project(":kotlinx-serialization-ide-plugin")) - // TODO: the order of the plugins matters here, consider avoiding order-dependency - testRuntime(intellijPluginDep("junit")) - testRuntime(intellijPluginDep("testng")) - testRuntime(intellijPluginDep("properties")) - testRuntime(intellijPluginDep("gradle")) - testRuntime(intellijPluginDep("Groovy")) - testRuntime(intellijPluginDep("coverage")) - //testRuntime(intellijPluginDep("maven")) - testRuntime(intellijPluginDep("android")) - testRuntime(intellijPluginDep("smali")) -} - -sourceSets { - "main" { - projectDefault() - resources.srcDir("res") - } - "test" { projectDefault() } -} - -testsJar() - -projectTest { - workingDir = rootDir - useAndroidSdk() -} - -configureInstrumentation() diff --git a/idea/idea-gradle/build.gradle.kts.as33 b/idea/idea-gradle/build.gradle.kts.as33 deleted file mode 100644 index dbf27511683..00000000000 --- a/idea/idea-gradle/build.gradle.kts.as33 +++ /dev/null @@ -1,75 +0,0 @@ -plugins { - kotlin("jvm") - id("jps-compatible") -} - -dependencies { - testRuntime(intellijDep()) - - compileOnly(project(":idea")) - compileOnly(project(":idea:idea-jvm")) - compile(project(":idea:kotlin-gradle-tooling")) - - compile(project(":compiler:frontend")) - compile(project(":compiler:frontend.java")) - compile(project(":compiler:frontend.script")) - - compile(project(":js:js.frontend")) - - compileOnly(intellijDep()) - compileOnly(intellijPluginDep("gradle")) - compileOnly(intellijPluginDep("Groovy")) - compileOnly(intellijPluginDep("junit")) - compileOnly(intellijPluginDep("testng")) - - testCompile(projectTests(":idea")) - testCompile(projectTests(":idea:idea-test-framework")) - - testCompile(intellijPluginDep("gradle")) - testCompileOnly(intellijPluginDep("Groovy")) - testCompileOnly(intellijDep()) - - testCompile(project(":idea:idea-native")) { isTransitive = false } - testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } - testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } - testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } - - testRuntime(project(":kotlin-reflect")) - testRuntime(project(":idea:idea-jvm")) - testRuntime(project(":idea:idea-android")) - testRuntime(project(":plugins:kapt3-idea")) - testRuntime(project(":plugins:android-extensions-ide")) - testRuntime(project(":plugins:lint")) - testRuntime(project(":sam-with-receiver-ide-plugin")) - testRuntime(project(":allopen-ide-plugin")) - testRuntime(project(":noarg-ide-plugin")) - testRuntime(project(":kotlin-scripting-idea")) - testRuntime(project(":kotlinx-serialization-ide-plugin")) - // TODO: the order of the plugins matters here, consider avoiding order-dependency - testRuntime(intellijPluginDep("junit")) - testRuntime(intellijPluginDep("testng")) - testRuntime(intellijPluginDep("properties")) - testRuntime(intellijPluginDep("gradle")) - testRuntime(intellijPluginDep("Groovy")) - testRuntime(intellijPluginDep("coverage")) - //testRuntime(intellijPluginDep("maven")) - testRuntime(intellijPluginDep("android")) - testRuntime(intellijPluginDep("smali")) -} - -sourceSets { - "main" { - projectDefault() - resources.srcDir("res") - } - "test" { projectDefault() } -} - -testsJar() - -projectTest { - workingDir = rootDir - useAndroidSdk() -} - -configureInstrumentation() diff --git a/idea/idea-gradle/build.gradle.kts.as34 b/idea/idea-gradle/build.gradle.kts.as34 deleted file mode 100644 index dbf27511683..00000000000 --- a/idea/idea-gradle/build.gradle.kts.as34 +++ /dev/null @@ -1,75 +0,0 @@ -plugins { - kotlin("jvm") - id("jps-compatible") -} - -dependencies { - testRuntime(intellijDep()) - - compileOnly(project(":idea")) - compileOnly(project(":idea:idea-jvm")) - compile(project(":idea:kotlin-gradle-tooling")) - - compile(project(":compiler:frontend")) - compile(project(":compiler:frontend.java")) - compile(project(":compiler:frontend.script")) - - compile(project(":js:js.frontend")) - - compileOnly(intellijDep()) - compileOnly(intellijPluginDep("gradle")) - compileOnly(intellijPluginDep("Groovy")) - compileOnly(intellijPluginDep("junit")) - compileOnly(intellijPluginDep("testng")) - - testCompile(projectTests(":idea")) - testCompile(projectTests(":idea:idea-test-framework")) - - testCompile(intellijPluginDep("gradle")) - testCompileOnly(intellijPluginDep("Groovy")) - testCompileOnly(intellijDep()) - - testCompile(project(":idea:idea-native")) { isTransitive = false } - testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } - testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } - testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } - - testRuntime(project(":kotlin-reflect")) - testRuntime(project(":idea:idea-jvm")) - testRuntime(project(":idea:idea-android")) - testRuntime(project(":plugins:kapt3-idea")) - testRuntime(project(":plugins:android-extensions-ide")) - testRuntime(project(":plugins:lint")) - testRuntime(project(":sam-with-receiver-ide-plugin")) - testRuntime(project(":allopen-ide-plugin")) - testRuntime(project(":noarg-ide-plugin")) - testRuntime(project(":kotlin-scripting-idea")) - testRuntime(project(":kotlinx-serialization-ide-plugin")) - // TODO: the order of the plugins matters here, consider avoiding order-dependency - testRuntime(intellijPluginDep("junit")) - testRuntime(intellijPluginDep("testng")) - testRuntime(intellijPluginDep("properties")) - testRuntime(intellijPluginDep("gradle")) - testRuntime(intellijPluginDep("Groovy")) - testRuntime(intellijPluginDep("coverage")) - //testRuntime(intellijPluginDep("maven")) - testRuntime(intellijPluginDep("android")) - testRuntime(intellijPluginDep("smali")) -} - -sourceSets { - "main" { - projectDefault() - resources.srcDir("res") - } - "test" { projectDefault() } -} - -testsJar() - -projectTest { - workingDir = rootDir - useAndroidSdk() -} - -configureInstrumentation() diff --git a/j2k/build.gradle.kts b/j2k/build.gradle.kts index 3d6d8c1ce13..c22f1a3248f 100644 --- a/j2k/build.gradle.kts +++ b/j2k/build.gradle.kts @@ -19,7 +19,11 @@ dependencies { testCompile(project(":compiler:light-classes")) testCompile(project(":kotlin-test:kotlin-test-junit")) testCompile(commonDep("junit:junit")) - testCompileOnly(intellijDep()) { includeJars("platform-api", "platform-impl") } + + when { + Ide.IJ181.orHigher() || Ide.AS33.orHigher() -> testCompileOnly(intellijDep()) { includeJars("platform-api", "platform-impl") } + Ide.AS32() -> testCompileOnly(intellijDep()) { includeJars("idea") } + } testCompile(project(":idea:idea-native")) { isTransitive = false } testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } @@ -38,9 +42,13 @@ dependencies { testRuntime(intellijPluginDep("gradle")) testRuntime(intellijPluginDep("Groovy")) testRuntime(intellijPluginDep("coverage")) - testRuntime(intellijPluginDep("maven")) + Ide.IJ { + testRuntime(intellijPluginDep("maven")) + } testRuntime(intellijPluginDep("android")) - testRuntime(intellijPluginDep("smali")) + Ide.IJ181.orHigher { + testRuntime(intellijPluginDep("smali")) + } testRuntime(intellijPluginDep("junit")) testRuntime(intellijPluginDep("testng")) testRuntime(intellijPluginDep("IntelliLang")) diff --git a/j2k/build.gradle.kts.173 b/j2k/build.gradle.kts.173 deleted file mode 100644 index 072c669fbee..00000000000 --- a/j2k/build.gradle.kts.173 +++ /dev/null @@ -1,76 +0,0 @@ - -plugins { - kotlin("jvm") - id("jps-compatible") -} - -dependencies { - testRuntime(intellijDep()) - - compile(project(":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(projectTests(":idea:idea-test-framework")) - testCompile(project(":compiler:light-classes")) - testCompile(project(":kotlin-test:kotlin-test-junit")) - testCompile(commonDep("junit:junit")) - testCompile(project(":idea:idea-native")) { isTransitive = false } - testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } - - testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } - testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } - 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(":kotlin-scripting-idea")) - testRuntime(project(":kotlinx-serialization-ide-plugin")) - testRuntime(intellijPluginDep("properties")) - testRuntime(intellijPluginDep("gradle")) - testRuntime(intellijPluginDep("Groovy")) - testRuntime(intellijPluginDep("coverage")) - testRuntime(intellijPluginDep("maven")) - testRuntime(intellijPluginDep("android")) - testRuntime(intellijPluginDep("junit")) - testRuntime(intellijPluginDep("testng")) - testRuntime(intellijPluginDep("IntelliLang")) - testRuntime(intellijPluginDep("testng")) - testRuntime(intellijPluginDep("copyright")) - testRuntime(intellijPluginDep("properties")) - testRuntime(intellijPluginDep("java-i18n")) - testRuntime(intellijPluginDep("java-decompiler")) -} - -sourceSets { - "main" { projectDefault() } - "test" { projectDefault() } -} - -projectTest { - dependsOn(":dist") - workingDir = rootDir -} - -testsJar() - -val testForWebDemo by task { - include("**/*JavaToKotlinConverterForWebDemoTestGenerated*") - classpath = testSourceSet.runtimeClasspath - workingDir = rootDir -} - -val test: Test by tasks -test.apply { - exclude("**/*JavaToKotlinConverterForWebDemoTestGenerated*") - dependsOn(testForWebDemo) -} - -ideaPlugin() diff --git a/j2k/build.gradle.kts.as31 b/j2k/build.gradle.kts.as31 deleted file mode 100644 index 2c78e24535f..00000000000 --- a/j2k/build.gradle.kts.as31 +++ /dev/null @@ -1,77 +0,0 @@ - -plugins { - kotlin("jvm") - id("jps-compatible") -} - -dependencies { - testRuntime(intellijDep()) - - compile(project(":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(projectTests(":idea:idea-test-framework")) - testCompile(project(":compiler:light-classes")) - testCompile(project(":kotlin-test:kotlin-test-junit")) - testCompile(commonDep("junit:junit")) - testCompile(project(":idea:idea-native")) { isTransitive = false } - testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } - - testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } - testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } - 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(":kotlin-scripting-idea")) - testRuntime(project(":kotlinx-serialization-ide-plugin")) - testRuntime(intellijPluginDep("properties")) - testRuntime(intellijPluginDep("gradle")) - testRuntime(intellijPluginDep("Groovy")) - testRuntime(intellijPluginDep("coverage")) - //testRuntime(intellijPluginDep("maven")) - testRuntime(intellijPluginDep("android")) - testRuntime(intellijPluginDep("smali")) - testRuntime(intellijPluginDep("junit")) - testRuntime(intellijPluginDep("testng")) - testRuntime(intellijPluginDep("IntelliLang")) - testRuntime(intellijPluginDep("testng")) - testRuntime(intellijPluginDep("copyright")) - testRuntime(intellijPluginDep("properties")) - testRuntime(intellijPluginDep("java-i18n")) - testRuntime(intellijPluginDep("java-decompiler")) -} - -sourceSets { - "main" { projectDefault() } - "test" { projectDefault() } -} - -projectTest { - dependsOn(":dist") - workingDir = rootDir -} - -testsJar() - -val testForWebDemo by task { - include("**/*JavaToKotlinConverterForWebDemoTestGenerated*") - classpath = testSourceSet.runtimeClasspath - workingDir = rootDir -} - -val test: Test by tasks -test.apply { - exclude("**/*JavaToKotlinConverterForWebDemoTestGenerated*") - dependsOn(testForWebDemo) -} - -ideaPlugin() diff --git a/j2k/build.gradle.kts.as32 b/j2k/build.gradle.kts.as32 deleted file mode 100644 index 4dec0cd81ec..00000000000 --- a/j2k/build.gradle.kts.as32 +++ /dev/null @@ -1,78 +0,0 @@ - -plugins { - kotlin("jvm") - id("jps-compatible") -} - -dependencies { - testRuntime(intellijDep()) - - compile(project(":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(projectTests(":idea:idea-test-framework")) - testCompile(project(":compiler:light-classes")) - testCompile(project(":kotlin-test:kotlin-test-junit")) - testCompile(commonDep("junit:junit")) - testCompileOnly(intellijDep()) { includeJars("idea") } - testCompile(project(":idea:idea-native")) { isTransitive = false } - testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } - - testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } - testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } - 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(":kotlin-scripting-idea")) - testRuntime(project(":kotlinx-serialization-ide-plugin")) - testRuntime(intellijPluginDep("properties")) - testRuntime(intellijPluginDep("gradle")) - testRuntime(intellijPluginDep("Groovy")) - testRuntime(intellijPluginDep("coverage")) - //testRuntime(intellijPluginDep("maven")) - testRuntime(intellijPluginDep("android")) - testRuntime(intellijPluginDep("smali")) - testRuntime(intellijPluginDep("junit")) - testRuntime(intellijPluginDep("testng")) - testRuntime(intellijPluginDep("IntelliLang")) - testRuntime(intellijPluginDep("testng")) - testRuntime(intellijPluginDep("copyright")) - testRuntime(intellijPluginDep("properties")) - testRuntime(intellijPluginDep("java-i18n")) - testRuntime(intellijPluginDep("java-decompiler")) -} - -sourceSets { - "main" { projectDefault() } - "test" { projectDefault() } -} - -projectTest { - dependsOn(":dist") - workingDir = rootDir -} - -testsJar() - -val testForWebDemo by task { - include("**/*JavaToKotlinConverterForWebDemoTestGenerated*") - classpath = testSourceSet.runtimeClasspath - workingDir = rootDir -} - -val test: Test by tasks -test.apply { - exclude("**/*JavaToKotlinConverterForWebDemoTestGenerated*") - dependsOn(testForWebDemo) -} - -ideaPlugin() diff --git a/j2k/build.gradle.kts.as33 b/j2k/build.gradle.kts.as33 deleted file mode 100644 index 9ddc7af7f31..00000000000 --- a/j2k/build.gradle.kts.as33 +++ /dev/null @@ -1,78 +0,0 @@ - -plugins { - kotlin("jvm") - id("jps-compatible") -} - -dependencies { - testRuntime(intellijDep()) - - compile(project(":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(projectTests(":idea:idea-test-framework")) - testCompile(project(":compiler:light-classes")) - testCompile(project(":kotlin-test:kotlin-test-junit")) - testCompile(commonDep("junit:junit")) - testCompileOnly(intellijDep()) { includeJars("platform-api", "platform-impl") } - testCompile(project(":idea:idea-native")) { isTransitive = false } - testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } - - testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } - testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } - 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(":kotlin-scripting-idea")) - testRuntime(project(":kotlinx-serialization-ide-plugin")) - testRuntime(intellijPluginDep("properties")) - testRuntime(intellijPluginDep("gradle")) - testRuntime(intellijPluginDep("Groovy")) - testRuntime(intellijPluginDep("coverage")) - //testRuntime(intellijPluginDep("maven")) - testRuntime(intellijPluginDep("android")) - testRuntime(intellijPluginDep("smali")) - testRuntime(intellijPluginDep("junit")) - testRuntime(intellijPluginDep("testng")) - testRuntime(intellijPluginDep("IntelliLang")) - testRuntime(intellijPluginDep("testng")) - testRuntime(intellijPluginDep("copyright")) - testRuntime(intellijPluginDep("properties")) - testRuntime(intellijPluginDep("java-i18n")) - testRuntime(intellijPluginDep("java-decompiler")) -} - -sourceSets { - "main" { projectDefault() } - "test" { projectDefault() } -} - -projectTest { - dependsOn(":dist") - workingDir = rootDir -} - -testsJar() - -val testForWebDemo by task { - include("**/*JavaToKotlinConverterForWebDemoTestGenerated*") - classpath = testSourceSet.runtimeClasspath - workingDir = rootDir -} - -val test: Test by tasks -test.apply { - exclude("**/*JavaToKotlinConverterForWebDemoTestGenerated*") - dependsOn(testForWebDemo) -} - -ideaPlugin() diff --git a/j2k/build.gradle.kts.as34 b/j2k/build.gradle.kts.as34 deleted file mode 100644 index 9ddc7af7f31..00000000000 --- a/j2k/build.gradle.kts.as34 +++ /dev/null @@ -1,78 +0,0 @@ - -plugins { - kotlin("jvm") - id("jps-compatible") -} - -dependencies { - testRuntime(intellijDep()) - - compile(project(":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(projectTests(":idea:idea-test-framework")) - testCompile(project(":compiler:light-classes")) - testCompile(project(":kotlin-test:kotlin-test-junit")) - testCompile(commonDep("junit:junit")) - testCompileOnly(intellijDep()) { includeJars("platform-api", "platform-impl") } - testCompile(project(":idea:idea-native")) { isTransitive = false } - testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } - - testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } - testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } - 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(":kotlin-scripting-idea")) - testRuntime(project(":kotlinx-serialization-ide-plugin")) - testRuntime(intellijPluginDep("properties")) - testRuntime(intellijPluginDep("gradle")) - testRuntime(intellijPluginDep("Groovy")) - testRuntime(intellijPluginDep("coverage")) - //testRuntime(intellijPluginDep("maven")) - testRuntime(intellijPluginDep("android")) - testRuntime(intellijPluginDep("smali")) - testRuntime(intellijPluginDep("junit")) - testRuntime(intellijPluginDep("testng")) - testRuntime(intellijPluginDep("IntelliLang")) - testRuntime(intellijPluginDep("testng")) - testRuntime(intellijPluginDep("copyright")) - testRuntime(intellijPluginDep("properties")) - testRuntime(intellijPluginDep("java-i18n")) - testRuntime(intellijPluginDep("java-decompiler")) -} - -sourceSets { - "main" { projectDefault() } - "test" { projectDefault() } -} - -projectTest { - dependsOn(":dist") - workingDir = rootDir -} - -testsJar() - -val testForWebDemo by task { - include("**/*JavaToKotlinConverterForWebDemoTestGenerated*") - classpath = testSourceSet.runtimeClasspath - workingDir = rootDir -} - -val test: Test by tasks -test.apply { - exclude("**/*JavaToKotlinConverterForWebDemoTestGenerated*") - dependsOn(testForWebDemo) -} - -ideaPlugin() diff --git a/jps-plugin/build.gradle.kts b/jps-plugin/build.gradle.kts index 0a01af7b5cb..8bda99c70d5 100644 --- a/jps-plugin/build.gradle.kts +++ b/jps-plugin/build.gradle.kts @@ -18,7 +18,11 @@ dependencies { compile(project(":idea:idea-jps-common")) compileOnly(group = "org.jetbrains", name = "annotations", version = "13.0") compileOnly(intellijDep()) { - includeJars("jdom", "trove4j", "jps-model", "openapi", "platform-api", "util", "asm-all", rootProject = rootProject) + if (Platform[181].orHigher()) { + includeJars("jdom", "trove4j", "jps-model", "openapi", "platform-api", "util", "asm-all", rootProject = rootProject) + } else { + includeJars("jdom", "trove4j", "jps-model", "openapi", "util", "asm-all", rootProject = rootProject) + } } compileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") } testCompileOnly(project(":kotlin-reflect-api")) @@ -29,8 +33,14 @@ dependencies { testCompile(project(":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", "platform-api", "log4j") } - testCompile(intellijDep("devkit")) + Ide.IJ { + testCompile(intellijDep("devkit")) + } + if (Platform[181].orHigher()) { + testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "platform-api", "log4j") } + } else { + testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "log4j") } + } testCompile(intellijDep("jps-build-test")) compilerModules.forEach { testRuntime(project(it)) @@ -43,7 +53,9 @@ dependencies { sourceSets { "main" { projectDefault() } "test" { - java.srcDirs("jps-tests/test") + Ide.IJ { + java.srcDirs("jps-tests/test") + } } } diff --git a/jps-plugin/build.gradle.kts.173 b/jps-plugin/build.gradle.kts.173 deleted file mode 100644 index d82dceb0827..00000000000 --- a/jps-plugin/build.gradle.kts.173 +++ /dev/null @@ -1,57 +0,0 @@ -plugins { - kotlin("jvm") - id("jps-compatible") -} - -val compilerModules: Array by rootProject.extra - -dependencies { - compile(project(":kotlin-build-common")) - compile(project(":core:descriptors")) - compile(project(":core:descriptors.jvm")) - compile(project(":kotlin-compiler-runner")) - compile(project(":compiler:daemon-common")) - compile(projectRuntimeJar(":kotlin-daemon-client")) - compile(project(":compiler:frontend.java")) - compile(project(":js:js.frontend")) - compile(projectRuntimeJar(":kotlin-preloader")) - compile(project(":idea:idea-jps-common")) - compileOnly(group = "org.jetbrains", name = "annotations", version = "13.0") - compileOnly(intellijDep()) { - includeJars("jdom", "trove4j", "jps-model", "openapi", "util", "asm-all", rootProject = rootProject) - } - 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")) - testCompile(projectTests(":compiler:incremental-compilation-impl")) - testCompile(commonDep("junit:junit")) - testCompile(project(":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("devkit")) - testCompile(intellijDep("jps-build-test")) - compilerModules.forEach { - testRuntime(project(it)) - } - testRuntime(intellijDep()) - testRuntime(project(":kotlin-reflect")) - testRuntime(project(":kotlin-script-runtime")) -} - -sourceSets { - "main" { projectDefault() } - "test" { - java.srcDirs("jps-tests/test") - } -} - -projectTest { - // do not replace with compile/runtime dependency, - // because it forces Intellij reindexing after each compiler change - dependsOn(":kotlin-compiler:dist") - workingDir = rootDir -} - -testsJar {} diff --git a/jps-plugin/build.gradle.kts.as31 b/jps-plugin/build.gradle.kts.as31 deleted file mode 100644 index 198f9eec55b..00000000000 --- a/jps-plugin/build.gradle.kts.as31 +++ /dev/null @@ -1,56 +0,0 @@ -plugins { - kotlin("jvm") - id("jps-compatible") -} - -val compilerModules: Array by rootProject.extra - -dependencies { - compile(project(":kotlin-build-common")) - compile(project(":core:descriptors")) - compile(project(":core:descriptors.jvm")) - compile(project(":kotlin-compiler-runner")) - compile(project(":compiler:daemon-common")) - compile(projectRuntimeJar(":kotlin-daemon-client")) - compile(project(":compiler:frontend.java")) - compile(project(":js:js.frontend")) - compile(projectRuntimeJar(":kotlin-preloader")) - compile(project(":idea:idea-jps-common")) - compileOnly(group = "org.jetbrains", name = "annotations", version = "13.0") - compileOnly(intellijDep()) { - includeJars("jdom", "trove4j", "jps-model", "openapi", "util", "asm-all", rootProject = rootProject) - } - 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")) - testCompile(projectTests(":compiler:incremental-compilation-impl")) - testCompile(commonDep("junit:junit")) - testCompile(project(":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(project(":kotlin-reflect")) - testRuntime(project(":kotlin-script-runtime")) -} - -sourceSets { - "main" { projectDefault() } - "test" { - // No JPS in AS - } -} - -projectTest { - // do not replace with compile/runtime dependency, - // because it forces Intellij reindexing after each compiler change - dependsOn(":kotlin-compiler:dist") - workingDir = rootDir -} - -testsJar {} diff --git a/jps-plugin/build.gradle.kts.as32 b/jps-plugin/build.gradle.kts.as32 deleted file mode 100644 index 1405495bbaa..00000000000 --- a/jps-plugin/build.gradle.kts.as32 +++ /dev/null @@ -1,56 +0,0 @@ -plugins { - kotlin("jvm") - id("jps-compatible") -} - -val compilerModules: Array by rootProject.extra - -dependencies { - compile(project(":kotlin-build-common")) - compile(project(":core:descriptors")) - compile(project(":core:descriptors.jvm")) - compile(project(":kotlin-compiler-runner")) - compile(project(":compiler:daemon-common")) - compile(projectRuntimeJar(":kotlin-daemon-client")) - compile(project(":compiler:frontend.java")) - compile(project(":js:js.frontend")) - compile(projectRuntimeJar(":kotlin-preloader")) - compile(project(":idea:idea-jps-common")) - compileOnly(group = "org.jetbrains", name = "annotations", version = "13.0") - compileOnly(intellijDep()) { - includeJars("jdom", "trove4j", "jps-model", "openapi", "platform-api", "util", "asm-all", rootProject = rootProject) - } - 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")) - testCompile(projectTests(":compiler:incremental-compilation-impl")) - testCompile(commonDep("junit:junit")) - testCompile(project(":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", "platform-api", "log4j") } - testCompile(intellijDep("jps-build-test")) - compilerModules.forEach { - testRuntime(project(it)) - } - testRuntime(intellijDep()) - testRuntime(project(":kotlin-reflect")) - testRuntime(project(":kotlin-script-runtime")) -} - -sourceSets { - "main" { projectDefault() } - "test" { - // No JPS in AS - } -} - -projectTest { - // do not replace with compile/runtime dependency, - // because it forces Intellij reindexing after each compiler change - dependsOn(":kotlin-compiler:dist") - workingDir = rootDir -} - -testsJar {} diff --git a/jps-plugin/build.gradle.kts.as33 b/jps-plugin/build.gradle.kts.as33 deleted file mode 100644 index c8cfa68a943..00000000000 --- a/jps-plugin/build.gradle.kts.as33 +++ /dev/null @@ -1,55 +0,0 @@ -plugins { - kotlin("jvm") - id("jps-compatible") -} - -val compilerModules: Array by rootProject.extra - -dependencies { - compile(project(":kotlin-build-common")) - compile(project(":core:descriptors")) - compile(project(":core:descriptors.jvm")) - compile(project(":kotlin-compiler-runner")) - compile(project(":compiler:daemon-common")) - compile(projectRuntimeJar(":kotlin-daemon-client")) - compile(project(":compiler:frontend.java")) - compile(project(":js:js.frontend")) - compile(projectRuntimeJar(":kotlin-preloader")) - compile(project(":idea:idea-jps-common")) - compileOnly(group = "org.jetbrains", name = "annotations", version = "13.0") - compileOnly(intellijDep()) { - includeJars("jdom", "trove4j", "jps-model", "openapi", "platform-api", "util", "asm-all", rootProject = rootProject) - } - 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")) - testCompile(projectTests(":compiler:incremental-compilation-impl")) - testCompile(commonDep("junit:junit")) - testCompile(project(":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", "platform-api", "log4j") } - testCompile(intellijDep("jps-build-test")) - compilerModules.forEach { - testRuntime(project(it)) - } - testRuntime(intellijDep()) - testRuntime(project(":kotlin-reflect")) -} - -sourceSets { - "main" { projectDefault() } - "test" { - /*java.srcDirs("jps-tests/test" - /*, "kannotator-jps-plugin-test/test"*/ // Obsolete - )*/ - } -} - -projectTest { - dependsOn(":kotlin-compiler:dist") - workingDir = rootDir -} - -testsJar {} diff --git a/jps-plugin/build.gradle.kts.as34 b/jps-plugin/build.gradle.kts.as34 deleted file mode 100644 index c8cfa68a943..00000000000 --- a/jps-plugin/build.gradle.kts.as34 +++ /dev/null @@ -1,55 +0,0 @@ -plugins { - kotlin("jvm") - id("jps-compatible") -} - -val compilerModules: Array by rootProject.extra - -dependencies { - compile(project(":kotlin-build-common")) - compile(project(":core:descriptors")) - compile(project(":core:descriptors.jvm")) - compile(project(":kotlin-compiler-runner")) - compile(project(":compiler:daemon-common")) - compile(projectRuntimeJar(":kotlin-daemon-client")) - compile(project(":compiler:frontend.java")) - compile(project(":js:js.frontend")) - compile(projectRuntimeJar(":kotlin-preloader")) - compile(project(":idea:idea-jps-common")) - compileOnly(group = "org.jetbrains", name = "annotations", version = "13.0") - compileOnly(intellijDep()) { - includeJars("jdom", "trove4j", "jps-model", "openapi", "platform-api", "util", "asm-all", rootProject = rootProject) - } - 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")) - testCompile(projectTests(":compiler:incremental-compilation-impl")) - testCompile(commonDep("junit:junit")) - testCompile(project(":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", "platform-api", "log4j") } - testCompile(intellijDep("jps-build-test")) - compilerModules.forEach { - testRuntime(project(it)) - } - testRuntime(intellijDep()) - testRuntime(project(":kotlin-reflect")) -} - -sourceSets { - "main" { projectDefault() } - "test" { - /*java.srcDirs("jps-tests/test" - /*, "kannotator-jps-plugin-test/test"*/ // Obsolete - )*/ - } -} - -projectTest { - dependsOn(":kotlin-compiler:dist") - workingDir = rootDir -} - -testsJar {} diff --git a/libraries/tools/kotlin-script-util/build.gradle.kts b/libraries/tools/kotlin-script-util/build.gradle.kts index e2b1dcedf19..e745f839c44 100644 --- a/libraries/tools/kotlin-script-util/build.gradle.kts +++ b/libraries/tools/kotlin-script-util/build.gradle.kts @@ -29,7 +29,12 @@ dependencies { testRuntime("org.sonatype.aether:aether-api:1.13.1") testRuntime("org.apache.maven:maven-core:3.0.3") compileOnly(intellijDep()) { includeJars("openapi", "util") } - testCompile(intellijDep()) { includeJars("openapi", "platform-api", "util") } + + if (Ide.IJ173()) { + testCompile(intellijDep()) { includeJars("openapi", "util") } + } else { + testCompile(intellijDep()) { includeJars("openapi", "platform-api", "util") } + } } projectTest { diff --git a/libraries/tools/kotlin-script-util/build.gradle.kts.173 b/libraries/tools/kotlin-script-util/build.gradle.kts.173 deleted file mode 100644 index fcf0b50c694..00000000000 --- a/libraries/tools/kotlin-script-util/build.gradle.kts.173 +++ /dev/null @@ -1,41 +0,0 @@ - -description = "Kotlin scripting support utilities" - -plugins { - kotlin("jvm") - id("jps-compatible") -} - -dependencies { - compile(project(":kotlin-stdlib")) - compile(project(":kotlin-script-runtime")) - compile(project(":kotlin-scripting-jvm")) - compileOnly(project(":compiler:cli")) - compileOnly(project(":compiler:daemon-common")) - compile(projectRuntimeJar(":kotlin-daemon-client")) - compileOnly("com.jcabi:jcabi-aether:0.10.1") - compileOnly("org.sonatype.aether:aether-api:1.13.1") - compileOnly("org.apache.maven:maven-core:3.0.3") - testCompileOnly(project(":compiler:cli")) - testCompile(project(":kotlin-test:kotlin-test-junit")) - testRuntime(project(":kotlin-reflect")) - testCompile(commonDep("junit:junit")) - testRuntimeOnly(projectRuntimeJar(":kotlin-compiler")) - 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") - compileOnly(intellijDep()) { includeJars("openapi", "util") } - testCompile(intellijDep()) { includeJars("openapi", "util") } -} - -projectTest { - workingDir = rootDir -} - -runtimeJar() -sourcesJar() -javadocJar() - -publish() - -ideaPlugin() diff --git a/libraries/tools/kotlin-script-util/build.gradle.kts.as32 b/libraries/tools/kotlin-script-util/build.gradle.kts.as32 deleted file mode 100644 index ba14ab8c09d..00000000000 --- a/libraries/tools/kotlin-script-util/build.gradle.kts.as32 +++ /dev/null @@ -1,41 +0,0 @@ - -description = "Kotlin scripting support utilities" - -plugins { - kotlin("jvm") - id("jps-compatible") -} - -dependencies { - compile(project(":kotlin-stdlib")) - compile(project(":kotlin-script-runtime")) - compile(project(":kotlin-scripting-jvm")) - compileOnly(project(":compiler:cli")) - compileOnly(project(":compiler:daemon-common")) - compile(projectRuntimeJar(":kotlin-daemon-client")) - compileOnly("com.jcabi:jcabi-aether:0.10.1") - compileOnly("org.sonatype.aether:aether-api:1.13.1") - compileOnly("org.apache.maven:maven-core:3.0.3") - testCompileOnly(project(":compiler:cli")) - testCompile(project(":kotlin-test:kotlin-test-junit")) - testRuntime(project(":kotlin-reflect")) - testCompile(commonDep("junit:junit")) - testRuntimeOnly(projectRuntimeJar(":kotlin-compiler")) - 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") - compileOnly(intellijDep()) { includeJars("openapi", "util") } - testCompile(intellijDep()) { includeJars("openapi", "platform-api", "util") } -} - -projectTest { - workingDir = rootDir -} - -runtimeJar() -sourcesJar() -javadocJar() - -publish() - -ideaPlugin() diff --git a/ultimate/build.gradle.kts.as31 b/ultimate/build.gradle.kts.as31 index 794f47efd0c..634df86e922 100644 --- a/ultimate/build.gradle.kts.as31 +++ b/ultimate/build.gradle.kts.as31 @@ -1,223 +1,3 @@ /* - - -import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar -import org.gradle.jvm.tasks.Jar - -description = "Kotlin IDEA Ultimate plugin" - -plugins { - kotlin("jvm") -} - -val ideaProjectResources = project(":idea").mainSourceSet.output.resourcesDir - -evaluationDependsOn(":prepare:idea-plugin") - -val intellijUltimateEnabled : Boolean by rootProject.extra - -val springClasspath by configurations.creating - -dependencies { - if (intellijUltimateEnabled) { - testRuntime(intellijUltimateDep()) - } - - compileOnly(project(":kotlin-reflect-api")) - compile(project(":kotlin-stdlib")) - compile(project(":core:descriptors")) { isTransitive = false } - compile(project(":compiler:psi")) { isTransitive = false } - compile(project(":core:descriptors.jvm")) { isTransitive = false } - compile(project(":core:util.runtime")) { isTransitive = false } - compile(project(":compiler:light-classes")) { isTransitive = false } - compile(project(":compiler:frontend")) { isTransitive = false } - compile(project(":compiler:frontend.java")) { isTransitive = false } - compile(project(":js:js.frontend")) { isTransitive = false } - compile(projectClasses(":idea")) - compile(project(":idea:idea-jvm")) { isTransitive = false } - compile(project(":idea:idea-core")) { isTransitive = false } - compile(project(":idea:ide-common")) { isTransitive = false } - compile(project(":idea:idea-gradle")) { isTransitive = false } - compile(project(":compiler:util")) { isTransitive = false } - compile(project(":idea:idea-jps-common")) { isTransitive = false } - compileOnly(intellijCoreDep()) { includeJars("intellij-core") } - - if (intellijUltimateEnabled) { - compileOnly(intellijUltimatePluginDep("NodeJS")) - compileOnly(intellijUltimateDep()) { includeJars("annotations", "trove4j", "openapi", "idea", "util", "jdom") } - compileOnly(intellijUltimatePluginDep("CSS")) - compileOnly(intellijUltimatePluginDep("DatabaseTools")) - compileOnly(intellijUltimatePluginDep("JavaEE")) - compileOnly(intellijUltimatePluginDep("jsp")) - compileOnly(intellijUltimatePluginDep("PersistenceSupport")) - compileOnly(intellijUltimatePluginDep("Spring")) - compileOnly(intellijUltimatePluginDep("properties")) - compileOnly(intellijUltimatePluginDep("java-i18n")) - compileOnly(intellijUltimatePluginDep("gradle")) - compileOnly(intellijUltimatePluginDep("Groovy")) - compileOnly(intellijUltimatePluginDep("junit")) - compileOnly(intellijUltimatePluginDep("uml")) - compileOnly(intellijUltimatePluginDep("JavaScriptLanguage")) - compileOnly(intellijUltimatePluginDep("JavaScriptDebugger")) - } - - testCompile(project(":kotlin-test:kotlin-test-jvm")) - testCompile(projectTests(":idea:idea-test-framework")) { isTransitive = false } - testCompile(project(":plugins:lint")) { isTransitive = false } - testCompile(project(":idea:idea-jvm")) { isTransitive = false } - testCompile(projectTests(":compiler:tests-common")) - testCompile(projectTests(":idea")) { isTransitive = false } - testCompile(projectTests(":generators:test-generator")) - testCompile(commonDep("junit:junit")) - - testCompile(project(":idea:idea-native")) { isTransitive = false } - testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } - testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } - testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } - - if (intellijUltimateEnabled) { - testCompileOnly(intellijUltimateDep()) { includeJars("gson", "annotations", "trove4j", "openapi", "idea", "util", "jdom", rootProject = rootProject) } - } - testCompile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false } - - testRuntime(project(":kotlin-reflect")) - testRuntime(project(":kotlin-script-runtime")) - testRuntimeOnly(projectRuntimeJar(":kotlin-compiler")) - testRuntime(project(":plugins:android-extensions-ide")) { isTransitive = false } - testRuntime(project(":plugins:android-extensions-compiler")) { isTransitive = false } - testRuntime(project(":plugins:annotation-based-compiler-plugins-ide-support")) { isTransitive = false } - testRuntime(project(":idea:idea-android")) { isTransitive = false } - testRuntime(project(":idea:idea-maven")) { isTransitive = false } - testRuntime(project(":idea:idea-jps-common")) { isTransitive = false } - testRuntime(project(":idea:formatter")) { isTransitive = false } - testRuntime(project(":sam-with-receiver-ide-plugin")) { isTransitive = false } - testRuntime(project(":kotlin-sam-with-receiver-compiler-plugin")) { isTransitive = false } - testRuntime(project(":noarg-ide-plugin")) { isTransitive = false } - testRuntime(project(":kotlin-noarg-compiler-plugin")) { isTransitive = false } - testRuntime(project(":allopen-ide-plugin")) { isTransitive = false } - testRuntime(project(":kotlin-allopen-compiler-plugin")) { isTransitive = false } - testRuntime(project(":kotlinx-serialization-compiler-plugin")) { isTransitive = false } - testRuntime(project(":kotlinx-serialization-ide-plugin")) { isTransitive = false } - testRuntime(project(":kotlin-scripting-idea")) { isTransitive = false } - testRuntime(project(":kotlin-scripting-compiler")) { isTransitive = false } - testRuntime(project(":plugins:kapt3-idea")) { isTransitive = false } - testRuntime(project(":plugins:uast-kotlin")) - testRuntime(project(":plugins:uast-kotlin-idea")) - - if (intellijUltimateEnabled) { - testCompile(intellijUltimatePluginDep("CSS")) - testCompile(intellijUltimatePluginDep("DatabaseTools")) - testCompile(intellijUltimatePluginDep("JavaEE")) - testCompile(intellijUltimatePluginDep("jsp")) - testCompile(intellijUltimatePluginDep("PersistenceSupport")) - testCompile(intellijUltimatePluginDep("Spring")) - testCompile(intellijUltimatePluginDep("uml")) - testCompile(intellijUltimatePluginDep("JavaScriptLanguage")) - testCompile(intellijUltimatePluginDep("JavaScriptDebugger")) - testCompile(intellijUltimatePluginDep("NodeJS")) - testCompile(intellijUltimatePluginDep("properties")) - testCompile(intellijUltimatePluginDep("java-i18n")) - testCompile(intellijUltimatePluginDep("gradle")) - testCompile(intellijUltimatePluginDep("Groovy")) - testCompile(intellijUltimatePluginDep("junit")) - testRuntime(intellijUltimatePluginDep("coverage")) - testRuntime(intellijUltimatePluginDep("maven")) - testRuntime(intellijUltimatePluginDep("android")) - testRuntime(intellijUltimatePluginDep("testng")) - testRuntime(intellijUltimatePluginDep("IntelliLang")) - testRuntime(intellijUltimatePluginDep("copyright")) - testRuntime(intellijUltimatePluginDep("java-decompiler")) - } - - testRuntime(files("${System.getProperty("java.home")}/../lib/tools.jar")) - - springClasspath(commonDep("org.springframework", "spring-core")) - springClasspath(commonDep("org.springframework", "spring-beans")) - springClasspath(commonDep("org.springframework", "spring-context")) - springClasspath(commonDep("org.springframework", "spring-tx")) - springClasspath(commonDep("org.springframework", "spring-web")) -} - -val preparedResources = File(buildDir, "prepResources") - -sourceSets { - "main" { projectDefault() } - "test" { - projectDefault() - resources.srcDir(preparedResources) - } -} - -val ultimatePluginXmlContent: String by lazy { - val sectRex = Regex("""^\s*\s*$""") - File(projectDir, "resources/META-INF/ultimate-plugin.xml") - .readLines() - .filterNot { it.matches(sectRex) } - .joinToString("\n") -} - -val prepareResources by task { - dependsOn(":idea:assemble") - from(ideaProjectResources, { - exclude("META-INF/plugin.xml") - }) - into(preparedResources) -} - -val preparePluginXml by task { - dependsOn(":idea:assemble") - from(ideaProjectResources, { include("META-INF/plugin.xml") }) - into(preparedResources) - filter { - it?.replace("", ultimatePluginXmlContent) - } -} - -val communityPluginProject = ":prepare:idea-plugin" - -val jar = runtimeJar(task("shadowJar")) { - duplicatesStrategy = DuplicatesStrategy.EXCLUDE - dependsOn(preparePluginXml) - dependsOn("$communityPluginProject:shadowJar") - val communityPluginJar = project(communityPluginProject).configurations["runtimeJar"].artifacts.files.singleFile - from(zipTree(communityPluginJar), { exclude("META-INF/plugin.xml") }) - from(preparedResources, { include("META-INF/plugin.xml") }) - from(mainSourceSet.output) - archiveName = "kotlin-plugin.jar" -} - -val ideaPluginDir: File by rootProject.extra -val ideaUltimatePluginDir: File by rootProject.extra - -task("ideaUltimatePlugin") { - dependsOn(":ideaPlugin") - into(ideaUltimatePluginDir) - from(ideaPluginDir) { exclude("lib/kotlin-plugin.jar") } - from(jar, { into("lib") }) -} - -task("idea-ultimate-plugin") { - dependsOn("ideaUltimatePlugin") - doFirst { logger.warn("'$name' task is deprecated, use '${dependsOn.last()}' instead") } -} - -task("ideaUltimatePluginTest") { - dependsOn("check") -} - -projectTest { - dependsOn(prepareResources) - dependsOn(preparePluginXml) - workingDir = rootDir - doFirst { - if (intellijUltimateEnabled) { - systemProperty("idea.home.path", intellijUltimateRootDir().canonicalPath) - } - systemProperty("spring.classpath", springClasspath.asPath) - } -} - -val generateTests by generator("org.jetbrains.kotlin.tests.GenerateUltimateTestsKt") - - +This build should not be invoked in AS */ \ No newline at end of file diff --git a/ultimate/build.gradle.kts.as32 b/ultimate/build.gradle.kts.as32 index dd92f05b335..634df86e922 100644 --- a/ultimate/build.gradle.kts.as32 +++ b/ultimate/build.gradle.kts.as32 @@ -1,224 +1,3 @@ /* - - -import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar -import org.gradle.jvm.tasks.Jar - -description = "Kotlin IDEA Ultimate plugin" - -plugins { - kotlin("jvm") -} - -val ideaProjectResources = project(":idea").mainSourceSet.output.resourcesDir - -evaluationDependsOn(":prepare:idea-plugin") - -val intellijUltimateEnabled : Boolean by rootProject.extra - -val springClasspath by configurations.creating - -dependencies { - if (intellijUltimateEnabled) { - testRuntime(intellijUltimateDep()) - } - - compileOnly(project(":kotlin-reflect-api")) - compile(project(":kotlin-stdlib")) - compile(project(":core:descriptors")) { isTransitive = false } - compile(project(":compiler:psi")) { isTransitive = false } - compile(project(":core:descriptors.jvm")) { isTransitive = false } - compile(project(":core:util.runtime")) { isTransitive = false } - compile(project(":compiler:light-classes")) { isTransitive = false } - compile(project(":compiler:frontend")) { isTransitive = false } - compile(project(":compiler:frontend.java")) { isTransitive = false } - compile(project(":js:js.frontend")) { isTransitive = false } - compile(projectClasses(":idea")) - compile(project(":idea:idea-jvm")) { isTransitive = false } - compile(project(":idea:idea-core")) { isTransitive = false } - compile(project(":idea:ide-common")) { isTransitive = false } - compile(project(":idea:idea-gradle")) { isTransitive = false } - compile(project(":compiler:util")) { isTransitive = false } - compile(project(":idea:idea-jps-common")) { isTransitive = false } - compileOnly(intellijCoreDep()) { includeJars("intellij-core") } - - if (intellijUltimateEnabled) { - compileOnly(intellijUltimatePluginDep("NodeJS")) - compileOnly(intellijUltimateDep()) { includeJars("annotations", "trove4j", "openapi", "platform-api", "platform-impl", "java-api", "java-impl", "idea", "util", "jdom") } - compileOnly(intellijUltimatePluginDep("CSS")) - compileOnly(intellijUltimatePluginDep("DatabaseTools")) - compileOnly(intellijUltimatePluginDep("JavaEE")) - compileOnly(intellijUltimatePluginDep("jsp")) - compileOnly(intellijUltimatePluginDep("PersistenceSupport")) - compileOnly(intellijUltimatePluginDep("Spring")) - compileOnly(intellijUltimatePluginDep("properties")) - compileOnly(intellijUltimatePluginDep("java-i18n")) - compileOnly(intellijUltimatePluginDep("gradle")) - compileOnly(intellijUltimatePluginDep("Groovy")) - compileOnly(intellijUltimatePluginDep("junit")) - compileOnly(intellijUltimatePluginDep("uml")) - compileOnly(intellijUltimatePluginDep("JavaScriptLanguage")) - compileOnly(intellijUltimatePluginDep("JavaScriptDebugger")) - } - - testCompile(project(":kotlin-test:kotlin-test-jvm")) - testCompile(projectTests(":idea:idea-test-framework")) { isTransitive = false } - testCompile(project(":plugins:lint")) { isTransitive = false } - testCompile(project(":idea:idea-jvm")) { isTransitive = false } - testCompile(projectTests(":compiler:tests-common")) - testCompile(projectTests(":idea")) { isTransitive = false } - testCompile(projectTests(":generators:test-generator")) - testCompile(commonDep("junit:junit")) - - testCompile(project(":idea:idea-native")) { isTransitive = false } - testCompile(project(":idea:idea-gradle-native")) { isTransitive = false } - testRuntime(project(":kotlin-native:kotlin-native-library-reader")) { isTransitive = false } - testRuntime(project(":kotlin-native:kotlin-native-utils")) { isTransitive = false } - - if (intellijUltimateEnabled) { - testCompileOnly(intellijUltimateDep()) { includeJars("platform-api", "platform-impl", "gson", "annotations", "trove4j", "openapi", "idea", "util", "jdom", rootProject = rootProject) } - } - testCompile(commonDep("org.jetbrains.kotlinx", "kotlinx-coroutines-core")) { isTransitive = false } - - testRuntime(project(":kotlin-reflect")) - testRuntime(project(":kotlin-script-runtime")) - testRuntimeOnly(projectRuntimeJar(":kotlin-compiler")) - testRuntime(project(":plugins:android-extensions-ide")) { isTransitive = false } - testRuntime(project(":plugins:android-extensions-compiler")) { isTransitive = false } - testRuntime(project(":plugins:annotation-based-compiler-plugins-ide-support")) { isTransitive = false } - testRuntime(project(":idea:idea-android")) { isTransitive = false } - testRuntime(project(":idea:idea-maven")) { isTransitive = false } - testRuntime(project(":idea:idea-jps-common")) { isTransitive = false } - testRuntime(project(":idea:formatter")) { isTransitive = false } - testRuntime(project(":sam-with-receiver-ide-plugin")) { isTransitive = false } - testRuntime(project(":kotlin-sam-with-receiver-compiler-plugin")) { isTransitive = false } - testRuntime(project(":noarg-ide-plugin")) { isTransitive = false } - testRuntime(project(":kotlin-noarg-compiler-plugin")) { isTransitive = false } - testRuntime(project(":allopen-ide-plugin")) { isTransitive = false } - testRuntime(project(":kotlin-allopen-compiler-plugin")) { isTransitive = false } - testRuntime(project(":kotlin-scripting-idea")) { isTransitive = false } - testRuntime(project(":kotlinx-serialization-compiler-plugin")) { isTransitive = false } - testRuntime(project(":kotlinx-serialization-ide-plugin")) { isTransitive = false } - testRuntime(project(":kotlin-scripting-compiler")) { isTransitive = false } - testRuntime(project(":plugins:kapt3-idea")) { isTransitive = false } - testRuntime(project(":plugins:uast-kotlin")) - testRuntime(project(":plugins:uast-kotlin-idea")) - testRuntime(intellijPluginDep("smali")) - - if (intellijUltimateEnabled) { - testCompile(intellijUltimatePluginDep("CSS")) - testCompile(intellijUltimatePluginDep("DatabaseTools")) - testCompile(intellijUltimatePluginDep("JavaEE")) - testCompile(intellijUltimatePluginDep("jsp")) - testCompile(intellijUltimatePluginDep("PersistenceSupport")) - testCompile(intellijUltimatePluginDep("Spring")) - testCompile(intellijUltimatePluginDep("uml")) - testCompile(intellijUltimatePluginDep("JavaScriptLanguage")) - testCompile(intellijUltimatePluginDep("JavaScriptDebugger")) - testCompile(intellijUltimatePluginDep("NodeJS")) - testCompile(intellijUltimatePluginDep("properties")) - testCompile(intellijUltimatePluginDep("java-i18n")) - testCompile(intellijUltimatePluginDep("gradle")) - testCompile(intellijUltimatePluginDep("Groovy")) - testCompile(intellijUltimatePluginDep("junit")) - testRuntime(intellijUltimatePluginDep("coverage")) - testRuntime(intellijUltimatePluginDep("maven")) - testRuntime(intellijUltimatePluginDep("android")) - testRuntime(intellijUltimatePluginDep("testng")) - testRuntime(intellijUltimatePluginDep("IntelliLang")) - testRuntime(intellijUltimatePluginDep("copyright")) - testRuntime(intellijUltimatePluginDep("java-decompiler")) - } - - testRuntime(files("${System.getProperty("java.home")}/../lib/tools.jar")) - - springClasspath(commonDep("org.springframework", "spring-core")) - springClasspath(commonDep("org.springframework", "spring-beans")) - springClasspath(commonDep("org.springframework", "spring-context")) - springClasspath(commonDep("org.springframework", "spring-tx")) - springClasspath(commonDep("org.springframework", "spring-web")) -} - -val preparedResources = File(buildDir, "prepResources") - -sourceSets { - "main" { projectDefault() } - "test" { - projectDefault() - resources.srcDir(preparedResources) - } -} - -val ultimatePluginXmlContent: String by lazy { - val sectRex = Regex("""^\s*\s*$""") - File(projectDir, "resources/META-INF/ultimate-plugin.xml") - .readLines() - .filterNot { it.matches(sectRex) } - .joinToString("\n") -} - -val prepareResources by task { - dependsOn(":idea:assemble") - from(ideaProjectResources, { - exclude("META-INF/plugin.xml") - }) - into(preparedResources) -} - -val preparePluginXml by task { - dependsOn(":idea:assemble") - from(ideaProjectResources, { include("META-INF/plugin.xml") }) - into(preparedResources) - filter { - it?.replace("", ultimatePluginXmlContent) - } -} - -val communityPluginProject = ":prepare:idea-plugin" - -val jar = runtimeJar(task("shadowJar")) { - duplicatesStrategy = DuplicatesStrategy.EXCLUDE - dependsOn(preparePluginXml) - dependsOn("$communityPluginProject:shadowJar") - val communityPluginJar = project(communityPluginProject).configurations["runtimeJar"].artifacts.files.singleFile - from(zipTree(communityPluginJar), { exclude("META-INF/plugin.xml") }) - from(preparedResources, { include("META-INF/plugin.xml") }) - from(mainSourceSet.output) - archiveName = "kotlin-plugin.jar" -} - -val ideaPluginDir: File by rootProject.extra -val ideaUltimatePluginDir: File by rootProject.extra - -task("ideaUltimatePlugin") { - dependsOn(":ideaPlugin") - into(ideaUltimatePluginDir) - from(ideaPluginDir) { exclude("lib/kotlin-plugin.jar") } - from(jar, { into("lib") }) -} - -task("idea-ultimate-plugin") { - dependsOn("ideaUltimatePlugin") - doFirst { logger.warn("'$name' task is deprecated, use '${dependsOn.last()}' instead") } -} - -task("ideaUltimatePluginTest") { - dependsOn("check") -} - -projectTest { - dependsOn(prepareResources) - dependsOn(preparePluginXml) - workingDir = rootDir - doFirst { - if (intellijUltimateEnabled) { - systemProperty("idea.home.path", intellijUltimateRootDir().canonicalPath) - } - systemProperty("spring.classpath", springClasspath.asPath) - } -} - -val generateTests by generator("org.jetbrains.kotlin.tests.GenerateUltimateTestsKt") - - +This build should not be invoked in AS */ \ No newline at end of file