From 33adebe5bf8a37195b61a5ed2b3cb41f03004fd4 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmair Date: Mon, 26 Sep 2022 10:49:51 +0200 Subject: [PATCH] [Gradle][MPP] Add k.g.p-tcs-android module for prototyping KT-54766 --- build.gradle.kts | 1 + gradle/jps.gradle.kts | 1 + .../build.gradle.kts | 17 +++++++++++++++++ .../tools/kotlin-gradle-plugin/build.gradle.kts | 1 + settings.gradle | 2 ++ 5 files changed, 22 insertions(+) create mode 100644 libraries/tools/kotlin-gradle-plugin-tcs-android/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts index a483b454646..97feaeaa123 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -415,6 +415,7 @@ val gradlePluginProjects = listOf( ":kotlin-gradle-plugin-idea", ":kotlin-gradle-plugin-idea-proto", ":kotlin-gradle-plugin-kpm-android", + ":kotlin-gradle-plugin-tcs-android", ":kotlin-allopen", ":kotlin-annotation-processing-gradle", ":kotlin-noarg", diff --git a/gradle/jps.gradle.kts b/gradle/jps.gradle.kts index 185c1d863c4..80cc34131e5 100644 --- a/gradle/jps.gradle.kts +++ b/gradle/jps.gradle.kts @@ -35,6 +35,7 @@ fun updateCompilerXml() { "libraries/tools/kotlin-gradle-plugin-idea-for-compatibility-tests", "libraries/tools/kotlin-gradle-plugin-integration-tests", "libraries/tools/kotlin-gradle-plugin-kpm-android", + "libraries/tools/kotlin-gradle-plugin-tcs-android", "libraries/tools/kotlin-gradle-plugin-model", "libraries/tools/kotlin-gradle-plugin-npm-versions-codegen", "libraries/tools/kotlin-gradle-plugin-test-utils-embeddable", diff --git a/libraries/tools/kotlin-gradle-plugin-tcs-android/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-tcs-android/build.gradle.kts new file mode 100644 index 00000000000..7012a3ddbe4 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-tcs-android/build.gradle.kts @@ -0,0 +1,17 @@ +plugins { + kotlin("jvm") + `maven-publish` +} + +dependencies { + compileOnly(gradleKotlinDsl()) + compileOnly("com.android.tools.build:gradle:7.0.0") + compileOnly(project(":kotlin-gradle-plugin")) +} + +/* This module is just for local development / prototyping and demos */ +if (!kotlinBuildProperties.isTeamcityBuild) { + tasks.register("install") { + dependsOn(tasks.named("publishToMavenLocal")) + } +} diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts index 8175f67761e..60f0ad988f3 100644 --- a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts @@ -97,6 +97,7 @@ dependencies { functionalTestCompileOnly("com.android.tools:common:30.2.1") functionalTestImplementation(gradleKotlinDsl()) functionalTestImplementation(project(":kotlin-gradle-plugin-kpm-android")) + functionalTestImplementation(project(":kotlin-gradle-plugin-tcs-android")) functionalTestImplementation(project(":kotlin-tooling-metadata")) functionalTestImplementation(testFixtures(project(":kotlin-gradle-plugin-idea"))) functionalTestImplementation("com.github.gundy:semver4j:0.16.4:nodeps") { diff --git a/settings.gradle b/settings.gradle index 9373589fa73..dba70487720 100644 --- a/settings.gradle +++ b/settings.gradle @@ -249,6 +249,7 @@ include ":kotlin-imports-dumper-compiler-plugin", ":kotlin-gradle-build-metrics", ":kotlin-gradle-plugin", ":kotlin-gradle-plugin-kpm-android", + ":kotlin-gradle-plugin-tcs-android", ":kotlin-gradle-plugin-model", ":kotlin-gradle-plugin-test-utils-embeddable", ":kotlin-gradle-plugin-integration-tests", @@ -754,6 +755,7 @@ project(':kotlin-gradle-statistics').projectDir = "$rootDir/libraries/tools/kotl project(':kotlin-gradle-build-metrics').projectDir = "$rootDir/libraries/tools/kotlin-gradle-build-metrics" as File project(':kotlin-gradle-plugin').projectDir = "$rootDir/libraries/tools/kotlin-gradle-plugin" as File project(':kotlin-gradle-plugin-kpm-android').projectDir = "$rootDir/libraries/tools/kotlin-gradle-plugin-kpm-android" as File +project(':kotlin-gradle-plugin-tcs-android').projectDir = "$rootDir/libraries/tools/kotlin-gradle-plugin-tcs-android" as File project(':kotlin-gradle-plugin-model').projectDir = "$rootDir/libraries/tools/kotlin-gradle-plugin-model" as File project(':kotlin-gradle-plugin-test-utils-embeddable').projectDir = "$rootDir/libraries/tools/kotlin-gradle-plugin-test-utils-embeddable" as File project(':kotlin-gradle-plugin-integration-tests').projectDir = "$rootDir/libraries/tools/kotlin-gradle-plugin-integration-tests" as File