Build: Use embedded configuration for compiler plugins

This commit is contained in:
Vyacheslav Gerasimov
2019-04-24 16:34:50 +03:00
parent 50e145f239
commit 8851029baa
7 changed files with 22 additions and 70 deletions
+2 -9
View File
@@ -4,11 +4,6 @@ apply plugin: 'jps-compatible'
configureJvmProject(project)
configurePublishing(project)
repositories {
mavenLocal()
jcenter()
}
pill {
variant = 'FULL'
}
@@ -25,9 +20,9 @@ dependencies {
testCompile gradleApi()
testCompile "junit:junit:4.12"
}
evaluationDependsOn(":kotlin-allopen-compiler-plugin")
embedded(project(":kotlin-allopen-compiler-plugin")) { transitive = false }
}
tasks.withType(project.compileKotlin.class) {
kotlinOptions.languageVersion = "1.2"
@@ -36,8 +31,6 @@ tasks.withType(project.compileKotlin.class) {
}
jar {
from(project(":kotlin-allopen-compiler-plugin").sourceSets.main.output.classesDirs)
from(project(":kotlin-allopen-compiler-plugin").sourceSets.main.output.resourcesDir)
manifestAttributes(manifest, project)
}
+2 -9
View File
@@ -10,11 +10,6 @@ compileJava {
options.fork = false
}
repositories {
mavenLocal()
jcenter()
}
pill {
variant = 'FULL'
}
@@ -31,9 +26,9 @@ dependencies {
testCompile gradleApi()
testCompile "junit:junit:4.12"
}
evaluationDependsOn(":kotlin-noarg-compiler-plugin")
embedded(project(":kotlin-noarg-compiler-plugin")) { transitive = false }
}
tasks.withType(project.compileKotlin.class) {
kotlinOptions.languageVersion = "1.2"
@@ -42,8 +37,6 @@ tasks.withType(project.compileKotlin.class) {
}
jar {
from(project(":kotlin-noarg-compiler-plugin").sourceSets.main.output.classesDirs)
from(project(":kotlin-noarg-compiler-plugin").sourceSets.main.output.resourcesDir)
manifestAttributes(manifest, project)
}
@@ -14,11 +14,6 @@ pill {
variant = 'FULL'
}
repositories {
mavenLocal()
jcenter()
}
dependencies {
compile project(':kotlin-gradle-plugin-api')
compile project(':kotlin-gradle-plugin-model')
@@ -31,9 +26,9 @@ dependencies {
testCompile gradleApi()
testCompile "junit:junit:4.12"
}
evaluationDependsOn(":kotlin-sam-with-receiver-compiler-plugin")
embedded(project(":kotlin-sam-with-receiver-compiler-plugin")) { transitive = false }
}
tasks.withType(project.compileKotlin.class) {
kotlinOptions.languageVersion = "1.2"
@@ -42,8 +37,6 @@ tasks.withType(project.compileKotlin.class) {
}
jar {
from(project(":kotlin-sam-with-receiver-compiler-plugin").sourceSets.main.output.classesDirs)
from(project(":kotlin-sam-with-receiver-compiler-plugin").sourceSets.main.output.resourcesDir)
manifestAttributes(manifest, project)
}
@@ -3,17 +3,17 @@ apply plugin: 'kotlin'
configureJvmProject(project)
configurePublishing(project)
dependencies {
embedded(project(":kotlinx-serialization-compiler-plugin")) { transitive = false }
}
compileJava {
sourceCompatibility = 1.8
targetCompatibility = 1.8
options.fork = false
}
evaluationDependsOn(":kotlinx-serialization-compiler-plugin")
jar {
from(project(":kotlinx-serialization-compiler-plugin").sourceSets.main.output.classesDirs)
from(project(":kotlinx-serialization-compiler-plugin").sourceSets.main.output.resourcesDir)
manifestAttributes(manifest, project)
}
@@ -20,13 +20,11 @@ dependencies {
compileOnly kotlinStdlib()
compileOnly project(path: ':kotlin-compiler-embeddable', configuration: 'runtimeJar')
embedded(project(":kotlinx-serialization-compiler-plugin")) { transitive = false }
}
evaluationDependsOn(":kotlinx-serialization-compiler-plugin")
jar {
from(project(":kotlinx-serialization-compiler-plugin").sourceSets.main.output.classesDirs)
from(project(":kotlinx-serialization-compiler-plugin").sourceSets.main.output.resourcesDir)
manifestAttributes(manifest, project)
}