diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eb018e8..c1e6426 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,7 +30,8 @@ buildMac: stage: build when: manual allow_failure: false - script: echo TEST_PULL_REQUEST_MAC + script: + - ./macBuild.sh tags: - macos buildWindows: diff --git a/README.md b/README.md index 92df90e..3b65475 100644 --- a/README.md +++ b/README.md @@ -138,6 +138,7 @@ Currently supported native platforms: - Complete the bindings list - Samples - Android testing +- Fix browser testing, both locally and in CI/CD diff --git a/buildSrc/src/main/kotlin/Utils.kt b/buildSrc/src/main/kotlin/Utils.kt index 719f874..ff092c9 100644 --- a/buildSrc/src/main/kotlin/Utils.kt +++ b/buildSrc/src/main/kotlin/Utils.kt @@ -37,6 +37,8 @@ fun getHostArchitecture(): String { return resolvedArch } + + fun KotlinMultiplatformExtension.isRunningInIdea(block: KotlinMultiplatformExtension.() -> Unit) { if (isInIdea()) { block(this) @@ -109,4 +111,4 @@ fun NamedDomainObjectContainer.createWorkaroundNativeMainSource } } -} \ No newline at end of file +} diff --git a/multiplatform-crypto-libsodium-bindings/build.gradle.kts b/multiplatform-crypto-libsodium-bindings/build.gradle.kts index db6e92a..f91c1bd 100644 --- a/multiplatform-crypto-libsodium-bindings/build.gradle.kts +++ b/multiplatform-crypto-libsodium-bindings/build.gradle.kts @@ -57,7 +57,6 @@ version = ReleaseInfo.version val ideaActive = isInIdea() println("Idea active: $ideaActive") - android { compileSdkVersion(29) defaultConfig { @@ -75,6 +74,7 @@ android { } + kotlin { val hostOsName = getHostOsName() runningOnLinuxx86_64 { diff --git a/multiplatform-crypto-libsodium-bindings/src/commonTest/kotlin/com/ionspin/kotlin/crypto/util/LibsodiumUtilTest.kt b/multiplatform-crypto-libsodium-bindings/src/commonTest/kotlin/com/ionspin/kotlin/crypto/util/LibsodiumUtilTest.kt index 52b97f9..ed6ec89 100644 --- a/multiplatform-crypto-libsodium-bindings/src/commonTest/kotlin/com/ionspin/kotlin/crypto/util/LibsodiumUtilTest.kt +++ b/multiplatform-crypto-libsodium-bindings/src/commonTest/kotlin/com/ionspin/kotlin/crypto/util/LibsodiumUtilTest.kt @@ -78,7 +78,9 @@ class LibsodiumUtilTest { val input = ubyteArrayOf(1U, 2U) val blocksize = 2 val padded = LibsodiumUtil.pad(input, blocksize) + val expected = ubyteArrayOf(1U, 2U, 0x80U, 0x00U) println(padded.hexColumsPrint()) + assertTrue { padded.contentEquals(expected) } val unpadded = LibsodiumUtil.unpad(padded, blocksize) println(unpadded.hexColumsPrint()) @@ -94,7 +96,9 @@ class LibsodiumUtilTest { val input = ubyteArrayOf(1U, 2U, 3U, 4U, 5U, 6U) val blocksize = 4 val padded = LibsodiumUtil.pad(input, blocksize) + val expected = ubyteArrayOf(1U, 2U, 3U, 4U, 5U, 6U, 0x80U, 0x00U) println(padded.hexColumsPrint()) + assertTrue { padded.contentEquals(expected) } val unpadded = LibsodiumUtil.unpad(padded, blocksize) println(unpadded.hexColumsPrint())