Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/kotlin/scientifik/common.kt
This commit is contained in:
Alexander Nozik 2019-10-04 17:52:01 +03:00
commit 72d0d3fac6
3 changed files with 4 additions and 3 deletions

View File

@ -7,7 +7,7 @@ plugins {
} }
group = "scientifik" group = "scientifik"
version = "0.1.8-dev" version = "0.1.8"
repositories { repositories {
gradlePluginPortal() gradlePluginPortal()

View File

@ -2,8 +2,8 @@
* Build constants * Build constants
*/ */
object Scientifik { object Scientifik {
const val ioVersion = "0.1.14" const val ioVersion = "0.1.15"
const val coroutinesVersion = "1.3.1" const val coroutinesVersion = "1.3.2"
const val atomicfuVersion = "0.12.11" const val atomicfuVersion = "0.12.11"
const val serializationVersion = "0.13.0" const val serializationVersion = "0.13.0"
} }

View File

@ -19,5 +19,6 @@ internal fun RepositoryHandler.applyRepos(): Unit{
maven("https://kotlin.bintray.com/kotlinx") maven("https://kotlin.bintray.com/kotlinx")
maven("https://dl.bintray.com/mipt-npm/scientifik") maven("https://dl.bintray.com/mipt-npm/scientifik")
maven("https://dl.bintray.com/mipt-npm/dev") maven("https://dl.bintray.com/mipt-npm/dev")
maven("https://kotlin.bintray.com/kotlin-js-wrappers/")
maven("https://dl.bintray.com/mipt-npm/dataforge") maven("https://dl.bintray.com/mipt-npm/dataforge")
} }