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

Move compiler/tests-common-jvm6/{src -> tests}, adjust dependencies

Browse Source
This commit is contained in:
Alexander Udalov
2017-10-17 15:02:01 +02:00
parent 33549362cb
commit 8786c951a6
7 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/build.gradle.kts
+3 -2
View File
@@ -43,20 +43,21 @@ dependencies {
testCompileOnly(projectDist(":kotlin-test:kotlin-test-jvm"))
testCompileOnly(projectDist(":kotlin-test:kotlin-test-junit"))
testCompile(projectTests(":compiler:tests-common"))
testCompile(project(":compiler:tests-common-jvm6"))
testCompile(projectTests(":compiler:tests-common-jvm6"))
testCompile(project(":compiler:ir.ir2cfg"))
testCompile(project(":compiler:ir.tree")) // used for deepCopyWithSymbols call that is removed by proguard from the compiler TODO: make it more straightforward
testCompileOnly(project(":kotlin-daemon-client"))
otherCompilerModules.forEach {
testCompileOnly(project(it))
}
testCompile(ideaSdkDeps("openapi", "idea", "util", "asm-all", "commons-httpclient-3.1-patched"))
testRuntime(projectDist(":kotlin-compiler"))
testRuntime(projectDist(":kotlin-daemon-client"))
testRuntime(preloadedDeps("dx", subdir = "android-5.0/lib"))
testCompile(ideaSdkDeps("openapi", "idea", "util", "asm-all", "commons-httpclient-3.1-patched"))
testRuntime(ideaSdkCoreDeps("*.jar"))
testRuntime(ideaSdkDeps("*.jar"))
testRuntime(files("${System.getProperty("java.home")}/../lib/tools.jar"))
}
sourceSets {
compiler/tests-common-jvm6/build.gradle.kts
+14 -12
View File
@@ -4,19 +4,21 @@ apply { plugin("kotlin") }
jvmTarget = "1.6"
dependencies {
compile(project(":core"))
compile(project(":core::util.runtime"))
compile(project(":compiler:util"))
compile(project(":compiler:backend"))
compile(project(":compiler:frontend"))
compile(project(":compiler:frontend.java"))
compile(project(":compiler:util"))
compile(project(":compiler:cli-common"))
compile(project(":compiler:cli"))
compile(project(":kotlin-test:kotlin-test-jvm"))
testCompile(project(":core"))
testCompile(project(":core::util.runtime"))
testCompile(project(":compiler:util"))
testCompile(project(":compiler:backend"))
testCompile(project(":compiler:frontend"))
testCompile(project(":compiler:frontend.java"))
testCompile(project(":compiler:util"))
testCompile(project(":compiler:cli-common"))
testCompile(project(":compiler:cli"))
testCompile(project(":kotlin-test:kotlin-test-jvm"))
}
sourceSets {
"main" { projectDefault() }
"test" {}
"main" { }
"test" { projectDefault() }
}
testsJar {}
compiler/tests-common-jvm6/src/org/jetbrains/kotlin/test/clientserver/MessageHeader.kt → compiler/tests-common-jvm6/tests/org/jetbrains/kotlin/test/clientserver/MessageHeader.kt
View File
compiler/tests-common-jvm6/src/org/jetbrains/kotlin/test/clientserver/TestProcessServer.kt → compiler/tests-common-jvm6/tests/org/jetbrains/kotlin/test/clientserver/TestProcessServer.kt
View File
compiler/tests-common-jvm6/src/org/jetbrains/kotlin/test/clientserver/TestProxy.kt → compiler/tests-common-jvm6/tests/org/jetbrains/kotlin/test/clientserver/TestProxy.kt
View File
compiler/tests-common/build.gradle.kts
+1 -1
View File
@@ -20,7 +20,7 @@ dependencies {
testCompile(project(":js:js.translator"))
testCompileOnly(project(":plugins:android-extensions-compiler"))
testCompile(project(":kotlin-test:kotlin-test-jvm"))
testCompile(project(":compiler:tests-common-jvm6"))
testCompile(projectTests(":compiler:tests-common-jvm6"))
testCompile(commonDep("junit:junit"))
testCompile(ideaSdkCoreDeps("intellij-core"))
testCompile(ideaSdkDeps("openapi", "idea", "idea_rt"))
compiler/tests-java8/build.gradle.kts
+1
View File
@@ -20,6 +20,7 @@ dependencies {
testCompile(projectDist(":kotlin-reflect"))
testCompile(projectTests(":compiler"))
testCompile(projectTests(":compiler:tests-common"))
testCompile(projectTests(":compiler:tests-common-jvm6"))
testRuntime(projectRuntimeJar(":kotlin-preloader"))
testRuntime(preloadedDeps("dx", subdir = "android-5.0/lib"))
testRuntime(ideaSdkCoreDeps("*.jar"))