azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Publish :compiler:test-infrastructure for ide

Browse Source
This commit is contained in:
Nikita Bobko
2021-05-07 19:59:04 +02:00
parent c2a46baa77
commit bee8c0bb90
7 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle.kts
+1
View File
@@ -968,6 +968,7 @@ tasks {
":prepare:ide-plugin-dependencies:compiler-components-for-jps:publish", ":prepare:ide-plugin-dependencies:compiler-components-for-jps:publish",
":prepare:ide-plugin-dependencies:parcelize-compiler-plugin-for-ide:publish", ":prepare:ide-plugin-dependencies:parcelize-compiler-plugin-for-ide:publish",
":prepare:ide-plugin-dependencies:lombok-compiler-plugin-for-ide:publish", ":prepare:ide-plugin-dependencies:lombok-compiler-plugin-for-ide:publish",
":prepare:ide-plugin-dependencies:kotlin-compiler-tests-for-ide:publish",
":kotlin-script-runtime:publish", ":kotlin-script-runtime:publish",
":kotlin-script-util:publish", ":kotlin-script-util:publish",
":kotlin-scripting-common:publish", ":kotlin-scripting-common:publish",
buildSrc/src/main/kotlin/artifacts.kt
+5 -3
View File
@@ -274,13 +274,15 @@ fun Project.publishProjectJars(projects: List<String>, libraryDependencies: List
javadocJar() javadocJar()
} }
fun Project.publishTestJar(projectName: String) { fun Project.publishTestJar(projects: List<String>) {
apply<JavaPlugin>() apply<JavaPlugin>()
val fatJarContents by configurations.creating val fatJarContents by configurations.creating
dependencies { dependencies {
fatJarContents(project(projectName, configuration = "tests-jar")) { isTransitive = false } for (projectName in projects) {
fatJarContents(project(projectName, configuration = "tests-jar")) { isTransitive = false }
}
} }
publish() publish()
@@ -297,7 +299,7 @@ fun Project.publishTestJar(projectName: String) {
sourcesJar { sourcesJar {
from { from {
project(projectName).testSourceSet.allSource projects.map { project(it).testSourceSet.allSource }
} }
} }
prepare/ide-plugin-dependencies/allopen-compiler-plugin-tests-for-ide/build.gradle.kts
+1 -1
View File
@@ -1,3 +1,3 @@
idePluginDependency { idePluginDependency {
publishTestJar(":compiler:incremental-compilation-impl") publishTestJar(listOf(":compiler:incremental-compilation-impl"))
} }
prepare/ide-plugin-dependencies/incremental-compilation-impl-tests-for-ide/build.gradle.kts
+1 -1
View File
@@ -1,3 +1,3 @@
idePluginDependency { idePluginDependency {
publishTestJar(":compiler:incremental-compilation-impl") publishTestJar(listOf(":compiler:incremental-compilation-impl"))
} }
prepare/ide-plugin-dependencies/kotlin-build-common-tests-for-ide/build.gradle.kts
+1 -1
View File
@@ -1,3 +1,3 @@
idePluginDependency { idePluginDependency {
publishTestJar(":kotlin-build-common") publishTestJar(listOf(":kotlin-build-common"))
} }
prepare/ide-plugin-dependencies/kotlin-compiler-tests-for-ide/build.gradle.kts
+3
View File
@@ -0,0 +1,3 @@
idePluginDependency {
publishTestJar(listOf(":compiler:test-infrastructure", ":compiler:tests-common-new", ":compiler:test-infrastructure-utils"))
}
settings.gradle
+2 -1
View File
@@ -369,7 +369,8 @@ include ":prepare:ide-plugin-dependencies:android-extensions-compiler-plugin-for
":prepare:ide-plugin-dependencies:parcelize-compiler-plugin-for-ide", ":prepare:ide-plugin-dependencies:parcelize-compiler-plugin-for-ide",
":prepare:ide-plugin-dependencies:lombok-compiler-plugin-for-ide", ":prepare:ide-plugin-dependencies:lombok-compiler-plugin-for-ide",
":prepare:ide-plugin-dependencies:tests-common-tests-for-ide", ":prepare:ide-plugin-dependencies:tests-common-tests-for-ide",
":prepare:ide-plugin-dependencies:compiler-components-for-jps" ":prepare:ide-plugin-dependencies:compiler-components-for-jps",
":prepare:ide-plugin-dependencies:kotlin-compiler-tests-for-ide"
if (buildProperties.includeCidrPlugins) { if (buildProperties.includeCidrPlugins) {
logger.info("Including CIDR modules in settings.gradle") logger.info("Including CIDR modules in settings.gradle")