From a6bd0f618e0c3d75a476800a7e9cb9b918fd84fc Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Thu, 12 Apr 2018 21:27:49 +0300 Subject: [PATCH] as32: Remove platform-api & platform-impl from build scripts since they are not present in AS 3.2 C10 --- compiler/tests-common/build.gradle.kts.as32 | 44 +++++++++++++++ j2k/build.gradle.kts.as32 | 2 +- jps-plugin/build.gradle.kts.as32 | 4 +- .../kotlin-script-util/build.gradle.kts.as32 | 40 ++++++++++++++ .../build.gradle.kts.as32 | 42 +++++++++++++++ .../kapt3-compiler/build.gradle.kts.as32 | 53 +++++++++++++++++++ .../build.gradle.kts.as32 | 32 +++++++++++ plugins/uast-kotlin/build.gradle.kts.as32 | 50 +++++++++++++++++ 8 files changed, 264 insertions(+), 3 deletions(-) create mode 100644 compiler/tests-common/build.gradle.kts.as32 create mode 100644 libraries/tools/kotlin-script-util/build.gradle.kts.as32 create mode 100644 plugins/android-extensions/android-extensions-jps/build.gradle.kts.as32 create mode 100644 plugins/kapt3/kapt3-compiler/build.gradle.kts.as32 create mode 100644 plugins/sam-with-receiver/sam-with-receiver-ide/build.gradle.kts.as32 create mode 100644 plugins/uast-kotlin/build.gradle.kts.as32 diff --git a/compiler/tests-common/build.gradle.kts.as32 b/compiler/tests-common/build.gradle.kts.as32 new file mode 100644 index 00000000000..2b3d29f394d --- /dev/null +++ b/compiler/tests-common/build.gradle.kts.as32 @@ -0,0 +1,44 @@ + +plugins { + kotlin("jvm") + id("jps-compatible") +} + +dependencies { + testCompile(project(":core:descriptors")) + testCompile(project(":core:descriptors.jvm")) + testCompile(project(":core:deserialization")) + testCompile(project(":compiler:util")) + testCompile(project(":compiler:backend")) + testCompile(project(":compiler:ir.ir2cfg")) + testCompile(project(":compiler:frontend")) + testCompile(project(":compiler:frontend.java")) + testCompile(project(":compiler:util")) + testCompile(project(":compiler:cli-common")) + testCompile(project(":compiler:cli")) + testCompile(project(":compiler:light-classes")) + testCompile(project(":compiler:serialization")) + testCompile(project(":kotlin-preloader")) + testCompile(project(":compiler:daemon-common")) + testCompile(project(":js:js.serializer")) + testCompile(project(":js:js.frontend")) + testCompile(project(":js:js.translator")) + testCompileOnly(project(":plugins:android-extensions-compiler")) + testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) + testCompile(projectTests(":compiler:tests-common-jvm6")) + testCompileOnly(project(":kotlin-reflect-api")) + testCompile(commonDep("junit:junit")) + testCompile(androidDxJar()) { isTransitive = false } + testCompile(intellijCoreDep()) { includeJars("intellij-core"); isTransitive = false } + testCompile(intellijDep()) { + includeJars("openapi", "idea", "idea_rt", "guava", "trove4j", "picocontainer", "asm-all", "log4j", "jdom", "bootstrap", "annotations", rootProject = rootProject) + isTransitive = false + } +} + +sourceSets { + "main" { } + "test" { projectDefault() } +} + +testsJar {} diff --git a/j2k/build.gradle.kts.as32 b/j2k/build.gradle.kts.as32 index 562c44d1a74..7dfba663942 100644 --- a/j2k/build.gradle.kts.as32 +++ b/j2k/build.gradle.kts.as32 @@ -19,7 +19,7 @@ dependencies { testCompile(project(":compiler:light-classes")) testCompile(projectDist(":kotlin-test:kotlin-test-junit")) testCompile(commonDep("junit:junit")) - testCompileOnly(intellijDep()) { includeJars("platform-api", "platform-impl") } + testCompileOnly(intellijDep()) { includeJars("idea") } testRuntime(project(":plugins:kapt3-idea")) { isTransitive = false } testRuntime(project(":idea:idea-jvm")) diff --git a/jps-plugin/build.gradle.kts.as32 b/jps-plugin/build.gradle.kts.as32 index 81e65231f55..5da3a9e2fb7 100644 --- a/jps-plugin/build.gradle.kts.as32 +++ b/jps-plugin/build.gradle.kts.as32 @@ -15,7 +15,7 @@ dependencies { compile(project(":compiler:frontend.java")) compile(projectRuntimeJar(":kotlin-preloader")) compile(project(":idea:idea-jps-common")) - compileOnly(intellijDep()) { includeJars("jdom", "trove4j", "jps-model", "openapi", "platform-api", "util", "asm-all") } + compileOnly(intellijDep()) { includeJars("jdom", "trove4j", "jps-model", "openapi", "util", "asm-all") } compileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") } testCompileOnly(project(":kotlin-reflect-api")) testCompile(project(":compiler:incremental-compilation-impl")) @@ -25,7 +25,7 @@ dependencies { testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) testCompile(projectTests(":kotlin-build-common")) testCompileOnly(intellijDep("jps-standalone")) { includeJars("jps-builders", "jps-builders-6") } - testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "platform-api", "log4j") } + testCompileOnly(intellijDep()) { includeJars("openapi", "idea", "log4j") } testCompile(intellijDep("jps-build-test")) compilerModules.forEach { testRuntime(project(it)) diff --git a/libraries/tools/kotlin-script-util/build.gradle.kts.as32 b/libraries/tools/kotlin-script-util/build.gradle.kts.as32 new file mode 100644 index 00000000000..9137fc1f8ee --- /dev/null +++ b/libraries/tools/kotlin-script-util/build.gradle.kts.as32 @@ -0,0 +1,40 @@ + +description = "Kotlin scripting support utilities" + +plugins { + kotlin("jvm") + id("jps-compatible") +} + +dependencies { + compile(project(":kotlin-stdlib")) + compile(project(":kotlin-script-runtime")) + 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")) + testRuntime(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/plugins/android-extensions/android-extensions-jps/build.gradle.kts.as32 b/plugins/android-extensions/android-extensions-jps/build.gradle.kts.as32 new file mode 100644 index 00000000000..712a18454c2 --- /dev/null +++ b/plugins/android-extensions/android-extensions-jps/build.gradle.kts.as32 @@ -0,0 +1,42 @@ + +plugins { + kotlin("jvm") + id("jps-compatible") +} + +dependencies { + testRuntime(intellijDep()) + + compile(project(":compiler:util")) + compile(project(":jps-plugin")) + compile(project(":plugins:android-extensions-compiler")) + compileOnly(intellijDep()) { includeJars("openapi", "jps-builders", "jps-model", "jdom") } + compileOnly(intellijPluginDep("android")) { includeJars("jps/android-jps-plugin") } + compile(intellijPluginDep("android")) { includeJars("jps/android-jps-plugin") } + + testCompile(projectTests(":jps-plugin")) + testCompile(project(":compiler:tests-common")) + testCompile(commonDep("junit:junit")) + testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) + testCompile(projectTests(":kotlin-build-common")) + testCompileOnly(intellijDep()) { includeJars("openapi", "jps-builders") } + testCompileOnly(intellijDep("jps-build-test")) { includeJars("jps-build-test") } + testCompileOnly(intellijDep()) { includeJars("jps-model") } + + testRuntime(intellijPluginDep("android")) + testRuntime(intellijPluginDep("smali")) + testRuntime(intellijDep("jps-build-test")) + testRuntime(intellijDep("jps-standalone")) +} + +sourceSets { + "main" { projectDefault() } + "test" { projectDefault() } +} + +projectTest { + workingDir = rootDir + useAndroidSdk() +} + +testsJar {} \ No newline at end of file diff --git a/plugins/kapt3/kapt3-compiler/build.gradle.kts.as32 b/plugins/kapt3/kapt3-compiler/build.gradle.kts.as32 new file mode 100644 index 00000000000..aa4891a4b9e --- /dev/null +++ b/plugins/kapt3/kapt3-compiler/build.gradle.kts.as32 @@ -0,0 +1,53 @@ + +description = "Annotation Processor for Kotlin" + +plugins { + kotlin("jvm") + id("jps-compatible") +} + +dependencies { + testCompileOnly(intellijCoreDep()) { includeJars("intellij-core") } + testRuntime(intellijDep()) + testCompileOnly(intellijDep()) { includeJars("idea", "idea_rt", "openapi") } + + compile(project(":compiler:util")) + compile(project(":compiler:cli")) + compile(project(":compiler:backend")) + compile(project(":compiler:frontend")) + compile(project(":compiler:frontend.java")) + compile(project(":compiler:plugin-api")) + compileOnly(project(":kotlin-annotation-processing-runtime")) + compileOnly(intellijCoreDep()) { includeJars("intellij-core") } + compileOnly(intellijDep()) { includeJars("asm-all") } + + testCompile(project(":compiler:tests-common")) + testCompile(projectTests(":compiler:tests-common")) + testCompile(commonDep("junit:junit")) + testCompile(project(":kotlin-annotation-processing-runtime")) + + embeddedComponents(project(":kotlin-annotation-processing-runtime")) { isTransitive = false } +} + +sourceSets { + "main" { projectDefault() } + "test" { projectDefault() } +} + +testsJar {} + +projectTest { + workingDir = rootDir + dependsOn(":dist") +} + +runtimeJar { + fromEmbeddedComponents() +} + +sourcesJar() +javadocJar() + +dist() + +publish() diff --git a/plugins/sam-with-receiver/sam-with-receiver-ide/build.gradle.kts.as32 b/plugins/sam-with-receiver/sam-with-receiver-ide/build.gradle.kts.as32 new file mode 100644 index 00000000000..0603f259ac8 --- /dev/null +++ b/plugins/sam-with-receiver/sam-with-receiver-ide/build.gradle.kts.as32 @@ -0,0 +1,32 @@ + +description = "Kotlin SamWithReceiver IDEA Plugin" + +plugins { + kotlin("jvm") + id("jps-compatible") +} + +jvmTarget = "1.6" + +dependencies { + compile(project(":kotlin-sam-with-receiver-compiler-plugin")) + compile(project(":plugins:annotation-based-compiler-plugins-ide-support")) + compile(project(":compiler:util")) + compile(project(":compiler:frontend")) + compile(project(":compiler:frontend.java")) + compile(project(":idea:idea-core")) + compile(project(":idea:idea-android")) + compile(project(":idea")) + compile(project(":idea:idea-jvm")) + compile(intellijDep()) { includeJars("openapi", "extensions", "util") } +} + +sourceSets { + "main" { projectDefault() } + "test" {} +} + +runtimeJar() + +ideaPlugin() + diff --git a/plugins/uast-kotlin/build.gradle.kts.as32 b/plugins/uast-kotlin/build.gradle.kts.as32 new file mode 100644 index 00000000000..e43fae77d87 --- /dev/null +++ b/plugins/uast-kotlin/build.gradle.kts.as32 @@ -0,0 +1,50 @@ + +plugins { + kotlin("jvm") + id("jps-compatible") +} + +dependencies { + compile(projectDist(":kotlin-stdlib")) + compile(project(":core:util.runtime")) + compile(project(":compiler:backend")) + compile(project(":compiler:frontend")) + compile(project(":compiler:frontend.java")) + compile(project(":compiler:light-classes")) + compile(project(":idea:idea-core")) + compileOnly(intellijDep()) { includeJars("openapi", "idea", "java-api", "java-impl", "util", "extensions", "asm-all") } + + testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) + testCompile(projectTests(":compiler:tests-common")) + testCompile(commonDep("junit:junit")) + testCompile(project(":compiler:util")) + testCompile(project(":compiler:cli")) + testCompile(projectTests(":idea:idea-test-framework")) + testCompileOnly(intellijDep()) { includeJars("java-api", "java-impl", "idea_rt") } + + testRuntime(projectDist(":kotlin-reflect")) + testRuntime(project(":idea:idea-android")) + testRuntime(project(":idea:idea-gradle")) + testRuntime(project(":plugins:kapt3-idea")) { isTransitive = false } + testRuntime(project(":sam-with-receiver-ide-plugin")) + testRuntime(project(":allopen-ide-plugin")) + testRuntime(project(":noarg-ide-plugin")) + testRuntime(project(":plugins:android-extensions-ide")) + testRuntime(project(":plugins:kapt3-idea")) + testRuntime(intellijDep()) + testRuntime(intellijPluginDep("junit")) + testRuntime(intellijPluginDep("gradle")) + testRuntime(intellijPluginDep("Groovy")) + testRuntime(intellijPluginDep("properties")) +} + +sourceSets { + "main" { projectDefault() } + "test" { projectDefault() } +} + +testsJar {} + +projectTest { + workingDir = rootDir +}