From 14676337fc68a3fc01c4c475d44bec2537f88ea4 Mon Sep 17 00:00:00 2001 From: Ugljesa Jovanovic Date: Wed, 3 Jun 2020 00:18:41 +0200 Subject: [PATCH] Added hash test, fixed idea native cinterop resolution --- multiplatform-crypto-delegated/build.gradle.kts | 8 +++++--- .../kotlin/com/ionspin/kotlin/crypto/sample/Runner.kt | 2 ++ .../kotlin/com/ionspin/kotlin/crypto/sample/Runner.kt | 3 +++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/multiplatform-crypto-delegated/build.gradle.kts b/multiplatform-crypto-delegated/build.gradle.kts index 2fb4cdd..984c693 100644 --- a/multiplatform-crypto-delegated/build.gradle.kts +++ b/multiplatform-crypto-delegated/build.gradle.kts @@ -275,6 +275,9 @@ kotlin { val nativeMain by creating { dependsOn(commonMain) + isRunningInIdea { + kotlin.srcDirs() + } dependencies { nativeDependencies(this) } @@ -338,7 +341,7 @@ kotlin { compilations.getByName("main") { if (linux64Bit.contains(this@withType.name)) { - defaultSourceSet.dependsOn(createWorkaroundNativeMainSourceSet(this@withType.name, nativeDependencies)) + defaultSourceSet.dependsOn(nativeMain) } if (linux32Bit.contains(this@withType.name)) { defaultSourceSet.dependsOn(createWorkaround32bitNativeMainSourceSet(this@withType.name, nativeDependencies)) @@ -449,9 +452,8 @@ kotlin { } } val linuxX64Main by getting { - dependsOn(nativeMain) isRunningInIdea { - kotlin.srcDir("src/nativeMain") + kotlin.srcDir("src/nativeMain/kotlin") } } val linuxX64Test by getting { 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 c425dda..ed81077 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,4 +1,5 @@ import com.ionspin.kotlin.crypto.hash.blake2b.Blake2bDelegated +import com.ionspin.kotlin.crypto.hash.blake2b.Blake2bStateless import kotlin.time.ExperimentalTime import kotlin.time.measureTime @@ -9,4 +10,5 @@ fun main() { // Blake val blake = Blake2bDelegated() println("Result ${blake.digest()}") + println("Result: ${Blake2bStateless.digest("test")}") } diff --git a/sample/src/linuxMain/kotlin/com/ionspin/kotlin/crypto/sample/Runner.kt b/sample/src/linuxMain/kotlin/com/ionspin/kotlin/crypto/sample/Runner.kt index bf7b023..c912f71 100644 --- a/sample/src/linuxMain/kotlin/com/ionspin/kotlin/crypto/sample/Runner.kt +++ b/sample/src/linuxMain/kotlin/com/ionspin/kotlin/crypto/sample/Runner.kt @@ -1,4 +1,5 @@ import com.ionspin.kotlin.crypto.hash.blake2b.Blake2bDelegated +import com.ionspin.kotlin.crypto.hash.blake2b.Blake2bStateless import kotlin.time.ExperimentalTime import kotlin.time.measureTime @@ -9,4 +10,6 @@ fun main() { // Blake val blake = Blake2bDelegated() blake.digest() + println("Result: ${Blake2bStateless.digest("test")}") + }