Publish atomicfu compiler plugin separately
- rename plugin into 'kotlin-atomicfu-compiler-plugin' - add 'kotlin-atomicfu-compiler-plugin-embeddable' to be used with 'kotlin-comiler-embeddable' ^KT-52811 In Progress
This commit is contained in:
committed by
Space Team
parent
8ad67faa60
commit
64f8b87b66
+1
-1
@@ -754,7 +754,7 @@ tasks {
|
|||||||
register("compilerPluginTest") {
|
register("compilerPluginTest") {
|
||||||
dependsOn(":kotlin-allopen-compiler-plugin:test")
|
dependsOn(":kotlin-allopen-compiler-plugin:test")
|
||||||
dependsOn(":kotlin-assignment-compiler-plugin:test")
|
dependsOn(":kotlin-assignment-compiler-plugin:test")
|
||||||
dependsOn(":kotlinx-atomicfu-compiler-plugin:test")
|
dependsOn(":kotlin-atomicfu-compiler-plugin:test")
|
||||||
dependsOn(":plugins:fir-plugin-prototype:test")
|
dependsOn(":plugins:fir-plugin-prototype:test")
|
||||||
dependsOn(":plugins:fir-plugin-prototype:fir-plugin-ic-test:test")
|
dependsOn(":plugins:fir-plugin-prototype:fir-plugin-ic-test:test")
|
||||||
dependsOn(":kotlin-imports-dumper-compiler-plugin:test")
|
dependsOn(":kotlin-imports-dumper-compiler-plugin:test")
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ dependencies {
|
|||||||
testApi(projectTests(":kotlin-sam-with-receiver-compiler-plugin"))
|
testApi(projectTests(":kotlin-sam-with-receiver-compiler-plugin"))
|
||||||
testApi(projectTests(":kotlin-assignment-compiler-plugin"))
|
testApi(projectTests(":kotlin-assignment-compiler-plugin"))
|
||||||
testApi(projectTests(":kotlinx-serialization-compiler-plugin"))
|
testApi(projectTests(":kotlinx-serialization-compiler-plugin"))
|
||||||
testApi(projectTests(":kotlinx-atomicfu-compiler-plugin"))
|
testApi(projectTests(":kotlin-atomicfu-compiler-plugin"))
|
||||||
testApi(projectTests(":plugins:fir-plugin-prototype"))
|
testApi(projectTests(":plugins:fir-plugin-prototype"))
|
||||||
testApi(projectTests(":plugins:fir-plugin-prototype:fir-plugin-ic-test"))
|
testApi(projectTests(":plugins:fir-plugin-prototype:fir-plugin-ic-test"))
|
||||||
testApi(projectTests(":generators:test-generator"))
|
testApi(projectTests(":generators:test-generator"))
|
||||||
|
|||||||
@@ -14,8 +14,6 @@ dependencies {
|
|||||||
|
|
||||||
compileOnly(project(":kotlin-gradle-plugin"))
|
compileOnly(project(":kotlin-gradle-plugin"))
|
||||||
compileOnly(project(":kotlin-compiler-embeddable"))
|
compileOnly(project(":kotlin-compiler-embeddable"))
|
||||||
|
|
||||||
embedded(project(":kotlinx-atomicfu-compiler-plugin")) { isTransitive = false }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
gradlePlugin {
|
gradlePlugin {
|
||||||
|
|||||||
+1
-2
@@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlinx.atomicfu.gradle
|
package org.jetbrains.kotlinx.atomicfu.gradle
|
||||||
|
|
||||||
import org.gradle.api.GradleException
|
|
||||||
import org.gradle.api.Project
|
import org.gradle.api.Project
|
||||||
import org.gradle.api.provider.Provider
|
import org.gradle.api.provider.Provider
|
||||||
import org.jetbrains.kotlin.gradle.plugin.*
|
import org.jetbrains.kotlin.gradle.plugin.*
|
||||||
@@ -26,7 +25,7 @@ private const val EXTENSION_NAME = "atomicfuCompilerPlugin"
|
|||||||
class AtomicfuKotlinGradleSubplugin :
|
class AtomicfuKotlinGradleSubplugin :
|
||||||
KotlinCompilerPluginSupportPlugin {
|
KotlinCompilerPluginSupportPlugin {
|
||||||
companion object {
|
companion object {
|
||||||
const val ATOMICFU_ARTIFACT_NAME = "atomicfu"
|
const val ATOMICFU_ARTIFACT_NAME = "kotlin-atomicfu-compiler-plugin-embeddable"
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun apply(target: Project) {
|
override fun apply(target: Project) {
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
plugins {
|
||||||
|
id("org.jetbrains.kotlin.jvm")
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
embedded(project(":kotlin-atomicfu-compiler-plugin")) { isTransitive = false }
|
||||||
|
}
|
||||||
|
|
||||||
|
publish()
|
||||||
|
|
||||||
|
runtimeJar(rewriteDefaultJarDepsToShadedCompiler())
|
||||||
|
sourcesJarWithSourcesFromEmbedded(
|
||||||
|
project(":kotlin-atomicfu-compiler-plugin").tasks.named<Jar>("sourcesJar")
|
||||||
|
)
|
||||||
|
javadocJarWithJavadocFromEmbedded(
|
||||||
|
project(":kotlin-atomicfu-compiler-plugin").tasks.named<Jar>("javadocJar")
|
||||||
|
)
|
||||||
@@ -100,9 +100,6 @@ sourceSets {
|
|||||||
|
|
||||||
optInToExperimentalCompilerApi()
|
optInToExperimentalCompilerApi()
|
||||||
|
|
||||||
runtimeJar()
|
|
||||||
sourcesJar()
|
|
||||||
javadocJar()
|
|
||||||
testsJar()
|
testsJar()
|
||||||
useD8Plugin()
|
useD8Plugin()
|
||||||
|
|
||||||
@@ -125,3 +122,6 @@ projectTest(jUnitMode = JUnitMode.JUnit5) {
|
|||||||
systemProperty("atomicfuJvm.classpath", localAtomicfuJvmClasspath.asPath)
|
systemProperty("atomicfuJvm.classpath", localAtomicfuJvmClasspath.asPath)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
publish()
|
||||||
|
standardPublicJars()
|
||||||
|
|||||||
+4
-2
@@ -261,7 +261,8 @@ include ":kotlin-imports-dumper-compiler-plugin",
|
|||||||
":wasm:wasm.config",
|
":wasm:wasm.config",
|
||||||
":repo:codebase-tests"
|
":repo:codebase-tests"
|
||||||
|
|
||||||
include ":kotlinx-atomicfu-compiler-plugin",
|
include ":kotlin-atomicfu-compiler-plugin",
|
||||||
|
":kotlin-atomicfu-compiler-plugin-embeddable",
|
||||||
":kotlinx-atomicfu-runtime",
|
":kotlinx-atomicfu-runtime",
|
||||||
":atomicfu"
|
":atomicfu"
|
||||||
|
|
||||||
@@ -782,7 +783,8 @@ project(':kotlinx-serialization-compiler-plugin.common').projectDir = "$rootDir/
|
|||||||
project(':kotlin-serialization').projectDir = file("$rootDir/libraries/tools/kotlin-serialization")
|
project(':kotlin-serialization').projectDir = file("$rootDir/libraries/tools/kotlin-serialization")
|
||||||
project(':kotlin-serialization-unshaded').projectDir = file("$rootDir/libraries/tools/kotlin-serialization-unshaded")
|
project(':kotlin-serialization-unshaded').projectDir = file("$rootDir/libraries/tools/kotlin-serialization-unshaded")
|
||||||
|
|
||||||
project(':kotlinx-atomicfu-compiler-plugin').projectDir = file("$rootDir/plugins/atomicfu/atomicfu-compiler")
|
project(':kotlin-atomicfu-compiler-plugin').projectDir = file("$rootDir/plugins/atomicfu/atomicfu-compiler")
|
||||||
|
project(':kotlin-atomicfu-compiler-plugin-embeddable').projectDir = file("$rootDir/plugins/atomicfu/atomicfu-compiler-embeddable")
|
||||||
project(':kotlinx-atomicfu-runtime').projectDir = file("$rootDir/plugins/atomicfu/atomicfu-runtime")
|
project(':kotlinx-atomicfu-runtime').projectDir = file("$rootDir/plugins/atomicfu/atomicfu-runtime")
|
||||||
project(':atomicfu').projectDir = file("$rootDir/libraries/tools/atomicfu")
|
project(':atomicfu').projectDir = file("$rootDir/libraries/tools/atomicfu")
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user