Merge dev into master #59

Merged
altavir merged 37 commits from dev into master 2019-05-31 12:35:58 +03:00
3 changed files with 5 additions and 8 deletions
Showing only changes of commit c77d9cbb08 - Show all commits

View File

@ -1,10 +1,6 @@
val kmathVersion by extra("0.1.2-dev-3") val kmathVersion by extra("0.1.2-dev-3")
allprojects { allprojects {
// apply(plugin = "maven")
// apply(plugin = "maven-publish")
// apply(plugin = "com.jfrog.artifactory")
repositories { repositories {
jcenter() jcenter()
maven("https://kotlin.bintray.com/kotlinx") maven("https://kotlin.bintray.com/kotlinx")

View File

@ -7,7 +7,7 @@ repositories {
jcenter() jcenter()
} }
val kotlinVersion = "1.3.30" val kotlinVersion = "1.3.31"
// Add plugins used in buildSrc as dependencies, also we should specify version only here // Add plugins used in buildSrc as dependencies, also we should specify version only here
dependencies { dependencies {

View File

@ -1,7 +1,8 @@
package scientifik.kmath.streaming package scientifik.kmath.streaming
import kotlinx.coroutines.* import kotlinx.coroutines.*
import kotlinx.coroutines.flow.* import kotlinx.coroutines.flow.asFlow
import kotlinx.coroutines.flow.collect
import org.junit.Test import org.junit.Test
import scientifik.kmath.async import scientifik.kmath.async
import scientifik.kmath.collect import scientifik.kmath.collect
@ -20,7 +21,7 @@ class BufferFlowTest {
fun map() { fun map() {
runBlocking { runBlocking {
(1..20).asFlow().map( dispatcher) { (1..20).asFlow().map( dispatcher) {
println("Started $it on ${Thread.currentThread().name}") //println("Started $it on ${Thread.currentThread().name}")
@Suppress("BlockingMethodInNonBlockingContext") @Suppress("BlockingMethodInNonBlockingContext")
Thread.sleep(200) Thread.sleep(200)
it it
@ -34,7 +35,7 @@ class BufferFlowTest {
fun async() { fun async() {
runBlocking { runBlocking {
(1..20).asFlow().async(dispatcher) { (1..20).asFlow().async(dispatcher) {
println("Started $it on ${Thread.currentThread().name}") //println("Started $it on ${Thread.currentThread().name}")
@Suppress("BlockingMethodInNonBlockingContext") @Suppress("BlockingMethodInNonBlockingContext")
Thread.sleep(200) Thread.sleep(200)
it it