Madeorsk/SpotiFlyer
1
0
Fork 0
mirror of https://github.com/Shabinder/SpotiFlyer.git synced 2024-12-22 20:57:54 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Deps-Update and Build Fixes

Browse Source
This commit is contained in:
shabinder 2021-04-28 21:34:17 +05:30
parent 149c9aceb3
commit 3a30cbcc58
5 changed files with 40 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
buildSrc/buildSrc/src/main/kotlin/Versions.kt
View File

@ -28,7 +28,7 @@ object Versions {
const val ktLint = "10.0.0"
// DI
const val koin = "3.0.1-beta-1"
const val koin = "3.0.1"
// Logger
const val kermit = "0.1.8"
@ -50,6 +50,13 @@ object Versions {
const val targetSdkVersion = 29
const val androidLifecycle = "2.3.0"
}
object HostOS {
// Host OS Properties
private val hostOs = System.getProperty("os.name")
val isMingwX64 = hostOs.startsWith("Windows",true)
val isMac = hostOs.startsWith("Mac",true)
val isLinux = hostOs.startsWith("Linux",true)
}
object Koin {
val core = "io.insert-koin:koin-core:${Versions.koin}"
val test = "io.insert-koin:koin-test:${Versions.koin}"

13
buildSrc/src/main/kotlin/multiplatform-setup-test.gradle.kts
View File

@ -21,6 +21,18 @@ plugins {
}
kotlin {
/*IOS Target Can be only built on Mac*/
if(HostOS.isMac){
val sdkName: String? = System.getenv("SDK_NAME")
val isiOSDevice = sdkName.orEmpty().startsWith("iphoneos")
if (isiOSDevice) {
iosArm64("ios")
} else {
iosX64("ios")
}
}
jvm("desktop").compilations.all {
kotlinOptions {
useIR = true
@ -40,7 +52,6 @@ kotlin {
// nodejs()
binaries.executable()
}
ios()
sourceSets {
named("commonTest") {
dependencies {

21
buildSrc/src/main/kotlin/multiplatform-setup.gradle.kts
View File

@ -23,12 +23,15 @@ plugins {
kotlin {
val sdkName: String? = System.getenv("SDK_NAME")
val isiOSDevice = sdkName.orEmpty().startsWith("iphoneos")
if (isiOSDevice) {
iosArm64("ios")
} else {
iosX64("ios")
/*IOS Target Can be only built on Mac*/
if(HostOS.isMac){
val sdkName: String? = System.getenv("SDK_NAME")
val isiOSDevice = sdkName.orEmpty().startsWith("iphoneos")
if (isiOSDevice) {
iosArm64("ios")
} else {
iosX64("ios")
}
}
jvm("desktop").compilations.all {
@ -50,6 +53,7 @@ kotlin {
// nodejs()
binaries.executable()
}
sourceSets {
named("commonMain") {
dependencies {}
@ -86,6 +90,11 @@ kotlin {
implementation("org.jetbrains:kotlin-react-dom:17.0.1-pre.148-kotlin-1.4.30")
}
}
if(HostOS.isMac){
named("iosMain"){
dependencies { }
}
}
}
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {

1
common/data-models/build.gradle.kts
View File

@ -30,6 +30,5 @@ kotlin {
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3-native-mt")
}
}
val iosMain by getting
}
}

9
common/database/build.gradle.kts
View File

@ -50,10 +50,11 @@ kotlin {
implementation(SqlDelight.jdbcDriver)
}
}
val iosMain by getting {
dependencies {
implementation(SqlDelight.nativeDriver)
if(HostOS.isMac){
val iosMain by getting {
dependencies {
implementation(SqlDelight.nativeDriver)
}
}
}
}