YoungBlood/libsodium_wasm_experimental
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert android exclusion, we'll just point sdk to nonexisting folder and that should be enough

Browse Source
This commit is contained in:
Ugljesa Jovanovic 2020-10-07 20:46:24 +02:00
parent 887c52a319
commit 2e71214914
No known key found for this signature in database
GPG Key ID: 178E6DFCECCB0E0F
2 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
buildSrc/src/main/kotlin/Utils.kt
View File

@ -37,11 +37,7 @@ fun getHostArchitecture(): String {
return resolvedArch return resolvedArch
} }
fun rootRunningOnLinuxx86_64(block: () -> Unit) {
if (getHostOsName() == "linux" && getHostArchitecture() == "x86-64") {
block()
}
}
fun KotlinMultiplatformExtension.isRunningInIdea(block: KotlinMultiplatformExtension.() -> Unit) { fun KotlinMultiplatformExtension.isRunningInIdea(block: KotlinMultiplatformExtension.() -> Unit) {
if (isInIdea()) { if (isInIdea()) {

27
multiplatform-crypto-libsodium-bindings/build.gradle.kts
View File

@ -57,25 +57,24 @@ version = ReleaseInfo.version
val ideaActive = isInIdea() val ideaActive = isInIdea()
println("Idea active: $ideaActive") println("Idea active: $ideaActive")
rootRunningOnLinuxx86_64 { android {
android { compileSdkVersion(29)
compileSdkVersion(29) defaultConfig {
defaultConfig { minSdkVersion(24)
minSdkVersion(24) targetSdkVersion(29)
targetSdkVersion(29) versionCode = 1
versionCode = 1 versionName = "1.0"
versionName = "1.0" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" }
} buildTypes {
buildTypes { getByName("release") {
getByName("release") { isMinifyEnabled = false
isMinifyEnabled = false
}
} }
} }
} }
kotlin { kotlin {
val hostOsName = getHostOsName() val hostOsName = getHostOsName()
runningOnLinuxx86_64 { runningOnLinuxx86_64 {