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 +66 -134
8 changed files with 66 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bae77b6979 - Show all commits

2
benchmarks/build.gradle
View File

@ -21,7 +21,7 @@ dependencies {
//jmh project(':kmath-core') //jmh project(':kmath-core')
} }
jmh{ jmh {
warmupIterations = 1 warmupIterations = 1
} }

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

@ -11,6 +11,8 @@ kotlin {
compilations.all { compilations.all {
kotlinOptions { kotlinOptions {
jvmTarget = "1.8" jvmTarget = "1.8"
// This was used in kmath-koma, but probably if we need it better to apply it for all modules
//freeCompilerArgs += "-progressive"
} }
} }
} }

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

@ -1,20 +1,14 @@
plugins { plugins {
id("multiplatform-config") `multiplatform-config`
} }
val ioVersion: String by rootProject.extra kotlin.sourceSets {
commonMain {
dependencies {
kotlin { api(project(":kmath-memory"))
sourceSets {
commonMain {
dependencies {
api(project(":kmath-memory"))
}
} }
// mingwMain {
// }
// mingwTest {
// }
} }
//mingwMain {}
//mingwTest {}
} }

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

@ -1,41 +1,22 @@
plugins { plugins {
id("multiplatform-config") `multiplatform-config`
} }
kotlin { kotlin.sourceSets {
sourceSets { commonMain {
commonMain { dependencies {
dependencies { api(project(":kmath-core"))
api(project(":kmath-core")) api("org.jetbrains.kotlinx:kotlinx-coroutines-core-common:${Ver.coroutinesVersion}")
api("org.jetbrains.kotlinx:kotlinx-coroutines-core-common:${Ver.coroutinesVersion}")
}
} }
commonTest { }
dependencies { jvmMain {
implementation(kotlin("test-common")) dependencies {
implementation(kotlin("test-annotations-common")) api("org.jetbrains.kotlinx:kotlinx-coroutines-core:${Ver.coroutinesVersion}")
}
} }
jvmMain { }
dependencies { jsMain {
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:${Ver.coroutinesVersion}") dependencies {
} api("org.jetbrains.kotlinx:kotlinx-coroutines-core-js:${Ver.coroutinesVersion}")
}
jvmTest {
dependencies {
implementation(kotlin("test"))
implementation(kotlin("test-junit"))
}
}
jsMain {
dependencies {
api("org.jetbrains.kotlinx:kotlinx-coroutines-core-js:${Ver.coroutinesVersion}")
}
}
jsTest {
dependencies {
implementation(kotlin("test-js"))
}
} }
} }
} }

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

@ -1,30 +1,10 @@
plugins { plugins {
id("multiplatform-config") `multiplatform-config`
} }
kotlin { // Just an example how we can collapse nested DSL for simple declarations
sourceSets { kotlin.sourceSets.commonMain {
commonMain { dependencies {
dependencies { api(project(":kmath-core"))
api(project(":kmath-core"))
}
}
commonTest {
dependencies {
implementation(kotlin("test-common"))
implementation(kotlin("test-annotations-common"))
}
}
jvmTest {
dependencies {
implementation(kotlin("test"))
implementation(kotlin("test-junit"))
}
}
jsTest {
dependencies {
implementation(kotlin("test-js"))
}
}
} }
} }

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

@ -1,54 +1,31 @@
plugins { plugins {
id("multiplatform-config") `multiplatform-config`
} }
repositories { repositories {
maven("http://dl.bintray.com/kyonifer/maven") maven("http://dl.bintray.com/kyonifer/maven")
} }
kotlin { kotlin.sourceSets {
jvm { commonMain {
compilations.all { dependencies {
kotlinOptions { api(project(":kmath-core"))
freeCompilerArgs += "-progressive" api("com.kyonifer:koma-core-api-common:0.12")
}
} }
} }
jvmMain {
sourceSets { dependencies {
commonMain { api("com.kyonifer:koma-core-api-jvm:0.12")
dependencies {
api(project(":kmath-core"))
api("com.kyonifer:koma-core-api-common:0.12")
}
} }
commonTest { }
dependencies { jvmTest {
implementation(kotlin("test-common")) dependencies {
implementation(kotlin("test-annotations-common")) implementation("com.kyonifer:koma-core-ejml:0.12")
}
} }
jvmMain { }
dependencies { jsMain {
api("com.kyonifer:koma-core-api-jvm:0.12") dependencies {
} api("com.kyonifer:koma-core-api-js:0.12")
}
jvmTest {
dependencies {
implementation(kotlin("test"))
implementation(kotlin("test-junit"))
implementation("com.kyonifer:koma-core-ejml:0.12")
}
}
jsMain {
dependencies {
api("com.kyonifer:koma-core-api-js:0.12")
}
}
jsTest {
dependencies {
implementation(kotlin("test-js"))
}
} }
} }
} }

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

@ -1,3 +1,3 @@
plugins { plugins {
id("multiplatform-config") `multiplatform-config`
} }

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

@ -1,29 +1,27 @@
plugins { plugins {
id("multiplatform-config") `multiplatform-config`
id("kotlinx-atomicfu") version Ver.atomicfuVersion id("kotlinx-atomicfu") version Ver.atomicfuVersion
} }
kotlin { kotlin.sourceSets {
sourceSets { commonMain {
commonMain { dependencies {
dependencies { api(project(":kmath-core"))
api(project(":kmath-core")) api(project(":kmath-coroutines"))
api(project(":kmath-coroutines")) compileOnly("org.jetbrains.kotlinx:atomicfu-common:${Ver.atomicfuVersion}")
compileOnly("org.jetbrains.kotlinx:atomicfu-common:${Ver.atomicfuVersion}")
}
} }
jvmMain {
dependencies {
compileOnly("org.jetbrains.kotlinx:atomicfu:${Ver.atomicfuVersion}")
}
}
jsMain {
dependencies {
compileOnly("org.jetbrains.kotlinx:atomicfu-js:${Ver.atomicfuVersion}")
}
}
} }
jvmMain {
dependencies {
compileOnly("org.jetbrains.kotlinx:atomicfu:${Ver.atomicfuVersion}")
}
}
jsMain {
dependencies {
compileOnly("org.jetbrains.kotlinx:atomicfu-js:${Ver.atomicfuVersion}")
}
}
} }
atomicfu { atomicfu {