diff --git a/build.gradle b/build.gradle index b380986..cc85750 100644 --- a/build.gradle +++ b/build.gradle @@ -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" } } diff --git a/gradle.properties b/gradle.properties index 23339e0..d4829a4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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 diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index 2782875..af8c7ea 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -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