kscience/kmath
9
0
Fork 1
Code Issues Pull Requests 6 Packages Projects Releases 16 Wiki Activity

Merge dev into master #59

Merged
altavir merged 37 commits from dev into master 2019-05-31 12:35:58 +03:00
Conversation 0 Commits 37 Files Changed 70 +16 -42
7 changed files with 16 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f797d7b082 - Show all commits

6
buildSrc/src/main/kotlin/multiplatform-config.gradle.kts
View File

@ -1,10 +1,4 @@
import com.moowork.gradle.node.NodeExtension
import com.moowork.gradle.node.npm.NpmTask
import com.moowork.gradle.node.task.NodeTask
import org.gradle.kotlin.dsl.* 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.KotlinCompile
plugins { plugins {
kotlin("multiplatform") kotlin("multiplatform")

3
kmath-core/build.gradle.kts
View File

@ -6,9 +6,6 @@ val ioVersion: String by rootProject.extra
kotlin { kotlin {
jvm()
js()
sourceSets { sourceSets {
commonMain { commonMain {
dependencies { dependencies {

13
kmath-coroutines/build.gradle.kts
View File

@ -3,10 +3,7 @@ plugins {
} }
kotlin { kotlin {
jvm() sourceSets {
js()
sourceSets.invoke {
commonMain { commonMain {
dependencies { dependencies {
api(project(":kmath-core")) api(project(":kmath-core"))
@ -19,23 +16,23 @@ kotlin {
implementation(kotlin("test-annotations-common")) implementation(kotlin("test-annotations-common"))
} }
} }
"jvmMain" { jvmMain {
dependencies { dependencies {
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:${Ver.coroutinesVersion}") api("org.jetbrains.kotlinx:kotlinx-coroutines-core:${Ver.coroutinesVersion}")
} }
} }
"jvmTest" { jvmTest {
dependencies { dependencies {
implementation(kotlin("test")) implementation(kotlin("test"))
implementation(kotlin("test-junit")) implementation(kotlin("test-junit"))
} }
} }
"jsMain" { jsMain {
dependencies { dependencies {
api("org.jetbrains.kotlinx:kotlinx-coroutines-core-js:${Ver.coroutinesVersion}") api("org.jetbrains.kotlinx:kotlinx-coroutines-core-js:${Ver.coroutinesVersion}")
} }
} }
"jsTest" { jsTest {
dependencies { dependencies {
implementation(kotlin("test-js")) implementation(kotlin("test-js"))
} }

9
kmath-histograms/build.gradle.kts
View File

@ -3,10 +3,7 @@ plugins {
} }
kotlin { kotlin {
jvm() sourceSets {
js()
sourceSets.invoke {
commonMain { commonMain {
dependencies { dependencies {
api(project(":kmath-core")) api(project(":kmath-core"))
@ -18,13 +15,13 @@ kotlin {
implementation(kotlin("test-annotations-common")) implementation(kotlin("test-annotations-common"))
} }
} }
"jvmTest" { jvmTest {
dependencies { dependencies {
implementation(kotlin("test")) implementation(kotlin("test"))
implementation(kotlin("test-junit")) implementation(kotlin("test-junit"))
} }
} }
"jsTest" { jsTest {
dependencies { dependencies {
implementation(kotlin("test-js")) implementation(kotlin("test-js"))
} }

12
kmath-koma/build.gradle.kts
View File

@ -14,10 +14,8 @@ kotlin {
} }
} }
} }
js()
sourceSets.invoke {
sourceSets {
commonMain { commonMain {
dependencies { dependencies {
api(project(":kmath-core")) api(project(":kmath-core"))
@ -30,24 +28,24 @@ kotlin {
implementation(kotlin("test-annotations-common")) implementation(kotlin("test-annotations-common"))
} }
} }
"jvmMain" { jvmMain {
dependencies { dependencies {
api("com.kyonifer:koma-core-api-jvm:0.12") api("com.kyonifer:koma-core-api-jvm:0.12")
} }
} }
"jvmTest" { jvmTest {
dependencies { dependencies {
implementation(kotlin("test")) implementation(kotlin("test"))
implementation(kotlin("test-junit")) implementation(kotlin("test-junit"))
implementation("com.kyonifer:koma-core-ejml:0.12") implementation("com.kyonifer:koma-core-ejml:0.12")
} }
} }
"jsMain" { jsMain {
dependencies { dependencies {
api("com.kyonifer:koma-core-api-js:0.12") api("com.kyonifer:koma-core-api-js:0.12")
} }
} }
"jsTest" { jsTest {
dependencies { dependencies {
implementation(kotlin("test-js")) implementation(kotlin("test-js"))
} }

6
kmath-memory/build.gradle.kts
View File

@ -1,9 +1,3 @@
plugins { plugins {
id("multiplatform-config") id("multiplatform-config")
} }
// We actually don't need this, we define jvm and js targets in multiplatform-config
kotlin {
jvm()
js()
}

9
kmath-sequential/build.gradle.kts
View File

@ -4,10 +4,7 @@ plugins {
} }
kotlin { kotlin {
jvm() sourceSets {
js()
sourceSets.invoke {
commonMain { commonMain {
dependencies { dependencies {
api(project(":kmath-core")) api(project(":kmath-core"))
@ -15,12 +12,12 @@ kotlin {
compileOnly("org.jetbrains.kotlinx:atomicfu-common:${Ver.atomicfuVersion}") compileOnly("org.jetbrains.kotlinx:atomicfu-common:${Ver.atomicfuVersion}")
} }
} }
"jvmMain" { jvmMain {
dependencies { dependencies {
compileOnly("org.jetbrains.kotlinx:atomicfu:${Ver.atomicfuVersion}") compileOnly("org.jetbrains.kotlinx:atomicfu:${Ver.atomicfuVersion}")
} }
} }
"jsMain" { jsMain {
dependencies { dependencies {
compileOnly("org.jetbrains.kotlinx:atomicfu-js:${Ver.atomicfuVersion}") compileOnly("org.jetbrains.kotlinx:atomicfu-js:${Ver.atomicfuVersion}")
} }