Finishing migration to 1.4.20-M1

Author: altavir

build.gradle.kts

@@ -2,13 +2,14 @@ plugins {
     id("ru.mipt.npm.project")
 }
 
-val kmathVersion by extra("0.2.0-dev-1")
+val kmathVersion by extra("0.2.0-dev-2")
 val bintrayRepo by extra("kscience")
 val githubProject by extra("kmath")
 
 allprojects {
     repositories {
         jcenter()
+        maven("https://dl.bintray.com/kotlin/kotlin-eap")
         maven("https://dl.bintray.com/kotlin/kotlinx")
         maven("https://dl.bintray.com/hotkeytlt/maven")
     }

docs/templates/ARTIFACT-TEMPLATE.md

@@ -10,9 +10,11 @@
 >
 > ```gradle
 > repositories {
+>     maven { url "https://dl.bintray.com/kotlin/kotlin-eap" }
 >     maven { url 'https://dl.bintray.com/mipt-npm/kscience' }
 >     maven { url 'https://dl.bintray.com/mipt-npm/dev' }
 >     maven { url 'https://dl.bintray.com/hotkeytlt/maven' }
+
 > }
 > 
 > dependencies {
@@ -23,6 +25,7 @@
 >
 > ```kotlin
 > repositories {
+>     maven("https://dl.bintray.com/kotlin/kotlin-eap")
 >     maven("https://dl.bintray.com/mipt-npm/kscience")
 >     maven("https://dl.bintray.com/mipt-npm/dev")
 >     maven("https://dl.bintray.com/hotkeytlt/maven")

examples/build.gradle.kts

@@ -3,8 +3,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins {
     java
     kotlin("jvm")
-    kotlin("plugin.allopen") version "1.4.20-dev-3898-14"
-    id("kotlinx.benchmark") version "0.2.0-dev-20"
+    kotlin("plugin.allopen")
+    id("kotlinx.benchmark")
 }
 
 allOpen.annotation("org.openjdk.jmh.annotations.State")
@@ -26,17 +26,16 @@ dependencies {
     implementation(project(":kmath-prob"))
     implementation(project(":kmath-viktor"))
     implementation(project(":kmath-dimensions"))
-    implementation("org.jetbrains.kotlinx:kotlinx-io-jvm:0.2.0-npm-dev-6")
+    implementation("org.jetbrains.kotlinx:kotlinx-io:0.2.0-npm-dev-11")
     implementation("org.jetbrains.kotlinx:kotlinx.benchmark.runtime:0.2.0-dev-20")
     "benchmarksCompile"(sourceSets.main.get().output + sourceSets.main.get().compileClasspath) //sourceSets.main.output + sourceSets.main.runtimeClasspath
 }
 
 // Configure benchmark
 benchmark {
     // Setup configurations
-    targets
-        // This one matches sourceSet name above
-        .register("benchmarks")
+    targets.register("benchmarks")
+    // This one matches sourceSet name above
 
     configurations.register("fast") {
         warmups = 5 // number of warmup iterations

kmath-dimensions/build.gradle.kts

@@ -1,4 +1,7 @@
-plugins { id("ru.mipt.npm.mpp") }
+plugins {
+    id("ru.mipt.npm.mpp")
+    id("ru.mipt.npm.native")
+}
 
 description = "A proof of concept module for adding type-safe dimensions to structures"
 

…/kotlin/kscience/kmath/dimensions/dim.kt …otlin/kscience/kmath/dimensions/dimJs.ktkmath-dimensions/src/jsMain/kotlin/kscience/kmath/dimensions/dim.kt renamed to kmath-dimensions/src/jsMain/kotlin/kscience/kmath/dimensions/dimJs.kt kmath-dimensions/src/jsMain/kotlin/kscience/kmath/dimensions/dim.kt renamed to kmath-dimensions/src/jsMain/kotlin/kscience/kmath/dimensions/dimJs.kt

@@ -0,0 +1,20 @@
+package kscience.kmath.dimensions
+
+import kotlin.native.concurrent.ThreadLocal
+import kotlin.reflect.KClass
+
+@ThreadLocal
+private val dimensionMap: MutableMap<UInt, Dimension> = hashMapOf(1u to D1, 2u to D2, 3u to D3)
+
+@Suppress("UNCHECKED_CAST")
+public actual fun <D : Dimension> Dimension.Companion.resolve(type: KClass<D>): D = dimensionMap
+    .entries
+    .map(MutableMap.MutableEntry<UInt, Dimension>::value)
+    .find { it::class == type } as? D
+    ?: error("Can't resolve dimension $type")
+
+public actual fun Dimension.Companion.of(dim: UInt): Dimension = dimensionMap.getOrPut(dim) {
+    object : Dimension {
+        override val dim: UInt get() = dim
+    }
+}

…/kotlin/kscience/kmath/dimensions/dim.kt …tlin/kscience/kmath/dimensions/dimJvm.ktkmath-dimensions/src/jvmMain/kotlin/kscience/kmath/dimensions/dim.kt renamed to kmath-dimensions/src/jvmMain/kotlin/kscience/kmath/dimensions/dimJvm.kt kmath-dimensions/src/jvmMain/kotlin/kscience/kmath/dimensions/dim.kt renamed to kmath-dimensions/src/jvmMain/kotlin/kscience/kmath/dimensions/dimJvm.kt

@@ -10,15 +10,17 @@ pluginManagement {
         maven("https://dl.bintray.com/kotlin/kotlin-dev/")
     }
 
-    val toolsVersion = "0.6.1"
+    val toolsVersion = "0.6.1-dev-1.4.20-M1"
+    val kotlinVersion = "1.4.20-M1"
 
     plugins {
         id("kotlinx.benchmark") version "0.2.0-dev-20"
         id("ru.mipt.npm.project") version toolsVersion
         id("ru.mipt.npm.mpp") version toolsVersion
         id("ru.mipt.npm.jvm") version toolsVersion
         id("ru.mipt.npm.publish") version toolsVersion
-        kotlin("plugin.allopen")
+        kotlin("jvm")  version kotlinVersion
+        kotlin("plugin.allopen") version kotlinVersion
     }
 }