1.4 preparation

.gitignore

@@ -7,7 +7,6 @@
 build/
 /captures
 /multiplatform-crypto/node_modules
-gradle.properties
 /buildSrc/out
 /multiplatform-crypto/package.json
 /multiplatform-crypto/package-lock.json

build.gradle.kts

@@ -39,6 +39,7 @@ allprojects {
         mavenCentral()
         google()
         maven ("https://kotlin.bintray.com/kotlinx")
+        maven ("https://dl.bintray.com/kotlin/kotlin-eap")
         jcenter()
         maven {
             url = uri("https://oss.sonatype.org/content/repositories/snapshots")

buildSrc/src/main/kotlin/Deps.kt

@@ -15,9 +15,10 @@
  */
 
 object Versions {
-    val kotlinCoroutines = "1.3.6"
-    val kotlin = "1.3.72"
-    val kotlinSerialization = "0.20.0"
+    val kotlinCoroutines = "1.3.5-native-mt-1.4-M1"
+    val kotlin = "1.4-M1"
+    val kotlinSerialization = "0.20.0-1.4-M1"
+    val atomicfu = "0.14.2-1.4-M1"
     val nodePlugin = "1.3.0"
     val dokkaPlugin = "0.9.18"
 
@@ -34,6 +35,7 @@ object Deps {
         val testAnnotation = "test-annotations-common"
         val coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-core-common:${Versions.kotlinCoroutines}"
         val serialization = "org.jetbrains.kotlinx:kotlinx-serialization-runtime-common:${Versions.kotlinSerialization}"
+        val atomicfu = "org.jetbrains.kotlinx:atomicfu:${Versions.atomicfu}"
 
 
         val kotlinBigNum = "com.ionspin.kotlin:bignum:${Versions.kotlinBigNumVersion}"

gradle.properties

@@ -0,0 +1,23 @@
+#
+#    Copyright 2019 Ugljesa Jovanovic
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+org.gradle.parallel=true
+
+kotlin.code.style=official
+
+kotlin.js.compiler=both
+kotlin.mpp.enableGranularSourceSetsMetadata=true
+
+org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=4096m

multiplatform-crypto/build.gradle.kts

@@ -109,19 +109,20 @@ kotlin {
                 }
             }
         }
-        linuxArm32Hfp() {
-            binaries {
-                staticLib {
-                }
-            }
-        }
-
-        linuxArm64() {
-            binaries {
-                staticLib {
-                }
-            }
-        }
+        //Not supported in coroutines at the moment
+//        linuxArm32Hfp() {
+//            binaries {
+//                staticLib {
+//                }
+//            }
+//        }
+        //Not supported in coroutines at the moment
+//        linuxArm64() {
+//            binaries {
+//                staticLib {
+//                }
+//            }
+//        }
 
     }
 
@@ -197,11 +198,17 @@ kotlin {
         val nativeMain = if (ideaActive) {
             val nativeMain by getting {
                 dependsOn(commonMain)
+                dependencies {
+                    implementation(Deps.Native.coroutines)
+                }
             }
             nativeMain
         } else {
             val nativeMain by creating {
                 dependsOn(commonMain)
+                dependencies {
+                    implementation(Deps.Native.coroutines)
+                }
             }
             nativeMain
         }
@@ -258,22 +265,22 @@ kotlin {
             val linuxTest by getting {
                 dependsOn(nativeTest)
             }
+            //Not supported in coroutines at the moment
+//            val linuxArm32HfpMain by getting {
+//                dependsOn(nativeMain)
+//            }
+//
+//            val linuxArm32HfpTest by getting {
+//                dependsOn(nativeTest)
+//            }
 
-            val linuxArm32HfpMain by getting {
-                dependsOn(nativeMain)
-            }
-
-            val linuxArm32HfpTest by getting {
-                dependsOn(nativeTest)
-            }
-
-            val linuxArm64Main by getting {
-                dependsOn(nativeMain)
-            }
-
-            val linuxArm64Test by getting {
-                dependsOn(nativeTest)
-            }
+//            val linuxArm64Main by getting {
+//                dependsOn(nativeMain)
+//            }
+//
+//            val linuxArm64Test by getting {
+//                dependsOn(nativeTest)
+//            }
 
         }
 
@@ -393,7 +400,7 @@ tasks {
             }
         }
 
-        val jsNodeTest by getting(KotlinJsTest::class) {
+        val jsIrNodeTest by getting(KotlinJsTest::class) {
 
             testLogging {
                 events("PASSED", "FAILED", "SKIPPED")
@@ -401,13 +408,12 @@ tasks {
             }
         }
 
-        //    val jsBrowserTest by getting(KotlinJsTest::class) {
-//
-//        testLogging {
-//            events("PASSED", "FAILED", "SKIPPED")
-//             showStandardStreams = true
+//        val jsIrBrowserTest by getting(KotlinJsTest::class) {
+//            testLogging {
+//                events("PASSED", "FAILED", "SKIPPED")
+//                 showStandardStreams = true
+//            }
 //        }
-//    }
     }
 
     if (getHostOsName() == "windows") {