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

This commit is contained in:
Ugljesa Jovanovic committed 2020-10-07 20:46:24 +02:00
1 parent 887c52a319
commit 2e71214914
2 files changed
+3 -8

No files matched your search

+1 -5
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()) {
@@ -57,8 +57,7 @@ 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)
@@ -72,10 +71,10 @@ rootRunningOnLinuxx86_64 {
isMinifyEnabled = false isMinifyEnabled = false
} }
} }
}
} }
kotlin { kotlin {
val hostOsName = getHostOsName() val hostOsName = getHostOsName()
runningOnLinuxx86_64 { runningOnLinuxx86_64 {