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

Build stdlib-jdk7/8 tests as multiplatform manually

Browse Source
This commit is contained in:
Ilya Gorbunov
2018-01-26 20:56:52 +03:00
parent 9b38e5e7b5
commit 38be99daa3
4 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/jdk7/build.gradle
+5 -2
View File
@@ -22,7 +22,9 @@ sourceSets {
kotlin { kotlin {
srcDir 'test' srcDir 'test'
if(!System.properties.'idea.active') { if(!System.properties.'idea.active') {
srcDir '../test' srcDir '../jvm/test'
srcDir '../common/test'
srcDir '../common/build/common-test-sources'
} }
} }
} }
@@ -64,7 +66,8 @@ compileKotlin {
} }
compileTestKotlin { compileTestKotlin {
kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package"] dependsOn(":kotlin-stdlib-common:preprocessSourcesTest")
kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-Xmulti-platform"]
} }
compileJava9Sources(project, 'kotlin.stdlib.jdk7') compileJava9Sources(project, 'kotlin.stdlib.jdk7')
libraries/stdlib/jdk8/build.gradle
+5 -2
View File
@@ -24,7 +24,9 @@ sourceSets {
kotlin { kotlin {
srcDir 'test' srcDir 'test'
if(!System.properties.'idea.active') { if(!System.properties.'idea.active') {
srcDir '../test' srcDir '../jvm/test'
srcDir '../common/test'
srcDir '../common/build/common-test-sources'
srcDir '../jdk7/test' srcDir '../jdk7/test'
} }
} }
@@ -67,7 +69,8 @@ compileKotlin {
} }
compileTestKotlin { compileTestKotlin {
kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package"] dependsOn(":kotlin-stdlib-common:preprocessSourcesTest")
kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-Xmulti-platform"]
} }
compileJava9Sources(project, 'kotlin.stdlib.jdk8') compileJava9Sources(project, 'kotlin.stdlib.jdk8')
libraries/stdlib/jre7/build.gradle
+5 -2
View File
@@ -22,7 +22,9 @@ sourceSets {
kotlin { kotlin {
srcDir 'test' srcDir 'test'
if(!System.properties.'idea.active') { if(!System.properties.'idea.active') {
srcDir '../test' srcDir '../jvm/test'
srcDir '../common/test'
srcDir '../common/build/common-test-sources'
} }
} }
} }
@@ -57,7 +59,8 @@ compileKotlin {
} }
compileTestKotlin { compileTestKotlin {
kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package"] dependsOn(":kotlin-stdlib-common:preprocessSourcesTest")
kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-Xmulti-platform"]
} }
kotlin.experimental.coroutines 'enable' kotlin.experimental.coroutines 'enable'
libraries/stdlib/jre8/build.gradle
+5 -2
View File
@@ -24,7 +24,9 @@ sourceSets {
kotlin { kotlin {
srcDir 'test' srcDir 'test'
if(!System.properties.'idea.active') { if(!System.properties.'idea.active') {
srcDir '../test' srcDir '../jvm/test'
srcDir '../common/test'
srcDir '../common/build/common-test-sources'
srcDir '../jre7/test' srcDir '../jre7/test'
} }
} }
@@ -60,7 +62,8 @@ compileKotlin {
} }
compileTestKotlin { compileTestKotlin {
kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-Xnormalize-constructor-calls=enable"] dependsOn(":kotlin-stdlib-common:preprocessSourcesTest")
kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package", "-Xnormalize-constructor-calls=enable", "-Xmulti-platform"]
} }
kotlin.experimental.coroutines 'enable' kotlin.experimental.coroutines 'enable'