Build: Rework runtimeJar helper and drop redundant configuration

#KTI-559
This commit is contained in:
Vyacheslav Gerasimov
2021-07-21 17:00:57 +03:00
parent ab146bd6d4
commit f91d6958a8
37 changed files with 104 additions and 185 deletions
@@ -1,6 +1,3 @@
import org.gradle.jvm.tasks.Jar
description = "Kotlin Android Extensions Compiler"
plugins {
@@ -14,7 +11,7 @@ dependencies {
compileOnly(project(":compiler:frontend.java"))
compileOnly(project(":compiler:backend"))
compileOnly(project(":kotlin-android-extensions-runtime"))
runtimeOnly(projectRuntimeJar(":kotlin-compiler-embeddable"))
runtimeOnly(project(":kotlin-compiler-embeddable"))
compileOnly(commonDep("com.google.android", "android"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
@@ -29,7 +26,6 @@ sourceSets {
publish()
noDefaultJar()
runtimeJar(rewriteDefaultJarDepsToShadedCompiler())
sourcesJar()
@@ -17,12 +17,12 @@ dependencies {
embedded(project(":compiler:cli-common")) { isTransitive = false }
embedded(project(":daemon-common")) { isTransitive = false }
embedded(project(":daemon-common-new")) { isTransitive = false }
embedded(projectRuntimeJar(":kotlin-daemon-client"))
embedded(project(":kotlin-daemon-client")) { isTransitive = false }
testApi(project(":compiler:cli-common"))
testApi(project(":daemon-common"))
testApi(project(":daemon-common-new"))
testApi(projectRuntimeJar(":kotlin-daemon-client"))
testApi(project(":kotlin-daemon-client"))
testApi(commonDep("junit:junit"))
testApi(project(":kotlin-test:kotlin-test-jvm"))
testApi(project(":kotlin-test:kotlin-test-junit"))
@@ -41,8 +41,6 @@ sourceSets {
publish()
noDefaultJar()
// dummy is used for rewriting dependencies to the shaded packages in the embeddable compiler
compilerDummyJar(compilerDummyForDependenciesRewriting("compilerDummy") {
archiveClassifier.set("dummy")
@@ -1,9 +1,7 @@
import org.gradle.jvm.tasks.Jar
description = "Annotation Processor for Kotlin (for using with embeddable compiler)"
plugins {
`java`
java
}
dependencies {
@@ -12,7 +10,6 @@ dependencies {
publish()
noDefaultJar()
runtimeJar(rewriteDefaultJarDepsToShadedCompiler())
sourcesJar()
@@ -10,7 +10,6 @@ dependencies {
publish()
noDefaultJar()
runtimeJar(rewriteDefaultJarDepsToShadedCompiler())
sourcesJar()
@@ -1,5 +1,3 @@
import org.gradle.jvm.tasks.Jar
description = "Parcelize compiler plugin"
plugins {
@@ -13,7 +11,7 @@ dependencies {
compileOnly(project(":compiler:frontend.java"))
compileOnly(project(":compiler:backend"))
compileOnly(project(":plugins:parcelize:parcelize-runtime"))
runtimeOnly(projectRuntimeJar(":kotlin-compiler-embeddable"))
runtimeOnly(project(":kotlin-compiler-embeddable"))
compileOnly(commonDep("com.google.android", "android"))
compileOnly(intellijCoreDep()) { includeJars("intellij-core") }
@@ -28,7 +26,6 @@ sourceSets {
publish()
noDefaultJar()
runtimeJar(rewriteDefaultJarDepsToShadedCompiler())
sourcesJar()