Remove static android libs, extract jvm from linux only block as it will be ran on mac and win as well

This commit is contained in:
Ugljesa Jovanovic 2021-02-20 21:13:48 +01:00
parent bccf9e82f2
commit f41a66c4d8
No known key found for this signature in database
GPG Key ID: 178E6DFCECCB0E0F
6 changed files with 22 additions and 21 deletions

View File

@ -80,9 +80,10 @@ android {
kotlin {
val hostOsName = getHostOsName()
android()
jvm()
runningOnLinuxx86_64 {
println("Configuring Linux X86-64 targets")
jvm()
js(IR) {
browser {
testTask {
@ -458,30 +459,30 @@ kotlin {
}
}
val jvmMain by getting {
kotlin.srcDirs("src/jvmSpecific", "src/jvmMain/kotlin")
dependencies {
implementation(kotlin(Deps.Jvm.stdLib))
implementation(kotlin(Deps.Jvm.test))
implementation(kotlin(Deps.Jvm.testJUnit))
implementation(Deps.Jvm.resourceLoader)
//lazysodium
implementation(Deps.Jvm.Delegated.lazysodium)
implementation(Deps.Jvm.Delegated.jna)
}
}
val jvmTest by getting {
dependencies {
implementation(kotlin(Deps.Jvm.test))
implementation(kotlin(Deps.Jvm.testJUnit))
implementation(kotlin(Deps.Jvm.reflection))
}
}
runningOnLinuxx86_64 {
println("Configuring Linux 64 Bit source sets")
val jvmMain by getting {
kotlin.srcDirs("src/jvmSpecific", "src/jvmMain/kotlin")
dependencies {
implementation(kotlin(Deps.Jvm.stdLib))
implementation(kotlin(Deps.Jvm.test))
implementation(kotlin(Deps.Jvm.testJUnit))
implementation(Deps.Jvm.resourceLoader)
//lazysodium
implementation(Deps.Jvm.Delegated.lazysodium)
implementation(Deps.Jvm.Delegated.jna)
}
}
val jvmTest by getting {
dependencies {
implementation(kotlin(Deps.Jvm.test))
implementation(kotlin(Deps.Jvm.testJUnit))
implementation(kotlin(Deps.Jvm.reflection))
}
}
val jsMain by getting {