Refactor: project renaming, using improved build dsl

This commit is contained in:
Ilya Chernikov
2017-09-11 14:47:07 +02:00
parent 8e24383428
commit b6c255cea5
24 changed files with 209 additions and 217 deletions
@@ -4,9 +4,6 @@ description = "Sample Kotlin JSR 223 scripting jar with daemon (out-of-process)
apply { plugin("kotlin") }
dependencies {
val compile by configurations
val testCompile by configurations
val testRuntime by configurations
compile(project(":kotlin-stdlib"))
compile(project(":kotlin-script-runtime"))
compile(projectRuntimeJar(":kotlin-compiler"))
@@ -16,11 +13,4 @@ dependencies {
testRuntime(project(":kotlin-reflect"))
}
tasks.withType<Test> {
jvmArgs("-ea", "-XX:+HeapDumpOnOutOfMemoryError", "-Xmx1200m", "-XX:+UseCodeCacheFlushing", "-XX:ReservedCodeCacheSize=128m", "-Djna.nosys=true")
maxHeapSize = "1200m"
systemProperty("idea.is.unit.test", "true")
environment("NO_FS_ROOTS_ACCESS_CHECK", "true")
environment("KOTLIN_HOME", rootProject.extra["distKotlinHomeDir"])
ignoreFailures = true
}
projectTest()
@@ -4,9 +4,6 @@ description = "Sample Kotlin JSR 223 scripting jar with local (in-process) compi
apply { plugin("kotlin") }
dependencies {
val compile by configurations
val testCompile by configurations
val testRuntime by configurations
compile(project(":kotlin-stdlib"))
compile(project(":kotlin-script-runtime"))
compile(projectRuntimeJar(":kotlin-compiler"))
@@ -15,10 +12,4 @@ dependencies {
testRuntime(project(":kotlin-reflect"))
}
tasks.withType<Test> {
jvmArgs("-ea", "-XX:+HeapDumpOnOutOfMemoryError", "-Xmx1200m", "-XX:+UseCodeCacheFlushing", "-XX:ReservedCodeCacheSize=128m", "-Djna.nosys=true")
maxHeapSize = "1200m"
systemProperty("idea.is.unit.test", "true")
environment("NO_FS_ROOTS_ACCESS_CHECK", "true")
ignoreFailures = true
}
projectTest()
@@ -17,7 +17,7 @@ dependencies {
testCompile project(path: ':examples:annotation-processor-example')
testCompile project(':kotlin-stdlib-jre8')
testCompile project(':android-extensions-compiler')
testCompile project(path: ':build-common', configuration: 'tests-jar')
testCompile project(path: ':kotlin-build-common', configuration: 'tests-jar')
testCompile 'org.jetbrains.kotlin:gradle-api:2.2'
}
@@ -32,7 +32,7 @@ dependencies {
compile project(':kotlin-stdlib')
compile project(':android-extensions-compiler')
// compile project(path: ':compiler', configuration: 'embeddableCompilerJar')
compile project(':build-common')
compile project(':kotlin-build-common')
compile project(':compiler:compiler-runner')
compile project(":compiler:incremental-compilation-impl")
compile project(":compiler")
@@ -46,7 +46,7 @@ dependencies {
agp25CompileOnly 'org.codehaus.groovy:groovy-all:2.3.9'
agp25CompileOnly gradleApi()
testCompile project (path: ':build-common', configuration: 'tests-jar')
testCompile project (path: ':kotlin-build-common', configuration: 'tests-jar')
testCompile project(':kotlin-test::kotlin-test-junit')
testCompile "junit:junit:4.12"
}