From b4c942237640ff8c8d2bb65547bc59d8cb211577 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Thu, 31 Aug 2017 19:35:24 +0300 Subject: [PATCH] Rearrange and rename idea-plugin related and annotation-processing modules --- build.gradle.kts | 4 +- generators/build.gradle.kts | 3 +- gradle.properties | 1 + gradle/project-schema.json | 433 ++++++++---------- idea/build.gradle.kts | 6 +- idea/idea-android/build.gradle.kts | 6 +- j2k/build.gradle.kts | 6 +- .../build.gradle.kts | 28 +- .../tools/kotlin-gradle-plugin/build.gradle | 2 +- .../internal/Kapt3KotlinGradleSubplugin.kt | 2 +- .../android-extensions-idea/build.gradle.kts | 6 +- plugins/kapt3/build.gradle.kts | 7 + plugins/plugins-tests/build.gradle.kts | 6 +- prepare/kotlin-plugin/build.gradle.kts | 21 +- settings.gradle | 17 +- 15 files changed, 255 insertions(+), 293 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 3ec9d546e6d..6388df1aeef 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -269,14 +269,14 @@ tasks { dependsOn("dist") dependsOn(":plugins:android-extensions-idea:test", ":idea:idea-android:test", - ":plugins:kapt3:test", + ":kotlin-annotation-processing:test", ":compiler:android-tests:test") } "plugins-tests" { dependsOn("dist") dependsOn(":plugins:plugins-tests:test", - ":plugins:kapt3:test", + ":kotlin-annotation-processing:test", ":kotlin-source-sections-compiler-plugin:test", ":plugins:uast-kotlin:test", ":kotlin-annotation-processing") diff --git a/generators/build.gradle.kts b/generators/build.gradle.kts index d04f348895d..a4e2e0cb347 100644 --- a/generators/build.gradle.kts +++ b/generators/build.gradle.kts @@ -25,7 +25,7 @@ dependencies { compile(projectTests(":jps-plugin")) compile(projectTests(":plugins:plugins-tests")) compile(projectTests(":plugins:android-extensions-idea")) - compile(projectTests(":plugins:kapt3")) + compile(projectTests(":kotlin-annotation-processing")) compile(projectTests(":plugins:uast-kotlin")) compile(projectTests(":js:js.tests")) compile(protobufFull()) @@ -33,7 +33,6 @@ dependencies { testCompile(project(":compiler.tests-common")) testCompile(project(":idea:idea-test-framework")) { isTransitive = false } testCompile(project(":compiler:incremental-compilation-impl")) - testCompile(project(":plugins:kapt3")) testCompile(commonDep("junit:junit")) testCompile(ideaSdkDeps("openapi", "idea")) testCompile(preloadedDeps("uast-tests")) diff --git a/gradle.properties b/gradle.properties index 8e9c5b802be..9060e069fa0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,3 +5,4 @@ org.gradle.jvmargs=-Xmx1200m -XX:+CMSClassUnloadingEnabled -XX:+CMSPermGenSweepi systemProp.bootstrap.kotlin.repo=https://dl.bintray.com/kotlin/kotlin-dev systemProp.bootstrap.kotlin.version=1.1.5-dev-640 +#signingRequired=true diff --git a/gradle/project-schema.json b/gradle/project-schema.json index ab6e7a4bdfd..0b2ffdea547 100644 --- a/gradle/project-schema.json +++ b/gradle/project-schema.json @@ -13,6 +13,43 @@ "buildScan": "com.gradle.scan.plugin.internal.api.f" } }, + ":allopen-ide-plugin": { + "conventions": { + "base": "org.gradle.api.plugins.BasePluginConvention", + "java": "org.gradle.api.plugins.JavaPluginConvention" + }, + "configurations": [ + "apiElements", + "archives", + "buildVersion", + "compile", + "compileClasspath", + "compileOnly", + "default", + "implementation", + "kapt", + "kaptTest", + "runtime", + "runtimeClasspath", + "runtimeElements", + "runtimeJar", + "runtimeOnly", + "testCompile", + "testCompileClasspath", + "testCompileOnly", + "testImplementation", + "testRuntime", + "testRuntimeClasspath", + "testRuntimeOnly" + ], + "extensions": { + "ext": "org.gradle.api.plugins.ExtraPropertiesExtension", + "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension", + "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", + "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", + "reporting": "org.gradle.api.reporting.ReportingExtension" + } + }, ":android-extensions-compiler": { "conventions": { "base": "org.gradle.api.plugins.BasePluginConvention", @@ -464,6 +501,48 @@ } }, ":kotlin-annotation-processing": { + "conventions": { + "base": "org.gradle.api.plugins.BasePluginConvention", + "java": "org.gradle.api.plugins.JavaPluginConvention", + "maven": "org.gradle.api.plugins.MavenPluginConvention" + }, + "configurations": [ + "apiElements", + "archives", + "buildVersion", + "compile", + "compileClasspath", + "compileOnly", + "default", + "distJar", + "implementation", + "kapt", + "kaptTest", + "runtime", + "runtimeClasspath", + "runtimeElements", + "runtimeJar", + "runtimeOnly", + "signatures", + "testCompile", + "testCompileClasspath", + "testCompileOnly", + "testImplementation", + "testRuntime", + "testRuntimeClasspath", + "testRuntimeOnly", + "tests-jar" + ], + "extensions": { + "ext": "org.gradle.api.plugins.ExtraPropertiesExtension", + "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension", + "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", + "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", + "reporting": "org.gradle.api.reporting.ReportingExtension", + "signing": "org.gradle.plugins.signing.SigningExtension" + } + }, + ":kotlin-annotation-processing-gradle": { "conventions": { "base": "org.gradle.api.plugins.BasePluginConvention", "java": "org.gradle.api.plugins.JavaPluginConvention" @@ -471,6 +550,7 @@ "configurations": [ "apiElements", "archives", + "buildVersion", "compile", "compileClasspath", "compileOnly", @@ -481,6 +561,7 @@ "runtime", "runtimeClasspath", "runtimeElements", + "runtimeJar", "runtimeOnly", "testCompile", "testCompileClasspath", @@ -589,12 +670,14 @@ "fatJarContents", "fatSourcesJarContents", "proguardLibraryJars", - "runtimeJar" + "runtimeJar", + "signatures" ], "extensions": { "ext": "org.gradle.api.plugins.ExtraPropertiesExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension", + "signing": "org.gradle.plugins.signing.SigningExtension" } }, ":kotlin-compiler-client-embeddable": { @@ -620,6 +703,7 @@ "runtimeElements", "runtimeJar", "runtimeOnly", + "signatures", "testCompile", "testCompileClasspath", "testCompileOnly", @@ -636,7 +720,8 @@ "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", - "reporting": "org.gradle.api.reporting.ReportingExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension", + "signing": "org.gradle.plugins.signing.SigningExtension" } }, ":kotlin-compiler-embeddable": { @@ -649,11 +734,13 @@ "buildVersion", "compilerJar", "default", - "runtimeJar" + "runtimeJar", + "signatures" ], "extensions": { "ext": "org.gradle.api.plugins.ExtraPropertiesExtension", - "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet" + "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", + "signing": "org.gradle.plugins.signing.SigningExtension" } }, ":kotlin-daemon-client": { @@ -1071,41 +1158,13 @@ }, ":kotlin-runtime": { "conventions": { - "base": "org.gradle.api.plugins.BasePluginConvention", - "java": "org.gradle.api.plugins.JavaPluginConvention", - "maven": "org.gradle.api.plugins.MavenPluginConvention" + }, "configurations": [ - "apiElements", - "archives", - "compile", - "compileClasspath", - "compileOnly", - "default", - "distJar", - "implementation", - "kapt", - "kaptTest", - "runtime", - "runtimeClasspath", - "runtimeElements", - "runtimeOnly", - "signatures", - "testCompile", - "testCompileClasspath", - "testCompileOnly", - "testImplementation", - "testRuntime", - "testRuntimeClasspath", - "testRuntimeOnly" + ], "extensions": { - "ext": "org.gradle.api.plugins.ExtraPropertiesExtension", - "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension", - "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", - "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "signing": "org.gradle.plugins.signing.SigningExtension" + "ext": "org.gradle.api.plugins.ExtraPropertiesExtension" } }, ":kotlin-sam-with-receiver": { @@ -1170,6 +1229,7 @@ "runtimeElements", "runtimeJar", "runtimeOnly", + "signatures", "testCompile", "testCompileClasspath", "testCompileOnly", @@ -1183,7 +1243,8 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension", + "signing": "org.gradle.plugins.signing.SigningExtension" } }, ":kotlin-script-runtime": { @@ -1248,6 +1309,7 @@ "runtimeElements", "runtimeJar", "runtimeOnly", + "signatures", "testCompile", "testCompileClasspath", "testCompileOnly", @@ -1261,7 +1323,8 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension", + "signing": "org.gradle.plugins.signing.SigningExtension" } }, ":kotlin-source-sections-compiler-plugin": { @@ -1287,6 +1350,7 @@ "runtimeElements", "runtimeJar", "runtimeOnly", + "signatures", "testCompile", "testCompileClasspath", "testCompileOnly", @@ -1300,7 +1364,8 @@ "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension", "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension" + "reporting": "org.gradle.api.reporting.ReportingExtension", + "signing": "org.gradle.plugins.signing.SigningExtension" } }, ":kotlin-stdlib": { @@ -1319,6 +1384,7 @@ "annotationsRuntimeOnly", "apiElements", "archives", + "builtins", "builtinsCompile", "builtinsCompileClasspath", "builtinsCompileOnly", @@ -1531,6 +1597,43 @@ "ext": "org.gradle.api.plugins.ExtraPropertiesExtension" } }, + ":noarg-ide-plugin": { + "conventions": { + "base": "org.gradle.api.plugins.BasePluginConvention", + "java": "org.gradle.api.plugins.JavaPluginConvention" + }, + "configurations": [ + "apiElements", + "archives", + "buildVersion", + "compile", + "compileClasspath", + "compileOnly", + "default", + "implementation", + "kapt", + "kaptTest", + "runtime", + "runtimeClasspath", + "runtimeElements", + "runtimeJar", + "runtimeOnly", + "testCompile", + "testCompileClasspath", + "testCompileOnly", + "testImplementation", + "testRuntime", + "testRuntimeClasspath", + "testRuntimeOnly" + ], + "extensions": { + "ext": "org.gradle.api.plugins.ExtraPropertiesExtension", + "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension", + "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", + "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", + "reporting": "org.gradle.api.reporting.ReportingExtension" + } + }, ":plugins": { "conventions": { @@ -1553,6 +1656,43 @@ "ext": "org.gradle.api.plugins.ExtraPropertiesExtension" } }, + ":sam-with-receiver-ide-plugin": { + "conventions": { + "base": "org.gradle.api.plugins.BasePluginConvention", + "java": "org.gradle.api.plugins.JavaPluginConvention" + }, + "configurations": [ + "apiElements", + "archives", + "buildVersion", + "compile", + "compileClasspath", + "compileOnly", + "default", + "implementation", + "kapt", + "kaptTest", + "runtime", + "runtimeClasspath", + "runtimeElements", + "runtimeJar", + "runtimeOnly", + "testCompile", + "testCompileClasspath", + "testCompileOnly", + "testImplementation", + "testRuntime", + "testRuntimeClasspath", + "testRuntimeOnly" + ], + "extensions": { + "ext": "org.gradle.api.plugins.ExtraPropertiesExtension", + "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension", + "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", + "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", + "reporting": "org.gradle.api.reporting.ReportingExtension" + } + }, ":tools": { "conventions": { @@ -2374,75 +2514,13 @@ }, ":core:builtins": { "conventions": { - "base": "org.gradle.api.plugins.BasePluginConvention", - "java": "org.gradle.api.plugins.JavaPluginConvention" + }, "configurations": [ - "apiElements", - "archives", - "builtins", - "compile", - "compileClasspath", - "compileOnly", - "default", - "implementation", - "kapt", - "kaptTest", - "runtime", - "runtimeClasspath", - "runtimeElements", - "runtimeOnly", - "testCompile", - "testCompileClasspath", - "testCompileOnly", - "testImplementation", - "testRuntime", - "testRuntimeClasspath", - "testRuntimeOnly" + "builtins" ], "extensions": { - "ext": "org.gradle.api.plugins.ExtraPropertiesExtension", - "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension", - "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", - "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension" - } - }, - ":core:reflection.jvm": { - "conventions": { - "base": "org.gradle.api.plugins.BasePluginConvention", - "java": "org.gradle.api.plugins.JavaPluginConvention" - }, - "configurations": [ - "apiElements", - "archives", - "compile", - "compileClasspath", - "compileOnly", - "default", - "implementation", - "kapt", - "kaptTest", - "runtime", - "runtimeClasspath", - "runtimeElements", - "runtimeOnly", - "shadow", - "testCompile", - "testCompileClasspath", - "testCompileOnly", - "testImplementation", - "testRuntime", - "testRuntimeClasspath", - "testRuntimeOnly" - ], - "extensions": { - "ext": "org.gradle.api.plugins.ExtraPropertiesExtension", - "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension", - "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", - "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension", - "shadow": "com.github.jengelman.gradle.plugins.shadow.ShadowExtension" + "ext": "org.gradle.api.plugins.ExtraPropertiesExtension" } }, ":core:util.runtime": { @@ -3315,43 +3393,6 @@ "signing": "org.gradle.plugins.signing.SigningExtension" } }, - ":plugins:allopen-ide": { - "conventions": { - "base": "org.gradle.api.plugins.BasePluginConvention", - "java": "org.gradle.api.plugins.JavaPluginConvention" - }, - "configurations": [ - "apiElements", - "archives", - "buildVersion", - "compile", - "compileClasspath", - "compileOnly", - "default", - "implementation", - "kapt", - "kaptTest", - "runtime", - "runtimeClasspath", - "runtimeElements", - "runtimeJar", - "runtimeOnly", - "testCompile", - "testCompileClasspath", - "testCompileOnly", - "testImplementation", - "testRuntime", - "testRuntimeClasspath", - "testRuntimeOnly" - ], - "extensions": { - "ext": "org.gradle.api.plugins.ExtraPropertiesExtension", - "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension", - "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", - "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension" - } - }, ":plugins:android-extensions-idea": { "conventions": { "base": "org.gradle.api.plugins.BasePluginConvention", @@ -3460,42 +3501,6 @@ "reporting": "org.gradle.api.reporting.ReportingExtension" } }, - ":plugins:kapt3": { - "conventions": { - "base": "org.gradle.api.plugins.BasePluginConvention", - "java": "org.gradle.api.plugins.JavaPluginConvention" - }, - "configurations": [ - "apiElements", - "archives", - "compile", - "compileClasspath", - "compileOnly", - "default", - "implementation", - "kapt", - "kaptTest", - "runtime", - "runtimeClasspath", - "runtimeElements", - "runtimeOnly", - "testCompile", - "testCompileClasspath", - "testCompileOnly", - "testImplementation", - "testRuntime", - "testRuntimeClasspath", - "testRuntimeOnly", - "tests-jar" - ], - "extensions": { - "ext": "org.gradle.api.plugins.ExtraPropertiesExtension", - "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension", - "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", - "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension" - } - }, ":plugins:lint": { "conventions": { "base": "org.gradle.api.plugins.BasePluginConvention", @@ -3531,43 +3536,6 @@ "reporting": "org.gradle.api.reporting.ReportingExtension" } }, - ":plugins:noarg-ide": { - "conventions": { - "base": "org.gradle.api.plugins.BasePluginConvention", - "java": "org.gradle.api.plugins.JavaPluginConvention" - }, - "configurations": [ - "apiElements", - "archives", - "buildVersion", - "compile", - "compileClasspath", - "compileOnly", - "default", - "implementation", - "kapt", - "kaptTest", - "runtime", - "runtimeClasspath", - "runtimeElements", - "runtimeJar", - "runtimeOnly", - "testCompile", - "testCompileClasspath", - "testCompileOnly", - "testImplementation", - "testRuntime", - "testRuntimeClasspath", - "testRuntimeOnly" - ], - "extensions": { - "ext": "org.gradle.api.plugins.ExtraPropertiesExtension", - "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension", - "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", - "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension" - } - }, ":plugins:plugins-tests": { "conventions": { "base": "org.gradle.api.plugins.BasePluginConvention", @@ -3604,43 +3572,6 @@ "reporting": "org.gradle.api.reporting.ReportingExtension" } }, - ":plugins:sam-with-receiver-ide": { - "conventions": { - "base": "org.gradle.api.plugins.BasePluginConvention", - "java": "org.gradle.api.plugins.JavaPluginConvention" - }, - "configurations": [ - "apiElements", - "archives", - "buildVersion", - "compile", - "compileClasspath", - "compileOnly", - "default", - "implementation", - "kapt", - "kaptTest", - "runtime", - "runtimeClasspath", - "runtimeElements", - "runtimeJar", - "runtimeOnly", - "testCompile", - "testCompileClasspath", - "testCompileOnly", - "testImplementation", - "testRuntime", - "testRuntimeClasspath", - "testRuntimeOnly" - ], - "extensions": { - "ext": "org.gradle.api.plugins.ExtraPropertiesExtension", - "kotlin": "org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension", - "kapt": "org.jetbrains.kotlin.gradle.plugin.KaptExtension", - "defaultArtifacts": "org.gradle.api.internal.plugins.DefaultArtifactPublicationSet", - "reporting": "org.gradle.api.reporting.ReportingExtension" - } - }, ":plugins:uast-kotlin": { "conventions": { "base": "org.gradle.api.plugins.BasePluginConvention", diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts index 65aa4fcb3b1..adaee811e0a 100644 --- a/idea/build.gradle.kts +++ b/idea/build.gradle.kts @@ -71,12 +71,12 @@ dependencies { // deps below are test runtime deps, but made test compile to split compilation and running to reduce mem req testCompile(project(":android-extensions-compiler")) testCompile(project(":plugins:android-extensions-idea")) { isTransitive = false } - testCompile(project(":plugins:allopen-ide")) { isTransitive = false } + testCompile(project(":allopen-ide-plugin")) { isTransitive = false } testCompile(project(":kotlin-allopen-compiler-plugin")) - testCompile(project(":plugins:noarg-ide")) { isTransitive = false } + testCompile(project(":noarg-ide-plugin")) { isTransitive = false } testCompile(project(":kotlin-noarg-compiler-plugin")) testCompile(project(":plugins:annotation-based-compiler-plugins-ide-support")) { isTransitive = false } - testCompile(project(":plugins:sam-with-receiver-ide")) { isTransitive = false } + testCompile(project(":sam-with-receiver-ide-plugin")) { isTransitive = false } testCompile(project(":kotlin-sam-with-receiver-compiler-plugin")) testCompile(project(":idea:idea-android")) { isTransitive = false } testCompile(project(":plugins:lint")) { isTransitive = false } diff --git a/idea/idea-android/build.gradle.kts b/idea/idea-android/build.gradle.kts index fa33f79ed69..144e69e98d1 100644 --- a/idea/idea-android/build.gradle.kts +++ b/idea/idea-android/build.gradle.kts @@ -25,9 +25,9 @@ dependencies { testCompile(commonDep("junit:junit")) testRuntime(project(":plugins:android-extensions-idea")) - testRuntime(project(":plugins:sam-with-receiver-ide")) - testRuntime(project(":plugins:noarg-ide")) - testRuntime(project(":plugins:allopen-ide")) + testRuntime(project(":sam-with-receiver-ide-plugin")) + testRuntime(project(":noarg-ide-plugin")) + testRuntime(project(":allopen-ide-plugin")) testRuntime(ideaSdkDeps("*.jar")) testRuntime(ideaPluginDeps("idea-junit", "resources_en", plugin = "junit")) testRuntime(ideaPluginDeps("IntelliLang", plugin = "IntelliLang")) diff --git a/j2k/build.gradle.kts b/j2k/build.gradle.kts index b36f350d728..c84dda6dd95 100644 --- a/j2k/build.gradle.kts +++ b/j2k/build.gradle.kts @@ -20,9 +20,9 @@ dependencies { testCompile(project(":compiler.tests-common")) testRuntime(project(":idea:idea-android")) testRuntime(project(":plugins:android-extensions-idea")) - testRuntime(project(":plugins:sam-with-receiver-ide")) - testRuntime(project(":plugins:allopen-ide")) - testRuntime(project(":plugins:noarg-ide")) + testRuntime(project(":sam-with-receiver-ide-plugin")) + testRuntime(project(":allopen-ide-plugin")) + testRuntime(project(":noarg-ide-plugin")) testRuntime(ideaSdkDeps("*.jar")) testRuntime(ideaPluginDeps("*.jar", plugin = "properties")) testRuntime(ideaPluginDeps("*.jar", plugin = "gradle")) diff --git a/libraries/tools/kotlin-annotation-processing/build.gradle.kts b/libraries/tools/kotlin-annotation-processing/build.gradle.kts index 1a3ccffb2b9..0322fa81e01 100644 --- a/libraries/tools/kotlin-annotation-processing/build.gradle.kts +++ b/libraries/tools/kotlin-annotation-processing/build.gradle.kts @@ -1,14 +1,28 @@ +import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar description = "Annotation Processor wrapper for Kotlin" +buildscript { + repositories { + jcenter() + } + + dependencies { + classpath("com.github.jengelman.gradle.plugins:shadow:1.2.3") + } +} + apply { plugin("kotlin") } +val packedJars by configurations.creating + dependencies { - compile(project(":plugins:kapt3")) + compile(project(":kotlin-annotation-processing")) compileOnly("org.jetbrains.kotlin:gradle-api:1.6") compileOnly("com.android.tools.build:gradle:1.1.0") compile(projectDist(":kotlin-stdlib")) testCompile(commonDep("junit:junit")) + packedJars(project(":kotlin-annotation-processing")) { isTransitive = false } } sourceSets { @@ -20,10 +34,16 @@ projectTest { workingDir = projectDir } -runtimeJar() +val jar by tasks +jar.apply { + enabled = false +} + +runtimeJar(task("shadowJar")) { + from(packedJars) + from(the().sourceSets.getByName("main").output) +} sourcesJar() javadocJar() -dist() - publish() diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle b/libraries/tools/kotlin-gradle-plugin/build.gradle index f1d9d5f2bc6..bfaf75d91d1 100644 --- a/libraries/tools/kotlin-gradle-plugin/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin/build.gradle @@ -36,7 +36,7 @@ dependencies { compile project(':compiler:compiler-runner') compile project(":compiler:incremental-compilation-impl") compile project(":compiler:daemon") - compile project(':kotlin-annotation-processing') + compile project(':kotlin-annotation-processing-gradle') compileOnly 'com.android.tools.build:gradle:2.0.0' compileOnly 'org.codehaus.groovy:groovy-all:2.3.9' diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/Kapt3KotlinGradleSubplugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/Kapt3KotlinGradleSubplugin.kt index 56c2805b765..ddfd9701532 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/Kapt3KotlinGradleSubplugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/internal/Kapt3KotlinGradleSubplugin.kt @@ -78,7 +78,7 @@ class Kapt3KotlinGradleSubplugin : KotlinGradleSubplugin { val MAIN_KAPT_CONFIGURATION_NAME = "kapt" val KAPT_GROUP_NAME = "org.jetbrains.kotlin" - val KAPT_ARTIFACT_NAME = "kotlin-annotation-processing" + val KAPT_ARTIFACT_NAME = "kotlin-annotation-processing-gradle" fun getKaptConfigurationName(sourceSetName: String): String { return if (sourceSetName != "main") diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts b/plugins/android-extensions/android-extensions-idea/build.gradle.kts index f6d1fa03c95..70ca5581097 100644 --- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts @@ -20,9 +20,9 @@ dependencies { testCompile(projectDist(":kotlin-test:kotlin-test-jvm")) testCompile(commonDep("junit:junit")) testRuntime(project(":plugins:android-extensions-jps")) - testRuntime(project(":plugins:sam-with-receiver-ide")) - testRuntime(project(":plugins:noarg-ide")) - testRuntime(project(":plugins:allopen-ide")) + testRuntime(project(":sam-with-receiver-ide-plugin")) + testRuntime(project(":noarg-ide-plugin")) + testRuntime(project(":allopen-ide-plugin")) testRuntime(ideaSdkDeps("*.jar")) testRuntime(ideaPluginDeps("idea-junit", "resources_en", plugin = "junit")) testRuntime(ideaPluginDeps("IntelliLang", plugin = "IntelliLang")) diff --git a/plugins/kapt3/build.gradle.kts b/plugins/kapt3/build.gradle.kts index 2342fee2429..50d1fd50fa7 100644 --- a/plugins/kapt3/build.gradle.kts +++ b/plugins/kapt3/build.gradle.kts @@ -1,4 +1,6 @@ +description = "Annotation Processor for Kotlin" + apply { plugin("kotlin") } dependencies { @@ -23,3 +25,8 @@ projectTest { workingDir = rootDir } +runtimeJar() +sourcesJar() +javadocJar() + +dist() diff --git a/plugins/plugins-tests/build.gradle.kts b/plugins/plugins-tests/build.gradle.kts index aa182c20bb8..f1a7984e32f 100644 --- a/plugins/plugins-tests/build.gradle.kts +++ b/plugins/plugins-tests/build.gradle.kts @@ -8,12 +8,12 @@ dependencies { testCompile(project(":compiler.tests-common")) testCompile(project(":android-extensions-compiler")) testCompile(project(":plugins:android-extensions-idea")) - testCompile(project(":plugins:allopen-ide")) { isTransitive = false } + testCompile(project(":allopen-ide-plugin")) { isTransitive = false } testCompile(project(":kotlin-allopen-compiler-plugin")) - testCompile(project(":plugins:noarg-ide")) { isTransitive = false } + testCompile(project(":noarg-ide-plugin")) { isTransitive = false } testCompile(project(":kotlin-noarg-compiler-plugin")) testCompile(project(":plugins:annotation-based-compiler-plugins-ide-support")) { isTransitive = false } - testCompile(project(":plugins:sam-with-receiver-ide")) { isTransitive = false } + testCompile(project(":sam-with-receiver-ide-plugin")) { isTransitive = false } testCompile(project(":kotlin-sam-with-receiver-compiler-plugin")) testCompile(project(":idea:idea-android")) { isTransitive = false } testCompile(project(":plugins:lint")) { isTransitive = false } diff --git a/prepare/kotlin-plugin/build.gradle.kts b/prepare/kotlin-plugin/build.gradle.kts index b7b721c7007..f2215c6d920 100644 --- a/prepare/kotlin-plugin/build.gradle.kts +++ b/prepare/kotlin-plugin/build.gradle.kts @@ -1,5 +1,6 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar +import org.gradle.jvm.tasks.Jar description = "Kotlin IDEA plugin" @@ -13,6 +14,10 @@ buildscript { } } +plugins { + `java-base` +} + val projectsToShadow = listOf( ":plugins:annotation-based-compiler-plugins-ide-support", ":compiler:backend", @@ -57,22 +62,20 @@ dependencies { packedJars(preloadedDeps("protobuf-${rootProject.extra["versions.protobuf-java"]}")) packedJars(project(":kotlin-stdlib", configuration = "builtins")) sideJars(projectDist(":kotlin-script-runtime")) + sideJars(projectDist(":kotlin-stdlib")) + sideJars(projectDist(":kotlin-reflect")) sideJars(commonDep("io.javaslang", "javaslang")) sideJars(commonDep("javax.inject")) sideJars(preloadedDeps("markdown", "kotlinx-coroutines-core", "kotlinx-coroutines-jdk8")) } val jar = runtimeJar(task("shadowJar")) { - projectsToShadow.forEach { - dependsOn("$it:classes") - project(it).let { p -> - p.pluginManager.withPlugin("java") { - from(p.the().sourceSets.getByName("main").output) - } - } - } from(files("$rootDir/resources/kotlinManifest.properties")) - from(packedJars.files) + from(packedJars) + for (p in projectsToShadow) { + dependsOn("$p:classes") + from(project(p).the().sourceSets.getByName("main").output) + } } ideaPlugin { diff --git a/settings.gradle b/settings.gradle index 8eb15c463c1..4124343cc47 100644 --- a/settings.gradle +++ b/settings.gradle @@ -68,16 +68,15 @@ include ":kotlin-build-common", ":plugins:android-extensions-idea", ":plugins:android-extensions-jps", ":kotlin-allopen-compiler-plugin", - ":plugins:allopen-ide", + ":allopen-ide-plugin", ":kotlin-noarg-compiler-plugin", - ":plugins:noarg-ide", + ":noarg-ide-plugin", ":kotlin-sam-with-receiver-compiler-plugin", - ":plugins:sam-with-receiver-ide", + ":sam-with-receiver-ide-plugin", ":kotlin-source-sections-compiler-plugin", ":plugins:uast-kotlin", ":plugins:uast-kotlin-idea", ":plugins:annotation-based-compiler-plugins-ide-support", - ":plugins:kapt3", ":plugins:plugins-tests", ":kotlin-script-runtime", ":kotlin-runtime", @@ -119,6 +118,7 @@ include ":kotlin-build-common", ":examples:annotation-processor-example", ":kotlin-script-util", ":kotlin-annotation-processing", + ":kotlin-annotation-processing-gradle", ":examples:kotlin-jsr223-local-example", ":examples:kotlin-jsr223-daemon-local-eval-example" @@ -158,11 +158,11 @@ project(':plugins:android-extensions-idea').projectDir = "$rootDir/plugins/andro project(':plugins:android-extensions-jps').projectDir = "$rootDir/plugins/android-extensions/android-extensions-jps" as File project(':android-lint').projectDir = "$rootDir/prepare/android-lint" as File project(':kotlin-allopen-compiler-plugin').projectDir = "$rootDir/plugins/allopen/allopen-cli" as File -project(':plugins:allopen-ide').projectDir = "$rootDir/plugins/allopen/allopen-ide" as File +project(':allopen-ide-plugin').projectDir = "$rootDir/plugins/allopen/allopen-ide" as File project(':kotlin-noarg-compiler-plugin').projectDir = "$rootDir/plugins/noarg/noarg-cli" as File -project(':plugins:noarg-ide').projectDir = "$rootDir/plugins/noarg/noarg-ide" as File +project(':noarg-ide-plugin').projectDir = "$rootDir/plugins/noarg/noarg-ide" as File project(':kotlin-sam-with-receiver-compiler-plugin').projectDir = "$rootDir/plugins/sam-with-receiver/sam-with-receiver-cli" as File -project(':plugins:sam-with-receiver-ide').projectDir = "$rootDir/plugins/sam-with-receiver/sam-with-receiver-ide" as File +project(':sam-with-receiver-ide-plugin').projectDir = "$rootDir/plugins/sam-with-receiver/sam-with-receiver-ide" as File project(':kotlin-source-sections-compiler-plugin').projectDir = "$rootDir/plugins/source-sections/source-sections-compiler" as File project(':tools:binary-compatibility-validator').projectDir = "$rootDir/libraries/tools/binary-compatibility-validator" as File project(':tools:kotlin-stdlib-js-merger').projectDir = "$rootDir/libraries/tools/kotlin-stdlib-js-merger" as File @@ -176,7 +176,8 @@ project(':kotlin-sam-with-receiver').projectDir = "$rootDir/libraries/tools/kotl project(':kotlin-gradle-subplugin-example').projectDir = "$rootDir/libraries/examples/kotlin-gradle-subplugin-example" as File project(':examples:annotation-processor-example').projectDir = "$rootDir/libraries/examples/annotation-processor-example" as File project(':kotlin-script-util').projectDir = "$rootDir/libraries/tools/kotlin-script-util" as File -project(':kotlin-annotation-processing').projectDir = "$rootDir/libraries/tools/kotlin-annotation-processing" as File +project(':kotlin-annotation-processing-gradle').projectDir = "$rootDir/libraries/tools/kotlin-annotation-processing" as File +project(':kotlin-annotation-processing').projectDir = "$rootDir/plugins/kapt3" as File project(':examples:kotlin-jsr223-local-example').projectDir = "$rootDir/libraries/examples/kotlin-jsr223-local-example" as File project(':examples:kotlin-jsr223-daemon-local-eval-example').projectDir = "$rootDir/libraries/examples/kotlin-jsr223-daemon-local-eval-example" as File