Merge branch 'dev' into feature/dynamic-ops-currying

# Conflicts:
#	kmath-core/src/commonMain/kotlin/kscience/kmath/operations/Algebra.kt
This commit is contained in:
Iaroslav Postovalov 2020-12-20 20:42:01 +07:00
commit b8e9a7d327
No known key found for this signature in database
GPG Key ID: 46E15E4A31B3BCD7

View File

@ -8,8 +8,8 @@ pluginManagement {
maven("https://dl.bintray.com/kotlin/kotlinx") maven("https://dl.bintray.com/kotlin/kotlinx")
} }
val toolsVersion = "0.7.0" val toolsVersion = "0.7.1"
val kotlinVersion = "1.4.20" val kotlinVersion = "1.4.21"
plugins { plugins {
id("kotlinx.benchmark") version "0.2.0-dev-20" id("kotlinx.benchmark") version "0.2.0-dev-20"