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

Change kotlin-assignment plugin to use published compiler plugin

Browse Source 
^KT-52811 In Progress
This commit is contained in:
Yahor Berdnikau
2023-03-20 17:43:03 +01:00
committed by Space Team
parent 1ccd7afde7
commit 5e41cbda75
3 changed files with 9 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-assignment/build.gradle.kts
-2
View File
@@ -16,8 +16,6 @@ dependencies {
commonCompileOnly(project(":compiler"))
commonCompileOnly(project(":kotlin-assignment-compiler-plugin"))
embedded(project(":kotlin-assignment-compiler-plugin")) { isTransitive = false }
testImplementation(commonDependency("junit"))
}
libraries/tools/kotlin-assignment/src/common/kotlin/org/jetbrains/kotlin/assignment/plugin/gradle/AssignmentSubplugin.kt
+1 -1
View File
@@ -18,7 +18,7 @@ class AssignmentSubplugin
) : KotlinCompilerPluginSupportPlugin {
companion object {
const val COMPILER_PLUGIN_ARTIFACT_NAME = "kotlin-assignment"
const val COMPILER_PLUGIN_ARTIFACT_NAME = "kotlin-assignment-compiler-plugin-embeddable"
const val COMPILER_PLUGIN_ID = "org.jetbrains.kotlin.assignment"
private const val ANNOTATION_ARG_NAME = "annotation"
}
plugins/assign-plugin/assign-plugin.embeddable/build.gradle.kts
+8 -24
View File
@@ -1,5 +1,3 @@
import org.gradle.kotlin.dsl.support.serviceOf
description = "Kotlin Assignment Compiler Plugin (Embeddable)"
plugins {
@@ -11,28 +9,14 @@ dependencies {
embedded(project(":kotlin-assignment-compiler-plugin")) { isTransitive = false }
}
sourceSets {
"main" { none() }
"test" { none() }
}
val runtimeJar = runtimeJar(rewriteDefaultJarDepsToShadedCompiler())
val sourcesJar = sourcesJar {
val compilerTask = project(":kotlin-assignment-compiler-plugin").tasks.named<Jar>("sourcesJar")
dependsOn(compilerTask)
val archiveOperations = serviceOf<ArchiveOperations>()
from(compilerTask.map { it.archiveFile }.map { archiveOperations.zipTree(it) })
}
val javadocJar = javadocJar {
val compilerTask = project(":kotlin-assignment-compiler-plugin").tasks.named<Jar>("javadocJar")
dependsOn(compilerTask)
val archiveOperations = serviceOf<ArchiveOperations>()
from(compilerTask.map { it.archiveFile }.map { archiveOperations.zipTree(it) })
}
publish {
artifactId = artifactId.replace(".", "-")
setArtifacts(listOf(runtimeJar, sourcesJar, javadocJar))
}
runtimeJar(rewriteDefaultJarDepsToShadedCompiler())
sourcesJarWithSourcesFromEmbedded(
project(":kotlin-assignment-compiler-plugin").tasks.named<Jar>("sourcesJar")
)
javadocJarWithJavadocFromEmbedded(
project(":kotlin-assignment-compiler-plugin").tasks.named<Jar>("javadocJar")
)