0.1.4-dev-4 #86

Merged
altavir merged 38 commits from dev into master 2020-04-30 11:36:59 +03:00
3 changed files with 10 additions and 7 deletions
Showing only changes of commit a1dd71a74b - Show all commits

View File

@ -2,7 +2,7 @@ plugins {
id("scientifik.publish") version "0.4.1" apply false id("scientifik.publish") version "0.4.1" apply false
} }
val kmathVersion by extra("0.1.4-dev-1") val kmathVersion by extra("0.1.4-dev-2")
val bintrayRepo by extra("scientifik") val bintrayRepo by extra("scientifik")
val githubProject by extra("kmath") val githubProject by extra("kmath")

View File

@ -4,7 +4,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins { plugins {
java java
kotlin("jvm") kotlin("jvm")
kotlin("plugin.allopen") version "1.3.61" kotlin("plugin.allopen") version "1.3.71"
id("kotlinx.benchmark") version "0.2.0-dev-7" id("kotlinx.benchmark") version "0.2.0-dev-7"
} }
@ -14,6 +14,8 @@ configure<AllOpenExtension> {
repositories { repositories {
maven("http://dl.bintray.com/kyonifer/maven") maven("http://dl.bintray.com/kyonifer/maven")
maven("https://dl.bintray.com/mipt-npm/scientifik")
maven("https://dl.bintray.com/mipt-npm/dev")
mavenCentral() mavenCentral()
} }
@ -29,7 +31,7 @@ dependencies {
implementation(project(":kmath-viktor")) implementation(project(":kmath-viktor"))
implementation(project(":kmath-dimensions")) implementation(project(":kmath-dimensions"))
implementation("com.kyonifer:koma-core-ejml:0.12") implementation("com.kyonifer:koma-core-ejml:0.12")
implementation("org.jetbrains.kotlinx:kotlinx-io-jvm:${Scientifik.ioVersion}") implementation("org.jetbrains.kotlinx:kotlinx-io-jvm:0.2.0-npm-dev-6")
implementation("org.jetbrains.kotlinx:kotlinx.benchmark.runtime:0.2.0-dev-7") implementation("org.jetbrains.kotlinx:kotlinx.benchmark.runtime:0.2.0-dev-7")
"benchmarksCompile"(sourceSets.main.get().compileClasspath) "benchmarksCompile"(sourceSets.main.get().compileClasspath)
} }

View File

@ -1,10 +1,10 @@
pluginManagement { pluginManagement {
plugins { plugins {
id("scientifik.mpp") version "0.3.1" id("scientifik.mpp") version "0.4.1"
id("scientifik.jvm") version "0.3.1" id("scientifik.jvm") version "0.4.1"
id("scientifik.atomic") version "0.3.1" id("scientifik.atomic") version "0.4.1"
id("scientifik.publish") version "0.3.1" id("scientifik.publish") version "0.4.1"
} }
repositories { repositories {
@ -13,6 +13,7 @@ pluginManagement {
gradlePluginPortal() gradlePluginPortal()
maven("https://dl.bintray.com/kotlin/kotlin-eap") maven("https://dl.bintray.com/kotlin/kotlin-eap")
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/kotlin/kotlinx") maven("https://dl.bintray.com/kotlin/kotlinx")
} }