teldufalsari/kmath
2
0
Fork 0
forked from kscience/kmath
Code Pull Requests 1 Activity

Build refactoring

Browse Source
This commit is contained in:
Alexander Nozik 2019-04-23 13:10:38 +03:00
parent 0e7ad1c0c0
commit 4cd316758a
2 changed files with 43 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build.gradle.kts
View File

@ -1,3 +1,5 @@
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinMultiplatformPlugin
val kmathVersion by extra("0.1.2-dev-1") val kmathVersion by extra("0.1.2-dev-1")
allprojects { allprojects {
@ -16,12 +18,10 @@ subprojects {
//apply artifactory configuration //apply artifactory configuration
apply(plugin = "artifactory-config") apply(plugin = "artifactory-config")
}
plugins.withId("org.jetbrains.kotlin.multiplatform") { plugins.withType<KotlinMultiplatformPlugin> {
apply(plugin = "multiplatform-config") apply(plugin = "multiplatform-config")
}
}
// dokka { // dokka {
// outputFormat = "html" // outputFormat = "html"
// outputDirectory = javadoc.destinationDir // outputDirectory = javadoc.destinationDir
@ -31,5 +31,6 @@ subprojects {
// from javadoc . destinationDir // from javadoc . destinationDir
// classifier = "javadoc" // classifier = "javadoc"
// } // }
}
} }

24
buildSrc/src/main/kotlin/js-test.gradle.kts
View File

@ -1,6 +1,7 @@
import com.moowork.gradle.node.NodeExtension
import com.moowork.gradle.node.npm.NpmTask import com.moowork.gradle.node.npm.NpmTask
import com.moowork.gradle.node.task.NodeTask import com.moowork.gradle.node.task.NodeTask
import org.gradle.kotlin.dsl.* import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile
plugins { plugins {
@ -8,18 +9,26 @@ plugins {
kotlin("multiplatform") kotlin("multiplatform")
} }
node { configure<NodeExtension> {
nodeModulesDir = file("$buildDir/node_modules") nodeModulesDir = file("$buildDir/node_modules")
} }
val compileKotlinJs by tasks.getting(Kotlin2JsCompile::class) val compileKotlinJs by tasks.getting(Kotlin2JsCompile::class)
val compileTestKotlinJs by tasks.getting(Kotlin2JsCompile::class) val compileTestKotlinJs by tasks.getting(Kotlin2JsCompile::class)
inline fun <reified T : Task> TaskContainer.registering(
crossinline action: T.() -> Unit
): RegisteringDomainObjectDelegateProviderWithTypeAndAction<TaskContainer, T> =
RegisteringDomainObjectDelegateProviderWithTypeAndAction.of(this, T::class, { action() })
configure<KotlinMultiplatformExtension> {
val populateNodeModules by tasks.registering(Copy::class) { val populateNodeModules by tasks.registering(Copy::class) {
dependsOn(compileKotlinJs) dependsOn(compileKotlinJs)
from(compileKotlinJs.destinationDir) from(compileKotlinJs.destinationDir)
kotlin.js().compilations["test"].runtimeDependencyFiles.forEach { js().compilations["test"].runtimeDependencyFiles.forEach {
if (it.exists() && !it.isDirectory) { if (it.exists() && !it.isDirectory) {
from(zipTree(it.absolutePath).matching { include("*.js") }) from(zipTree(it.absolutePath).matching { include("*.js") })
} }
@ -33,13 +42,6 @@ val installMocha by tasks.registering<NpmTask> {
setArgs(listOf("install", "mocha")) setArgs(listOf("install", "mocha"))
} }
inline fun <reified T : Task> TaskContainer.registering(
crossinline action: T.() -> Unit
): RegisteringDomainObjectDelegateProviderWithTypeAndAction<TaskContainer, T> =
RegisteringDomainObjectDelegateProviderWithTypeAndAction.of(this, T::class, { action() })
val runMocha by tasks.registering(NodeTask::class) { val runMocha by tasks.registering(NodeTask::class) {
dependsOn(compileTestKotlinJs, populateNodeModules, installMocha) dependsOn(compileTestKotlinJs, populateNodeModules, installMocha)
setScript(file("$buildDir/node_modules/mocha/bin/mocha")) setScript(file("$buildDir/node_modules/mocha/bin/mocha"))
@ -47,3 +49,5 @@ val runMocha by tasks.registering(NodeTask::class) {
} }
tasks["jsTest"].dependsOn(runMocha) tasks["jsTest"].dependsOn(runMocha)
}