From c843ea5122921238932abf12bfdf3493f892744b Mon Sep 17 00:00:00 2001
From: Ugljesa Jovanovic <ugljesa.jovanovic@ionspin.com>
Date: Fri, 7 Oct 2022 20:00:59 +0200
Subject: [PATCH] Remove test dependencies from jvm main, clean up runners

---
 .../build.gradle.kts                                  |  2 --
 sample/build.gradle.kts                               |  1 +
 .../kotlin/com/ionspin/kotlin/crypto/sample/Runner.kt | 11 ++---------
 .../kotlin/com/ionspin/kotlin/crypto/sample/Runner.kt |  4 ----
 .../kotlin/com/ionspin/kotlin/crypto/sample/Runner.kt |  3 ---
 sample/src/nativeMain/kotlin/Runner.kt                |  7 ++++---
 6 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/multiplatform-crypto-libsodium-bindings/build.gradle.kts b/multiplatform-crypto-libsodium-bindings/build.gradle.kts
index 2efa395..fb14645 100644
--- a/multiplatform-crypto-libsodium-bindings/build.gradle.kts
+++ b/multiplatform-crypto-libsodium-bindings/build.gradle.kts
@@ -566,8 +566,6 @@ kotlin {
             kotlin.srcDirs("src/jvmSpecific", "src/jvmMain/kotlin")
             dependencies {
                 implementation(kotlin(Deps.Jvm.stdLib))
-                implementation(kotlin(Deps.Jvm.test))
-                implementation(kotlin(Deps.Jvm.testJUnit))
 
                 implementation(Deps.Jvm.resourceLoader)
 
diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
index b26e5c5..7aae6fc 100644
--- a/sample/build.gradle.kts
+++ b/sample/build.gradle.kts
@@ -184,6 +184,7 @@ kotlin {
                 implementation(kotlin(Deps.Common.stdLib))
                 implementation(kotlin(Deps.Common.test))
                 implementation(Deps.Common.serialization)
+//                api(Deps.Common.libsodiumBindings)
                 api(project(":multiplatform-crypto-libsodium-bindings"))
                 implementation(Deps.Common.coroutines)
             }
diff --git a/sample/src/linuxArm32HfpMain/kotlin/com/ionspin/kotlin/crypto/sample/Runner.kt b/sample/src/linuxArm32HfpMain/kotlin/com/ionspin/kotlin/crypto/sample/Runner.kt
index 2c1979b..3343ed0 100644
--- a/sample/src/linuxArm32HfpMain/kotlin/com/ionspin/kotlin/crypto/sample/Runner.kt
+++ b/sample/src/linuxArm32HfpMain/kotlin/com/ionspin/kotlin/crypto/sample/Runner.kt
@@ -1,12 +1,5 @@
-import com.ionspin.kotlin.crypto.hash.blake2b.Blake2bDelegated
-import kotlin.time.ExperimentalTime
-import kotlin.time.measureTime
-
-@ExperimentalTime
+import com.ionspin.kotlin.crypto.sample.Sample
 
 fun main() {
-    println("Test")
-//    Blake
-    val blake = Blake2bDelegated()
-    blake.digest()
+    Sample.runSample()
 }
diff --git a/sample/src/linuxArm64Main/kotlin/com/ionspin/kotlin/crypto/sample/Runner.kt b/sample/src/linuxArm64Main/kotlin/com/ionspin/kotlin/crypto/sample/Runner.kt
index bdb06de..3343ed0 100644
--- a/sample/src/linuxArm64Main/kotlin/com/ionspin/kotlin/crypto/sample/Runner.kt
+++ b/sample/src/linuxArm64Main/kotlin/com/ionspin/kotlin/crypto/sample/Runner.kt
@@ -1,9 +1,5 @@
 import com.ionspin.kotlin.crypto.sample.Sample
-import kotlin.time.ExperimentalTime
 
-@ExperimentalTime
 fun main() {
-
     Sample.runSample()
-
 }
diff --git a/sample/src/macosX64Main/kotlin/com/ionspin/kotlin/crypto/sample/Runner.kt b/sample/src/macosX64Main/kotlin/com/ionspin/kotlin/crypto/sample/Runner.kt
index 04d9122..3343ed0 100644
--- a/sample/src/macosX64Main/kotlin/com/ionspin/kotlin/crypto/sample/Runner.kt
+++ b/sample/src/macosX64Main/kotlin/com/ionspin/kotlin/crypto/sample/Runner.kt
@@ -1,7 +1,4 @@
 import com.ionspin.kotlin.crypto.sample.Sample
-import kotlin.time.ExperimentalTime
-
-@ExperimentalTime
 
 fun main() {
     Sample.runSample()
diff --git a/sample/src/nativeMain/kotlin/Runner.kt b/sample/src/nativeMain/kotlin/Runner.kt
index 5520d1b..f79d706 100644
--- a/sample/src/nativeMain/kotlin/Runner.kt
+++ b/sample/src/nativeMain/kotlin/Runner.kt
@@ -1,5 +1,6 @@
 import com.ionspin.kotlin.crypto.sample.Sample
 
-fun main() : Unit {
-    Sample.runSample()
-}
+// Clashes with platform specific main()
+//fun main() : Unit {
+//    Sample.runSample()
+//}