diff --git a/build.gradle.kts b/build.gradle.kts index 070dd1afba7..3743f22c840 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -521,6 +521,7 @@ val gradlePluginProjects = listOf( ":kotlin-gradle-plugin-tcs-android", ":kotlin-allopen", ":kotlin-noarg", + ":kotlin-power-assert", ":kotlin-sam-with-receiver", ":kotlin-parcelize-compiler", ":kotlin-lombok", @@ -880,6 +881,7 @@ tasks { dependsOn(":kotlin-lombok-compiler-plugin:test") dependsOn(":kotlin-noarg-compiler-plugin:test") dependsOn(":kotlin-sam-with-receiver-compiler-plugin:test") + dependsOn(":kotlin-power-assert-compiler-plugin:test") } register("toolsTest") { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts index f0403463ecc..b116c7621fe 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts @@ -37,6 +37,11 @@ dependencies { requireCapability("org.jetbrains.kotlin:kotlin-lombok-common") } } + testImplementation(project(":kotlin-power-assert")) { + capabilities { + requireCapability("org.jetbrains.kotlin:kotlin-power-assert-common") + } + } testImplementation(project(":kotlin-sam-with-receiver")) { capabilities { requireCapability("org.jetbrains.kotlin:kotlin-sam-with-receiver-common") diff --git a/libraries/tools/kotlin-gradle-plugins-bom/build.gradle.kts b/libraries/tools/kotlin-gradle-plugins-bom/build.gradle.kts index 0bce50d7d29..ea65b4ca04d 100644 --- a/libraries/tools/kotlin-gradle-plugins-bom/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugins-bom/build.gradle.kts @@ -20,6 +20,7 @@ dependencies { api(project(":kotlin-allopen")) api(project(":kotlin-lombok")) api(project(":kotlin-noarg")) + api(project(":kotlin-power-assert")) api(project(":kotlin-sam-with-receiver")) api(project(":kotlin-serialization")) api(project(":kotlin-assignment")) diff --git a/libraries/tools/kotlin-power-assert/build.gradle.kts b/libraries/tools/kotlin-power-assert/build.gradle.kts new file mode 100644 index 00000000000..6e59fb6ca5e --- /dev/null +++ b/libraries/tools/kotlin-power-assert/build.gradle.kts @@ -0,0 +1,29 @@ +import org.jetbrains.kotlin.pill.PillExtension + +plugins { + id("gradle-plugin-common-configuration") + id("jps-compatible") +} + +pill { + variant = PillExtension.Variant.FULL +} + +dependencies { + commonApi(platform(project(":kotlin-gradle-plugins-bom"))) + commonApi(project(":kotlin-gradle-plugin-model")) + + commonCompileOnly(project(":compiler")) + commonCompileOnly(project(":kotlin-power-assert-compiler-plugin")) +} + +gradlePlugin { + plugins { + create("powerAssert") { + id = "org.jetbrains.kotlin.plugin.power-assert" + displayName = "Kotlin Power-Assert compiler plugin" + description = displayName + implementationClass = "org.jetbrains.kotlin.powerassert.gradle.PowerAssertGradlePlugin" + } + } +} \ No newline at end of file diff --git a/libraries/tools/kotlin-power-assert/src/common/kotlin/org/jetbrains/kotlin/powerassert/gradle/PowerAssertGradlePlugin.kt b/libraries/tools/kotlin-power-assert/src/common/kotlin/org/jetbrains/kotlin/powerassert/gradle/PowerAssertGradlePlugin.kt index cc6e56b399a..5a310311b41 100644 --- a/libraries/tools/kotlin-power-assert/src/common/kotlin/org/jetbrains/kotlin/powerassert/gradle/PowerAssertGradlePlugin.kt +++ b/libraries/tools/kotlin-power-assert/src/common/kotlin/org/jetbrains/kotlin/powerassert/gradle/PowerAssertGradlePlugin.kt @@ -21,14 +21,17 @@ package org.jetbrains.kotlin.powerassert.gradle import org.gradle.api.Project import org.gradle.api.provider.Provider -import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation -import org.jetbrains.kotlin.gradle.plugin.KotlinCompilerPluginSupportPlugin -import org.jetbrains.kotlin.gradle.plugin.SubpluginArtifact -import org.jetbrains.kotlin.gradle.plugin.SubpluginOption +import org.jetbrains.kotlin.gradle.plugin.* class PowerAssertGradlePlugin : KotlinCompilerPluginSupportPlugin { - override fun apply(target: Project): Unit = with(target) { - extensions.create("kotlinPowerAssert", PowerAssertGradleExtension::class.java) + companion object { + private const val POWER_ASSERT_ARTIFACT_NAME = "kotlin-power-assert-compiler-plugin-embeddable" + + private const val FUNCTION_ARG_NAME = "function" + } + + override fun apply(target: Project) { + target.extensions.create("powerAssert", PowerAssertGradleExtension::class.java) } override fun isApplicable(kotlinCompilation: KotlinCompilation<*>): Boolean { @@ -37,14 +40,6 @@ class PowerAssertGradlePlugin : KotlinCompilerPluginSupportPlugin { return extension.excludedSourceSets.none { it == kotlinCompilation.defaultSourceSet.name } } - override fun getCompilerPluginId(): String = "com.bnorm.kotlin-power-assert" - - override fun getPluginArtifact(): SubpluginArtifact = SubpluginArtifact( - groupId = BuildConfig.PLUGIN_GROUP_ID, - artifactId = BuildConfig.PLUGIN_ARTIFACT_ID, - version = BuildConfig.PLUGIN_VERSION, - ) - override fun applyToCompilation( kotlinCompilation: KotlinCompilation<*>, ): Provider> { @@ -52,8 +47,12 @@ class PowerAssertGradlePlugin : KotlinCompilerPluginSupportPlugin { val extension = project.extensions.getByType(PowerAssertGradleExtension::class.java) return project.provider { extension.functions.map { - SubpluginOption(key = "function", value = it) + SubpluginOption(key = FUNCTION_ARG_NAME, value = it) } } } + + override fun getCompilerPluginId(): String = "org.jetbrains.kotlin.powerassert" + override fun getPluginArtifact(): SubpluginArtifact = + JetBrainsSubpluginArtifact(POWER_ASSERT_ARTIFACT_NAME) } diff --git a/libraries/tools/kotlin-power-assert/src/common/resources/META-INF/services/org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin b/libraries/tools/kotlin-power-assert/src/common/resources/META-INF/services/org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin new file mode 100644 index 00000000000..bce5984ce1b --- /dev/null +++ b/libraries/tools/kotlin-power-assert/src/common/resources/META-INF/services/org.jetbrains.kotlin.gradle.plugin.KotlinGradleSubplugin @@ -0,0 +1 @@ +org.jetbrains.kotlin.powerassert.gradle.PowerAssertGradlePlugin \ No newline at end of file diff --git a/plugins/power-assert/build.gradle.kts b/plugins/power-assert/build.gradle.kts new file mode 100644 index 00000000000..d9c74808e76 --- /dev/null +++ b/plugins/power-assert/build.gradle.kts @@ -0,0 +1,44 @@ +description = "Kotlin Power-Assert Compiler Plugin" + +plugins { + kotlin("jvm") + id("jps-compatible") +} + +dependencies { + embedded(project(":kotlin-power-assert-compiler-plugin.backend")) { isTransitive = false } + embedded(project(":kotlin-power-assert-compiler-plugin.cli")) { isTransitive = false } + + testImplementation(project(":kotlin-power-assert-compiler-plugin.backend")) + + testImplementation(platform(libs.junit.bom)) + testImplementation(libs.junit.jupiter.api) + testRuntimeOnly(libs.junit.jupiter.engine) + testImplementation(projectTests(":compiler:tests-common-new")) + + testRuntimeOnly(commonDependency("org.codehaus.woodstox:stax2-api")) + testRuntimeOnly(commonDependency("com.fasterxml:aalto-xml")) +} + +optInToExperimentalCompilerApi() + +sourceSets { + "main" { none() } + "test" { + projectDefault() + generatedTestDir() + } +} + +publish() + +runtimeJar() +sourcesJar() +javadocJar() +testsJar() + +projectTest(parallel = true) { + dependsOn(":dist") + workingDir = rootDir + useJUnitPlatform() +} diff --git a/plugins/power-assert/power-assert.backend/build.gradle.kts b/plugins/power-assert/power-assert.backend/build.gradle.kts new file mode 100644 index 00000000000..ba2d388cab3 --- /dev/null +++ b/plugins/power-assert/power-assert.backend/build.gradle.kts @@ -0,0 +1,24 @@ +description = "Kotlin Power-Assert Compiler Plugin (Backend)" + +plugins { + kotlin("jvm") + id("jps-compatible") +} + +dependencies { + compileOnly(project(":compiler:backend")) + compileOnly(project(":compiler:ir.backend.common")) + compileOnly(project(":compiler:ir.tree")) + compileOnly(project(":compiler:cli")) +} + +optInToUnsafeDuringIrConstructionAPI() + +sourceSets { + "main" { projectDefault() } + "test" { none() } +} + +runtimeJar() +javadocJar() +sourcesJar() diff --git a/plugins/power-assert/power-assert.backend/src/org/jetbrains/kotlin/powerassert/PowerAssertCallTransformer.kt b/plugins/power-assert/power-assert.backend/src/org/jetbrains/kotlin/powerassert/PowerAssertCallTransformer.kt index f30d31e50da..e6c471a70a4 100644 --- a/plugins/power-assert/power-assert.backend/src/org/jetbrains/kotlin/powerassert/PowerAssertCallTransformer.kt +++ b/plugins/power-assert/power-assert.backend/src/org/jetbrains/kotlin/powerassert/PowerAssertCallTransformer.kt @@ -26,7 +26,6 @@ import org.jetbrains.kotlin.backend.jvm.ir.parentClassId import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.ir.IrElement -import org.jetbrains.kotlin.ir.backend.js.utils.asString import org.jetbrains.kotlin.ir.builders.irCall import org.jetbrains.kotlin.ir.builders.irString import org.jetbrains.kotlin.ir.builders.parent @@ -36,12 +35,7 @@ import org.jetbrains.kotlin.ir.declarations.IrValueParameter import org.jetbrains.kotlin.ir.expressions.* import org.jetbrains.kotlin.ir.symbols.IrTypeParameterSymbol import org.jetbrains.kotlin.ir.types.* -import org.jetbrains.kotlin.ir.util.classId -import org.jetbrains.kotlin.ir.util.deepCopyWithSymbols -import org.jetbrains.kotlin.ir.util.functions -import org.jetbrains.kotlin.ir.util.isFileClass -import org.jetbrains.kotlin.ir.util.isFunctionOrKFunction -import org.jetbrains.kotlin.ir.util.kotlinFqName +import org.jetbrains.kotlin.ir.util.* import org.jetbrains.kotlin.name.CallableId import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName @@ -72,8 +66,8 @@ class PowerAssertCallTransformer( val delegate = delegates.maxByOrNull { it.function.valueParameters.size } if (delegate == null) { val valueTypesTruncated = function.valueParameters.subList(0, function.valueParameters.size - 1) - .joinToString("") { it.type.asString() + ", " } - val valueTypesAll = function.valueParameters.joinToString("") { it.type.asString() + ", " } + .joinToString("") { it.type.render() + ", " } + val valueTypesAll = function.valueParameters.joinToString("") { it.type.render() + ", " } messageCollector.warn( expression = expression, message = """ diff --git a/plugins/power-assert/power-assert.backend/src/org/jetbrains/kotlin/powerassert/diagram/ExpressionTree.kt b/plugins/power-assert/power-assert.backend/src/org/jetbrains/kotlin/powerassert/diagram/ExpressionTree.kt index 8cb67d38232..5e5fe734325 100644 --- a/plugins/power-assert/power-assert.backend/src/org/jetbrains/kotlin/powerassert/diagram/ExpressionTree.kt +++ b/plugins/power-assert/power-assert.backend/src/org/jetbrains/kotlin/powerassert/diagram/ExpressionTree.kt @@ -84,7 +84,7 @@ fun buildTree(expression: IrExpression): Node? { } override fun visitContainerExpression(expression: IrContainerExpression, data: Node) { - if (expression.origin is IrStatementOrigin.SAFE_CALL) { + if (expression.origin == IrStatementOrigin.SAFE_CALL) { // Null safe expressions can be correctly navigated super.visitContainerExpression(expression, data) } else { diff --git a/plugins/power-assert/power-assert.cli/build.gradle.kts b/plugins/power-assert/power-assert.cli/build.gradle.kts new file mode 100644 index 00000000000..21e0dc65657 --- /dev/null +++ b/plugins/power-assert/power-assert.cli/build.gradle.kts @@ -0,0 +1,23 @@ +description = "Kotlin Power-Assert Compiler Plugin (CLI)" + +plugins { + kotlin("jvm") + id("jps-compatible") +} + +dependencies { + compileOnly(project(":compiler:cli")) + + implementation(project(":kotlin-power-assert-compiler-plugin.backend")) +} + +optInToExperimentalCompilerApi() + +sourceSets { + "main" { projectDefault() } + "test" { none() } +} + +runtimeJar() +sourcesJar() +javadocJar() diff --git a/plugins/power-assert/power-assert.cli/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor b/plugins/power-assert/power-assert.cli/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor new file mode 100644 index 00000000000..695cff35989 --- /dev/null +++ b/plugins/power-assert/power-assert.cli/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor @@ -0,0 +1 @@ +org.jetbrains.kotlin.powerassert.PowerAssertCommandLineProcessor \ No newline at end of file diff --git a/plugins/power-assert/power-assert.cli/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar b/plugins/power-assert/power-assert.cli/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar new file mode 100644 index 00000000000..438dd6a2c91 --- /dev/null +++ b/plugins/power-assert/power-assert.cli/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar @@ -0,0 +1 @@ +org.jetbrains.kotlin.powerassert.PowerAssertCompilerPluginRegistrar \ No newline at end of file diff --git a/plugins/power-assert/power-assert.cli/src/org/jetbrains/kotlin/powerassert/PowerAssertCommandLineProcessor.kt b/plugins/power-assert/power-assert.cli/src/org/jetbrains/kotlin/powerassert/PowerAssertCommandLineProcessor.kt index 1b9295cf633..43fd07c0652 100644 --- a/plugins/power-assert/power-assert.cli/src/org/jetbrains/kotlin/powerassert/PowerAssertCommandLineProcessor.kt +++ b/plugins/power-assert/power-assert.cli/src/org/jetbrains/kotlin/powerassert/PowerAssertCommandLineProcessor.kt @@ -19,15 +19,13 @@ package org.jetbrains.kotlin.powerassert -import com.google.auto.service.AutoService import org.jetbrains.kotlin.compiler.plugin.AbstractCliOption import org.jetbrains.kotlin.compiler.plugin.CliOption import org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor import org.jetbrains.kotlin.config.CompilerConfiguration -@AutoService(CommandLineProcessor::class) class PowerAssertCommandLineProcessor : CommandLineProcessor { - override val pluginId: String = "com.bnorm.kotlin-power-assert" + override val pluginId: String = "org.jetbrains.kotlin.powerassert" override val pluginOptions: Collection = listOf( CliOption( diff --git a/plugins/power-assert/power-assert.cli/src/org/jetbrains/kotlin/powerassert/PowerAssertCompilerPluginRegistrar.kt b/plugins/power-assert/power-assert.cli/src/org/jetbrains/kotlin/powerassert/PowerAssertCompilerPluginRegistrar.kt index 86ea7ae2209..fe7b31a5d17 100644 --- a/plugins/power-assert/power-assert.cli/src/org/jetbrains/kotlin/powerassert/PowerAssertCompilerPluginRegistrar.kt +++ b/plugins/power-assert/power-assert.cli/src/org/jetbrains/kotlin/powerassert/PowerAssertCompilerPluginRegistrar.kt @@ -19,7 +19,6 @@ package org.jetbrains.kotlin.powerassert -import com.google.auto.service.AutoService import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys import org.jetbrains.kotlin.cli.common.messages.MessageCollector @@ -30,7 +29,6 @@ import org.jetbrains.kotlin.name.FqName val KEY_FUNCTIONS = CompilerConfigurationKey>("fully-qualified function names") -@AutoService(CompilerPluginRegistrar::class) class PowerAssertCompilerPluginRegistrar( private val functions: Set, ) : CompilerPluginRegistrar() { diff --git a/plugins/power-assert/power-assert.embeddable/build.gradle.kts b/plugins/power-assert/power-assert.embeddable/build.gradle.kts new file mode 100644 index 00000000000..b13aecaed12 --- /dev/null +++ b/plugins/power-assert/power-assert.embeddable/build.gradle.kts @@ -0,0 +1,19 @@ +plugins { + id("org.jetbrains.kotlin.jvm") +} + +dependencies { + embedded(project(":kotlin-power-assert-compiler-plugin")) { isTransitive = false } +} + +publish { + artifactId = artifactId.replace(".", "-") +} + +runtimeJar(rewriteDefaultJarDepsToShadedCompiler()) +sourcesJarWithSourcesFromEmbedded( + project(":kotlin-power-assert-compiler-plugin").tasks.named("sourcesJar") +) +javadocJarWithJavadocFromEmbedded( + project(":kotlin-power-assert-compiler-plugin").tasks.named("javadocJar") +) diff --git a/prepare/compiler/build.gradle.kts b/prepare/compiler/build.gradle.kts index 9a8da36da27..24effd8e2e4 100644 --- a/prepare/compiler/build.gradle.kts +++ b/prepare/compiler/build.gradle.kts @@ -121,6 +121,7 @@ val distCompilerPluginProjects = listOf( ":plugins:parcelize:parcelize-compiler", ":plugins:parcelize:parcelize-runtime", ":kotlin-noarg-compiler-plugin", + ":kotlin-power-assert-compiler-plugin", ":kotlin-sam-with-receiver-compiler-plugin", ":kotlinx-serialization-compiler-plugin", ":kotlin-lombok-compiler-plugin", diff --git a/repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/kotlin-gradle-plugins-bom/kotlin-gradle-plugins-bom.pom b/repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/kotlin-gradle-plugins-bom/kotlin-gradle-plugins-bom.pom index a0801eadfbf..d3e169b1829 100644 --- a/repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/kotlin-gradle-plugins-bom/kotlin-gradle-plugins-bom.pom +++ b/repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/kotlin-gradle-plugins-bom/kotlin-gradle-plugins-bom.pom @@ -84,6 +84,11 @@ kotlin-noarg ArtifactsTest.version + + org.jetbrains.kotlin + kotlin-power-assert + ArtifactsTest.version + org.jetbrains.kotlin kotlin-sam-with-receiver diff --git a/repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/kotlin-power-assert-compiler-plugin-embeddable/kotlin-power-assert-compiler-plugin-embeddable.pom b/repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/kotlin-power-assert-compiler-plugin-embeddable/kotlin-power-assert-compiler-plugin-embeddable.pom new file mode 100644 index 00000000000..6b792f53265 --- /dev/null +++ b/repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/kotlin-power-assert-compiler-plugin-embeddable/kotlin-power-assert-compiler-plugin-embeddable.pom @@ -0,0 +1,28 @@ + + + 4.0.0 + org.jetbrains.kotlin + kotlin-power-assert-compiler-plugin-embeddable + ArtifactsTest.version + Kotlin Power Assert Compiler Plugin.embeddable + Kotlin Power Assert Compiler Plugin.embeddable + https://kotlinlang.org/ + + + The Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + + Kotlin Team + JetBrains + https://www.jetbrains.com + + + + scm:git:https://github.com/JetBrains/kotlin.git + scm:git:https://github.com/JetBrains/kotlin.git + https://github.com/JetBrains/kotlin + + diff --git a/repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/kotlin-power-assert-compiler-plugin/kotlin-power-assert-compiler-plugin.pom b/repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/kotlin-power-assert-compiler-plugin/kotlin-power-assert-compiler-plugin.pom new file mode 100644 index 00000000000..53bdcae1e9d --- /dev/null +++ b/repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/kotlin-power-assert-compiler-plugin/kotlin-power-assert-compiler-plugin.pom @@ -0,0 +1,28 @@ + + + 4.0.0 + org.jetbrains.kotlin + kotlin-power-assert-compiler-plugin + ArtifactsTest.version + Kotlin Power Assert Compiler Plugin + Kotlin Power-Assert Compiler Plugin + https://kotlinlang.org/ + + + The Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + + Kotlin Team + JetBrains + https://www.jetbrains.com + + + + scm:git:https://github.com/JetBrains/kotlin.git + scm:git:https://github.com/JetBrains/kotlin.git + https://github.com/JetBrains/kotlin + + diff --git a/repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/kotlin-power-assert/kotlin-power-assert.pom b/repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/kotlin-power-assert/kotlin-power-assert.pom new file mode 100644 index 00000000000..3443c0c00f6 --- /dev/null +++ b/repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/kotlin-power-assert/kotlin-power-assert.pom @@ -0,0 +1,374 @@ + + + + + + + + 4.0.0 + org.jetbrains.kotlin + kotlin-power-assert + ArtifactsTest.version + Kotlin Power Assert + Kotlin Power Assert + https://kotlinlang.org/ + + + The Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + + Kotlin Team + JetBrains + https://www.jetbrains.com + + + + scm:git:https://github.com/JetBrains/kotlin.git + scm:git:https://github.com/JetBrains/kotlin.git + https://github.com/JetBrains/kotlin + + + + + org.jetbrains.kotlin + kotlin-gradle-plugins-bom + ArtifactsTest.version + pom + import + + + + + + org.jetbrains.kotlin + kotlin-gradle-plugin-api + ArtifactsTest.version + compile + + + org.jetbrains.kotlin + kotlin-reflect + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + + + org.jetbrains.kotlin + kotlin-stdlib-jdk7 + + + org.jetbrains.kotlin + kotlin-stdlib + + + org.jetbrains.kotlin + kotlin-script-runtime + + + org.jetbrains.kotlin + kotlin-stdlib-common + + + + + org.jetbrains.kotlin + kotlin-gradle-plugin-model + ArtifactsTest.version + compile + + + org.jetbrains.kotlin + kotlin-reflect + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + + + org.jetbrains.kotlin + kotlin-stdlib-jdk7 + + + org.jetbrains.kotlin + kotlin-stdlib + + + org.jetbrains.kotlin + kotlin-script-runtime + + + org.jetbrains.kotlin + kotlin-stdlib-common + + + + + org.jetbrains.kotlin + kotlin-gradle-plugin-api + ArtifactsTest.version + compile + + + org.jetbrains.kotlin + kotlin-reflect + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + + + org.jetbrains.kotlin + kotlin-stdlib-jdk7 + + + org.jetbrains.kotlin + kotlin-stdlib + + + org.jetbrains.kotlin + kotlin-script-runtime + + + org.jetbrains.kotlin + kotlin-stdlib-common + + + true + + + org.jetbrains.kotlin + kotlin-gradle-plugin-api + ArtifactsTest.version + compile + + + org.jetbrains.kotlin + kotlin-reflect + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + + + org.jetbrains.kotlin + kotlin-stdlib-jdk7 + + + org.jetbrains.kotlin + kotlin-stdlib + + + org.jetbrains.kotlin + kotlin-script-runtime + + + org.jetbrains.kotlin + kotlin-stdlib-common + + + true + + + org.jetbrains.kotlin + kotlin-gradle-plugin-api + ArtifactsTest.version + compile + + + org.jetbrains.kotlin + kotlin-reflect + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + + + org.jetbrains.kotlin + kotlin-stdlib-jdk7 + + + org.jetbrains.kotlin + kotlin-stdlib + + + org.jetbrains.kotlin + kotlin-script-runtime + + + org.jetbrains.kotlin + kotlin-stdlib-common + + + true + + + org.jetbrains.kotlin + kotlin-gradle-plugin-api + ArtifactsTest.version + compile + + + org.jetbrains.kotlin + kotlin-reflect + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + + + org.jetbrains.kotlin + kotlin-stdlib-jdk7 + + + org.jetbrains.kotlin + kotlin-stdlib + + + org.jetbrains.kotlin + kotlin-script-runtime + + + org.jetbrains.kotlin + kotlin-stdlib-common + + + true + + + org.jetbrains.kotlin + kotlin-gradle-plugin-api + ArtifactsTest.version + compile + + + org.jetbrains.kotlin + kotlin-reflect + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + + + org.jetbrains.kotlin + kotlin-stdlib-jdk7 + + + org.jetbrains.kotlin + kotlin-stdlib + + + org.jetbrains.kotlin + kotlin-script-runtime + + + org.jetbrains.kotlin + kotlin-stdlib-common + + + true + + + org.jetbrains.kotlin + kotlin-gradle-plugin-api + ArtifactsTest.version + compile + + + org.jetbrains.kotlin + kotlin-reflect + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + + + org.jetbrains.kotlin + kotlin-stdlib-jdk7 + + + org.jetbrains.kotlin + kotlin-stdlib + + + org.jetbrains.kotlin + kotlin-script-runtime + + + org.jetbrains.kotlin + kotlin-stdlib-common + + + true + + + org.jetbrains.kotlin + kotlin-gradle-plugin-api + ArtifactsTest.version + compile + + + org.jetbrains.kotlin + kotlin-reflect + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + + + org.jetbrains.kotlin + kotlin-stdlib-jdk7 + + + org.jetbrains.kotlin + kotlin-stdlib + + + org.jetbrains.kotlin + kotlin-script-runtime + + + org.jetbrains.kotlin + kotlin-stdlib-common + + + true + + + org.jetbrains.kotlin + kotlin-gradle-plugin-api + ArtifactsTest.version + compile + + + org.jetbrains.kotlin + kotlin-reflect + + + org.jetbrains.kotlin + kotlin-stdlib-jdk8 + + + org.jetbrains.kotlin + kotlin-stdlib-jdk7 + + + org.jetbrains.kotlin + kotlin-stdlib + + + org.jetbrains.kotlin + kotlin-script-runtime + + + org.jetbrains.kotlin + kotlin-stdlib-common + + + true + + + diff --git a/repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/plugin/power-assert/org.jetbrains.kotlin.plugin.power-assert.gradle.plugin/org.jetbrains.kotlin.plugin.power-assert.gradle.plugin.pom b/repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/plugin/power-assert/org.jetbrains.kotlin.plugin.power-assert.gradle.plugin/org.jetbrains.kotlin.plugin.power-assert.gradle.plugin.pom new file mode 100644 index 00000000000..d785a4013d5 --- /dev/null +++ b/repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/plugin/power-assert/org.jetbrains.kotlin.plugin.power-assert.gradle.plugin/org.jetbrains.kotlin.plugin.power-assert.gradle.plugin.pom @@ -0,0 +1,36 @@ + + + 4.0.0 + org.jetbrains.kotlin.plugin.power-assert + org.jetbrains.kotlin.plugin.power-assert.gradle.plugin + ArtifactsTest.version + pom + Kotlin Power-Assert compiler plugin + Kotlin Power-Assert compiler plugin + https://kotlinlang.org/ + + + The Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + + Kotlin Team + JetBrains + https://www.jetbrains.com + + + + scm:git:https://github.com/JetBrains/kotlin.git + scm:git:https://github.com/JetBrains/kotlin.git + https://github.com/JetBrains/kotlin + + + + org.jetbrains.kotlin + kotlin-power-assert + ArtifactsTest.version + + + diff --git a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/tasks.kt b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/tasks.kt index 3d69cc086d7..5e2c93289a8 100644 --- a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/tasks.kt +++ b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/tasks.kt @@ -32,6 +32,7 @@ val kotlinGradlePluginAndItsRequired = arrayOf( ":kotlin-assignment", ":kotlin-allopen", ":kotlin-noarg", + ":kotlin-power-assert", ":kotlin-sam-with-receiver", ":kotlin-lombok", ":kotlin-serialization", @@ -67,6 +68,7 @@ val kotlinGradlePluginAndItsRequired = arrayOf( ":kotlin-assignment-compiler-plugin.embeddable", ":kotlin-allopen-compiler-plugin.embeddable", ":kotlin-noarg-compiler-plugin.embeddable", + ":kotlin-power-assert-compiler-plugin.embeddable", ":kotlin-sam-with-receiver-compiler-plugin.embeddable", ":kotlin-lombok-compiler-plugin.embeddable", ":kotlinx-serialization-compiler-plugin.embeddable", diff --git a/settings.gradle b/settings.gradle index 7bd71f2589d..34599899880 100644 --- a/settings.gradle +++ b/settings.gradle @@ -154,6 +154,11 @@ include ":kotlin-noarg-compiler-plugin", ":kotlin-noarg-compiler-plugin.backend", ":kotlin-noarg-compiler-plugin.cli" +include ":kotlin-power-assert-compiler-plugin", + ":kotlin-power-assert-compiler-plugin.embeddable", + ":kotlin-power-assert-compiler-plugin.backend", + ":kotlin-power-assert-compiler-plugin.cli" + include ":kotlin-sam-with-receiver-compiler-plugin", ":kotlin-sam-with-receiver-compiler-plugin.embeddable", ":kotlin-sam-with-receiver-compiler-plugin.common", @@ -222,6 +227,7 @@ include ":kotlin-imports-dumper-compiler-plugin", ":kotlin-tooling-core", ":kotlin-allopen", ":kotlin-noarg", + ":kotlin-power-assert", ":kotlin-sam-with-receiver", ":kotlin-assignment", ":kotlin-gradle-subplugin-example", @@ -734,6 +740,11 @@ project(':kotlin-noarg-compiler-plugin.k2').projectDir = "$rootDir/plugins/noarg project(':kotlin-noarg-compiler-plugin.backend').projectDir = "$rootDir/plugins/noarg/noarg.backend" as File project(':kotlin-noarg-compiler-plugin.cli').projectDir = "$rootDir/plugins/noarg/noarg.cli" as File +project(':kotlin-power-assert-compiler-plugin').projectDir = "$rootDir/plugins/power-assert" as File +project(':kotlin-power-assert-compiler-plugin.embeddable').projectDir = "$rootDir/plugins/power-assert/power-assert.embeddable" as File +project(':kotlin-power-assert-compiler-plugin.backend').projectDir = "$rootDir/plugins/power-assert/power-assert.backend" as File +project(':kotlin-power-assert-compiler-plugin.cli').projectDir = "$rootDir/plugins/power-assert/power-assert.cli" as File + project(':kotlin-sam-with-receiver-compiler-plugin').projectDir = "$rootDir/plugins/sam-with-receiver" as File project(':kotlin-sam-with-receiver-compiler-plugin.embeddable').projectDir = "$rootDir/plugins/sam-with-receiver/sam-with-receiver.embeddable" as File project(':kotlin-sam-with-receiver-compiler-plugin.common').projectDir = "$rootDir/plugins/sam-with-receiver/sam-with-receiver.common" as File @@ -775,6 +786,7 @@ project(':kotlin-tooling-metadata').projectDir = "$rootDir/libraries/tools/kotli project(':kotlin-tooling-core').projectDir = "$rootDir/libraries/tools/kotlin-tooling-core" as File project(':kotlin-allopen').projectDir = "$rootDir/libraries/tools/kotlin-allopen" as File project(':kotlin-noarg').projectDir = "$rootDir/libraries/tools/kotlin-noarg" as File +project(':kotlin-power-assert').projectDir = "$rootDir/libraries/tools/kotlin-power-assert" as File project(':kotlin-sam-with-receiver').projectDir = "$rootDir/libraries/tools/kotlin-sam-with-receiver" as File project(':kotlin-assignment').projectDir = "$rootDir/libraries/tools/kotlin-assignment" as File project(':kotlin-lombok').projectDir = "$rootDir/libraries/tools/kotlin-lombok" as File