Updated build in coroutines

This commit is contained in:
Alexander Nozik 2019-02-12 14:14:16 +03:00
parent d04ee956e5
commit f8ec82d8c0
3 changed files with 48 additions and 45 deletions

View File

@ -18,8 +18,7 @@ buildscript {
}
plugins {
id("com.jfrog.artifactory") version "4.8.1" apply false
// id("org.jetbrains.kotlin.multiplatform") apply false
id("com.jfrog.artifactory") version "4.9.1" apply false
}
allprojects {
@ -29,7 +28,7 @@ allprojects {
}
group = "scientifik"
version = "0.0.3"
version = "0.0.3-dev"
repositories {
//maven("https://dl.bintray.com/kotlin/kotlin-eap")

View File

@ -1,42 +0,0 @@
plugins {
id "org.jetbrains.kotlin.multiplatform"
}
kotlin {
jvm()
js()
sourceSets {
commonMain {
dependencies {
api project(":kmath-core")
api "org.jetbrains.kotlinx:kotlinx-coroutines-core-common:$coroutinesVersion"
}
}
commonTest {
dependencies {
api 'org.jetbrains.kotlin:kotlin-test-common'
api 'org.jetbrains.kotlin:kotlin-test-annotations-common'
}
}
jvmMain {
dependencies {
api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
}
}
jvmTest {
dependencies {
implementation 'org.jetbrains.kotlin:kotlin-test'
implementation 'org.jetbrains.kotlin:kotlin-test-junit'
}
}
jsMain{
dependencies{
api "org.jetbrains.kotlinx:kotlinx-coroutines-core-js:$coroutinesVersion"
}
}
// mingwMain {
// }
// mingwTest {
// }
}
}

View File

@ -0,0 +1,46 @@
plugins {
kotlin("multiplatform")
}
val coroutinesVersion: String by rootProject.extra
kotlin {
jvm()
js()
sourceSets {
val commonMain by getting {
dependencies {
api(project(":kmath-core"))
api("org.jetbrains.kotlinx:kotlinx-coroutines-core-common:$coroutinesVersion")
}
}
val commonTest by getting {
dependencies {
implementation(kotlin("test-common"))
implementation(kotlin("test-annotations-common"))
}
}
val jvmMain by getting {
dependencies {
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
}
}
val jvmTest by getting {
dependencies {
implementation(kotlin("test"))
implementation(kotlin("test-junit"))
}
}
val jsMain by getting {
dependencies {
api("org.jetbrains.kotlinx:kotlinx-coroutines-core-js:$coroutinesVersion")
}
}
val jsTest by getting {
dependencies {
implementation(kotlin("test-js"))
}
}
}
}