From 137fe3fe625271446325d08629208bb28b653bad Mon Sep 17 00:00:00 2001
From: Ugljesa Jovanovic <ionspinf@gmail.com>
Date: Sat, 30 May 2020 00:33:31 +0200
Subject: [PATCH] Working linux x64, macosx64 and mingwx64 builds with
 libsodium, cleaned up api build.grade, extracted version name and group

---
 buildSrc/src/main/kotlin/Deps.kt              |  5 ++
 multiplatform-crypto-api/build.gradle.kts     | 55 +++++++++----------
 .../build.gradle.kts                          |  4 +-
 multiplatform-crypto/build.gradle.kts         |  4 +-
 4 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/buildSrc/src/main/kotlin/Deps.kt b/buildSrc/src/main/kotlin/Deps.kt
index 490a656..dc6c1aa 100644
--- a/buildSrc/src/main/kotlin/Deps.kt
+++ b/buildSrc/src/main/kotlin/Deps.kt
@@ -27,6 +27,11 @@ object Versions {
 
 }
 
+object Published {
+    val group = "com.ionspin.kotlin"
+    val version = "0.0.5-SNAPSHOT"
+}
+
 object Deps {
 
     object Common {
diff --git a/multiplatform-crypto-api/build.gradle.kts b/multiplatform-crypto-api/build.gradle.kts
index 0f5ad6d..ad90709 100644
--- a/multiplatform-crypto-api/build.gradle.kts
+++ b/multiplatform-crypto-api/build.gradle.kts
@@ -17,9 +17,8 @@
 
 @file:Suppress("UnstableApiUsage")
 
-import org.gradle.api.tasks.testing.logging.TestLogging
-import org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeTest
 import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest
+import org.jetbrains.kotlin.gradle.targets.native.tasks.KotlinNativeTest
 import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile
 
 plugins {
@@ -34,8 +33,8 @@ repositories {
     jcenter()
 
 }
-group = "com.ionspin.kotlin"
-version = "0.0.4-SNAPSHOT"
+group = Published.group
+version = Published.version
 
 val ideaActive = System.getProperty("idea.active") == "true"
 
@@ -90,19 +89,19 @@ kotlin {
             }
         }
         //Not supported in coroutines at the moment
-//        linuxArm32Hfp() {
-//            binaries {
-//                staticLib {
-//                }
-//            }
-//        }
+        linuxArm32Hfp() {
+            binaries {
+                staticLib {
+                }
+            }
+        }
         //Not supported in coroutines at the moment
-//        linuxArm64() {
-//            binaries {
-//                staticLib {
-//                }
-//            }
-//        }
+        linuxArm64() {
+            binaries {
+                staticLib {
+                }
+            }
+        }
 
     }
 
@@ -146,15 +145,17 @@ kotlin {
                 }
             }
         }
+
+        mingwX86() {
+            binaries {
+                staticLib {
+
+                }
+            }
+        }
     }
-// No coroutines support for mingwX86
-//    mingwX86() {
-//        binaries {
-//            staticLib {
-//
-//            }
-//        }
-//    }
+
+
 
 
     println(targets.names)
@@ -179,26 +180,22 @@ kotlin {
                     implementation(kotlin(Deps.Jvm.stdLib))
                     implementation(kotlin(Deps.Jvm.test))
                     implementation(kotlin(Deps.Jvm.testJUnit))
-                    implementation(Deps.Jvm.coroutinesCore)
                 }
             }
             val jvmTest by getting {
                 dependencies {
                     implementation(kotlin(Deps.Jvm.test))
                     implementation(kotlin(Deps.Jvm.testJUnit))
-                    implementation(Deps.Jvm.coroutinesTest)
                     implementation(kotlin(Deps.Jvm.reflection))
                 }
             }
             val jsMain by getting {
                 dependencies {
                     implementation(kotlin(Deps.Js.stdLib))
-                    implementation(Deps.Js.coroutines)
                 }
             }
             val jsTest by getting {
                 dependencies {
-                    implementation(Deps.Js.coroutines)
                     implementation(kotlin(Deps.Js.test))
                 }
             }
@@ -213,8 +210,6 @@ kotlin {
 }
 
 tasks {
-
-
     create<Jar>("javadocJar") {
         dependsOn(dokka)
         archiveClassifier.set("javadoc")
diff --git a/multiplatform-crypto-delegated/build.gradle.kts b/multiplatform-crypto-delegated/build.gradle.kts
index 7443727..9360d88 100644
--- a/multiplatform-crypto-delegated/build.gradle.kts
+++ b/multiplatform-crypto-delegated/build.gradle.kts
@@ -45,8 +45,8 @@ repositories {
     jcenter()
 
 }
-group = "com.ionspin.kotlin"
-version = "0.0.4-SNAPSHOT"
+group = Published.group
+version = Published.version
 
 val ideaActive = System.getProperty("idea.active") == "true"
 
diff --git a/multiplatform-crypto/build.gradle.kts b/multiplatform-crypto/build.gradle.kts
index 63cb465..e8fab31 100644
--- a/multiplatform-crypto/build.gradle.kts
+++ b/multiplatform-crypto/build.gradle.kts
@@ -42,8 +42,8 @@ repositories {
     jcenter()
 
 }
-group = "com.ionspin.kotlin"
-version = "0.0.4-SNAPSHOT"
+group = Published.group
+version = Published.version
 
 val ideaActive = System.getProperty("idea.active") == "true"