From 428675d86660ab56230cca557cb569cc3d5e66e7 Mon Sep 17 00:00:00 2001 From: psuzn Date: Mon, 11 Dec 2023 20:13:59 +0545 Subject: [PATCH] dependencies version upgrade --- androidApp/build.gradle.kts | 2 +- buildSrc/src/main/kotlin/Versions.kt | 12 ++++++------ gradle/wrapper/gradle-wrapper.properties | 3 ++- shared/build.gradle.kts | 12 +++++++----- .../playdeals/common/utils/isDebugBuild.kt | 3 +++ 5 files changed, 19 insertions(+), 13 deletions(-) diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts index 00713e9..3dd7dec 100644 --- a/androidApp/build.gradle.kts +++ b/androidApp/build.gradle.kts @@ -14,7 +14,7 @@ kotlin { implementation("androidx.activity:activity-compose:1.8.1") implementation("androidx.core:core-ktx:1.12.0") - implementation(platform("com.google.firebase:firebase-bom:${Versions.FIREBASE_BOM}")) + implementation(project.dependencies.platform("com.google.firebase:firebase-bom:${Versions.FIREBASE_BOM}")) implementation("com.google.firebase:firebase-analytics-ktx") implementation("com.google.firebase:firebase-messaging-ktx") } diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 7380dff..307da76 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,17 +1,17 @@ object Versions { - const val KOTLIN = "1.9.10" - const val AGP = "8.1.1" - const val COMPOSE = "1.5.1" + const val KOTLIN = "1.9.20" + const val AGP = "8.2.0" + const val COMPOSE = "1.5.11" const val SETTINGS = "1.0.0" const val SQLDELIGHT = "2.0.0" const val FIREBASE_BOM = "32.3.1" - const val KTOR = "2.3.5" + const val KTOR = "2.3.6" const val KODE_IN = "7.20.2" const val COROUTINE = "1.7.3" - const val KOTLINX_DATE_TIME = "0.4.0" + const val KOTLINX_DATE_TIME = "0.4.1" const val JUNIT_JUPITER = "5.9.3" - const val MOCKK = "1.13.5" + const val MOCKK = "1.13.8" const val KO_TEST = "5.5.5" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0c85a1f..998b5b0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ +#Thu Dec 07 17:50:32 NPT 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index 000a92e..7cf087b 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -30,11 +30,13 @@ kotlin { androidTarget() jvm("desktop") - ios { configureFramework() } + + iosArm64() { configureFramework() } + iosX64() { configureFramework() } iosSimulatorArm64().configureFramework() sourceSets { - val commonMain by getting { + commonMain { dependencies { implementation(compose.ui) implementation(compose.foundation) @@ -64,7 +66,7 @@ kotlin { } } - val androidMain by getting { + androidMain { dependencies { implementation("io.ktor:ktor-client-android:${Versions.KTOR}") implementation("androidx.appcompat:appcompat:1.6.1") @@ -90,7 +92,7 @@ kotlin { } } - val iosMain by getting { + iosMain { dependencies { implementation("io.ktor:ktor-client-darwin:${Versions.KTOR}") implementation("app.cash.sqldelight:native-driver:${Versions.SQLDELIGHT}") @@ -98,7 +100,7 @@ kotlin { } val iosSimulatorArm64Main by getting { - dependsOn(iosMain) + dependsOn(iosMain.get()) } val desktopMain by getting { diff --git a/shared/src/iosMain/kotlin/me/sujanpoudel/playdeals/common/utils/isDebugBuild.kt b/shared/src/iosMain/kotlin/me/sujanpoudel/playdeals/common/utils/isDebugBuild.kt index bb6c212..ca9a638 100644 --- a/shared/src/iosMain/kotlin/me/sujanpoudel/playdeals/common/utils/isDebugBuild.kt +++ b/shared/src/iosMain/kotlin/me/sujanpoudel/playdeals/common/utils/isDebugBuild.kt @@ -1,4 +1,7 @@ package me.sujanpoudel.playdeals.common.utils +import kotlin.experimental.ExperimentalNativeApi + +//@OptIn(ExperimentalNativeApi::class) actual val isDebugBuild: Boolean get() = Platform.isDebugBinary