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

Gradle, js: fix supporting sub targets DSL in build.gradle.kts

Browse Source
This commit is contained in:
Sergey Rostov
2019-05-19 13:25:54 +03:00
parent 3a9f3525f1
commit 9a90627b32
4 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kotlin2JsGradlePluginIT.kt
+13 -17
View File
@@ -380,24 +380,20 @@ class Kotlin2JsGradlePluginIT : BaseGradleIT() {
assertFileExists(moduleDir + "kotlin-js-plugin-1.0-sources.jar") assertFileExists(moduleDir + "kotlin-js-plugin-1.0-sources.jar")
assertFileExists("build/test_node_modules/kotlin.js") assertFileExists("build/js/node_modules/kotlin/kotlin.js")
assertFileExists("build/test_node_modules/kotlin.js.map") assertFileExists("build/js/node_modules/kotlin/kotlin.js.map")
assertFileExists("build/test_node_modules/kotlin-test.js") assertFileExists("build/js/node_modules/kotlin-test/kotlin-test.js")
assertFileExists("build/test_node_modules/kotlin-test.js.map") assertFileExists("build/js/node_modules/kotlin-test/kotlin-test.js.map")
assertFileExists("build/test_node_modules/kotlin-test-nodejs-runner.js") assertFileExists("build/js/node_modules/kotlin-test-nodejs-runner/kotlin-test-nodejs-runner.js")
assertFileExists("build/test_node_modules/kotlin-test-nodejs-runner.js.map") assertFileExists("build/js/node_modules/kotlin-test-nodejs-runner/kotlin-test-nodejs-runner.js.map")
assertFileExists("build/test_node_modules/kotlin-nodejs-source-map-support.js") assertFileExists("build/js/node_modules/kotlin-test-nodejs-runner/kotlin-nodejs-source-map-support.js")
assertFileExists("build/test_node_modules/kotlin-nodejs-source-map-support.js.map") assertFileExists("build/js/node_modules/kotlin-test-nodejs-runner/kotlin-nodejs-source-map-support.js.map")
assertFileExists("build/test_node_modules/kotlin-js-plugin.js") assertFileExists("build/js/node_modules/kotlin-js-plugin/kotlin/kotlin-js-plugin.js")
assertFileExists("build/test_node_modules/kotlin-js-plugin.js.map") assertFileExists("build/js/node_modules/kotlin-js-plugin/kotlin/kotlin-js-plugin.js.map")
assertFileExists("build/test_node_modules/kotlin-js-plugin_test.js") assertFileExists("build/js/node_modules/kotlin-js-plugin-test/kotlin/kotlin-js-plugin-test.js")
assertFileExists("build/test_node_modules/kotlin-js-plugin_test.js.map") assertFileExists("build/js/node_modules/kotlin-js-plugin-test/kotlin/kotlin-js-plugin-test.js.map")
val slash = File.separator assertTestResults("testProject/kotlin-js-plugin-project/tests.xml", "nodeTest")
assertFileContains(
"build/test_node_modules/kotlin-js-plugin_test.js.map",
"\"sources\":[\"..$slash..${slash}src${slash}test${slash}kotlin${slash}MainTest.kt\"]"
)
} }
} }
} }
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-plugin-project/build.gradle.kts
+4
View File
@@ -26,6 +26,10 @@ kotlin.sourceSets {
} }
} }
kotlin.target {
nodejs()
}
kotlin.target.compilations.create("benchmark") { kotlin.target.compilations.create("benchmark") {
defaultSourceSet.dependencies { defaultSourceSet.dependencies {
val main by kotlin.target.compilations val main by kotlin.target.compilations
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kotlin-js-plugin-project/tests.xml
+2 -2
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<results> <results>
<testsuite name="MainTest" tests="1" skipped="0" failures="0" errors="0" timestamp="..." hostname="..." time="..."> <testsuite name="com.example.MainTest" tests="1" skipped="0" failures="0" errors="0" timestamp="..." hostname="..." time="...">
<properties /> <properties />
<testcase name="testHello" classname="MainTest" time="..." /> <testcase name="testHello" classname="com.example.MainTest" time="..." />
<system-out /> <system-out />
<system-err /> <system-err />
</testsuite> </testsuite>
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/dsl/KotlinProjectExtension.kt
+3 -2
View File
@@ -27,6 +27,7 @@ import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinAndroidTarget
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJsCompilation
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinOnlyTarget import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinOnlyTarget
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinWithJavaTarget import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinWithJavaTarget
import org.jetbrains.kotlin.gradle.targets.js.KotlinJsTarget
import kotlin.reflect.KClass import kotlin.reflect.KClass
private const val KOTLIN_PROJECT_EXTENSION_NAME = "kotlin" private const val KOTLIN_PROJECT_EXTENSION_NAME = "kotlin"
@@ -86,9 +87,9 @@ open class Kotlin2JsProjectExtension : KotlinSingleJavaTargetExtension() {
} }
open class KotlinJsProjectExtension : KotlinSingleTargetExtension() { open class KotlinJsProjectExtension : KotlinSingleTargetExtension() {
override lateinit var target: KotlinOnlyTarget<KotlinJsCompilation> override lateinit var target: KotlinJsTarget
open fun target(body: KotlinOnlyTarget<KotlinJsCompilation>.() -> Unit) = target.run(body) open fun target(body: KotlinJsTarget.() -> Unit) = target.run(body)
@Deprecated( @Deprecated(
"Needed for IDE import using the MPP import mechanism", "Needed for IDE import using the MPP import mechanism",