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

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

View File

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

View File

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