wbrawner/pihelper-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix KMP setup for iOS

Browse source
This commit is contained in:
William Brawner 2020-12-24 08:26:33 -07:00
parent f155bdfa42
commit b4c7400a9b
3 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.gradle
View file

@ -1,5 +1,5 @@
buildscript {
ext.kotlin_version = '1.4.10'
ext.kotlin_version = '1.4.20'
ext.coroutines_version = '1.3.2'
ext.koin_version = '2.0.1'
ext.okhttp_version = '4.2.2'
@ -9,7 +9,7 @@ buildscript {
maven { url "https://kotlin.bintray.com/kotlinx" }
}
dependencies {
classpath 'com.android.tools.build:gradle:3.6.2'
classpath 'com.android.tools.build:gradle:4.1.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}

3
gradle.properties
View file

@ -19,3 +19,6 @@ android.useAndroidX=true
android.enableJetifier=true
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
kotlin.incremental.multiplatform=true
kotlin.mpp.stability.nowarn=true
xcodeproj=../Pi-Helper

14
shared/build.gradle.kts
View file

@ -15,21 +15,21 @@ repositories {
jcenter()
mavenCentral()
}
val ktor_version = "+"
kotlin {
android()
ios {
binaries {
framework {
baseName = "shared"
baseName = "pihelper"
}
}
}
sourceSets {
val commonMain by getting {
dependencies {
implementation("io.ktor:ktor-client-core:$ktor_version")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:+")
implementation("io.ktor:ktor-client-core:1.4.2")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.1")
implementation("io.ktor:ktor-client-serialization:1.4.2")
}
}
val commonTest by getting {
@ -41,8 +41,7 @@ kotlin {
val androidMain by getting {
dependencies {
implementation("com.google.android.material:material:1.2.0")
implementation("io.ktor:ktor-client-serialization-jvm:$ktor_version")
api("io.ktor:ktor-client-android:$ktor_version")
api("io.ktor:ktor-client-android:1.4.2")
}
}
val androidTest by getting {
@ -53,8 +52,7 @@ kotlin {
}
val iosMain by getting {
dependencies {
implementation("io.ktor:ktor-client-ios:$ktor_version")
implementation("io.ktor:ktor-client-serialization-native:$ktor_version")
implementation("io.ktor:ktor-client-ios:1.4.2")
}
}
val iosTest by getting