From e6c0d3e40b4847923b6527a32408a54be91ed442 Mon Sep 17 00:00:00 2001 From: Victor Kabata Date: Tue, 11 Jun 2024 12:42:33 +0300 Subject: [PATCH 01/19] Update agp from 7.4.1 to 7.4.2 --- daraja/build.gradle.kts | 6 +++--- gradle/libs.versions.toml | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/daraja/build.gradle.kts b/daraja/build.gradle.kts index f5e9dcda..6e1fc725 100644 --- a/daraja/build.gradle.kts +++ b/daraja/build.gradle.kts @@ -104,7 +104,7 @@ kotlin { } android { - compileSdk = 33 + compileSdk = 34 defaultConfig { minSdk = 21 } @@ -121,12 +121,12 @@ android { getByName("debug") {} getByName("release") { - isMinifyEnabled = false + isMinifyEnabled = true } } } -tasks.withType { +tasks.named("dependencyUpdates").configure { rejectVersionIf { isNonStable(candidate.version) && !isNonStable(currentVersion) } checkForGradleUpdate = true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e9cf3c40..7d684808 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,10 +1,9 @@ [versions] kotlin = "1.9.21" -gradle = "7.4.1" +agp = "7.4.2" ktLint = "11.6.0" detekt = "1.19.0" spotless = "6.2.2" -nativeCocoapod = "1.9.0" dokka = "1.9.10" kover = "0.7.5" mulitplatformSwiftPackage = "2.0.3" @@ -28,8 +27,8 @@ spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } nativeCocoapod = { id = "org.jetbrains.kotlin.native.cocoapods", version.ref = "kotlin" } android-kotlin = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } -android-library = { id = "com.android.library", version.ref = "gradle" } -android-application = { id = "com.android.application", version.ref = "gradle" } +android-library = { id = "com.android.library", version.ref = "agp" } +android-application = { id = "com.android.application", version.ref = "agp" } jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } kotlinX-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" } From 3712e9abb22f8ad527db0d7c9f884c2fa3f0b9f7 Mon Sep 17 00:00:00 2001 From: Victor Kabata Date: Tue, 11 Jun 2024 12:48:21 +0300 Subject: [PATCH 02/19] Update dokka from v1.9.10 to v1.9.20 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7d684808..709291e3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,7 +4,7 @@ agp = "7.4.2" ktLint = "11.6.0" detekt = "1.19.0" spotless = "6.2.2" -dokka = "1.9.10" +dokka = "1.9.20" kover = "0.7.5" mulitplatformSwiftPackage = "2.0.3" gradleVersionUpdate = "0.50.0" From c84dfdb06e2165a6d83dc47cebe26c56d5391650 Mon Sep 17 00:00:00 2001 From: Victor Kabata Date: Tue, 11 Jun 2024 12:49:28 +0300 Subject: [PATCH 03/19] Update gradleVersionUpdate from v0.50.0 to v0.51.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 709291e3..002e77b0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,7 +7,7 @@ spotless = "6.2.2" dokka = "1.9.20" kover = "0.7.5" mulitplatformSwiftPackage = "2.0.3" -gradleVersionUpdate = "0.50.0" +gradleVersionUpdate = "0.51.0" # Kotlin Multiplatform Version kotlinxCoroutines = "1.7.3" From b7fc99210d589458057d17418a1f06099c693a95 Mon Sep 17 00:00:00 2001 From: Victor Kabata Date: Tue, 11 Jun 2024 14:06:26 +0300 Subject: [PATCH 04/19] Update ktor from v2.3.7 to v2.3.11 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 002e77b0..c765103b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,7 +14,7 @@ kotlinxCoroutines = "1.7.3" kotlinxSerializationJson = "1.6.2" kotlinxDateTime = "0.5.0" napier = "2.6.1" -ktor = "2.3.7" +ktor = "2.3.11" kotlinxTestResources = "0.2.2" composeMultiplatform = "1.5.11" cache4k = "0.11.0" # 0.12.0 breaks build From 9d99d1c68ebcb70f8c5945958e73bc326a63de2f Mon Sep 17 00:00:00 2001 From: Victor Kabata Date: Tue, 11 Jun 2024 14:16:11 +0300 Subject: [PATCH 05/19] Update kotlinxDateTime in v0.5.0 to v0.6.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c765103b..c1c395ac 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -12,7 +12,7 @@ gradleVersionUpdate = "0.51.0" # Kotlin Multiplatform Version kotlinxCoroutines = "1.7.3" kotlinxSerializationJson = "1.6.2" -kotlinxDateTime = "0.5.0" +kotlinxDateTime = "0.6.0" napier = "2.6.1" ktor = "2.3.11" kotlinxTestResources = "0.2.2" From 2435cc7780a757815be8f4a0652d10c8df3c7953 Mon Sep 17 00:00:00 2001 From: Victor Kabata Date: Tue, 11 Jun 2024 14:43:05 +0300 Subject: [PATCH 06/19] Update cache4k from v0.11.0 to v0.13.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c1c395ac..f14509b6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -17,7 +17,7 @@ napier = "2.6.1" ktor = "2.3.11" kotlinxTestResources = "0.2.2" composeMultiplatform = "1.5.11" -cache4k = "0.11.0" # 0.12.0 breaks build +cache4k = "0.13.0" # 0.12.0 breaks build mockative = "2.0.1" [plugins] From 61db32aa37584d6a3fd81c05a169a9ffc7732bda Mon Sep 17 00:00:00 2001 From: Victor Kabata Date: Tue, 11 Jun 2024 14:45:59 +0300 Subject: [PATCH 07/19] Update mockative from v2.0.1 to v2.2.2 --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f14509b6..433f3da6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -17,8 +17,8 @@ napier = "2.6.1" ktor = "2.3.11" kotlinxTestResources = "0.2.2" composeMultiplatform = "1.5.11" -cache4k = "0.13.0" # 0.12.0 breaks build -mockative = "2.0.1" +cache4k = "0.13.0" +mockative = "2.2.2" [plugins] ktLint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktLint" } From 212e1b96fe52b021d73f78e80b566716f19dfffd Mon Sep 17 00:00:00 2001 From: Victor Kabata Date: Tue, 11 Jun 2024 16:58:45 +0300 Subject: [PATCH 08/19] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 5017aaa9..50c0f63c 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ app-iOS/Pods app-iOS/app-iOS.xcodeproj/* app-iOS/app-iOS.xcworkspace/* *.plist +.kotlin/ \ No newline at end of file From 2f05b2941ba4445a918636876cd7013fdbbf8009 Mon Sep 17 00:00:00 2001 From: Victor Kabata Date: Tue, 11 Jun 2024 19:16:29 +0300 Subject: [PATCH 09/19] Update kotlinxCoroutines from v1.7.3 to v1.8.1 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 433f3da6..4064bffc 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -10,7 +10,7 @@ mulitplatformSwiftPackage = "2.0.3" gradleVersionUpdate = "0.51.0" # Kotlin Multiplatform Version -kotlinxCoroutines = "1.7.3" +kotlinxCoroutines = "1.8.1" kotlinxSerializationJson = "1.6.2" kotlinxDateTime = "0.6.0" napier = "2.6.1" From 7e2ba5bf388dd501acd7c792652bbd140acde679 Mon Sep 17 00:00:00 2001 From: Victor Kabata Date: Tue, 11 Jun 2024 19:16:53 +0300 Subject: [PATCH 10/19] Update composeMultiplatform from v1.5.11 to v1.6.11 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4064bffc..058dad8e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -16,7 +16,7 @@ kotlinxDateTime = "0.6.0" napier = "2.6.1" ktor = "2.3.11" kotlinxTestResources = "0.2.2" -composeMultiplatform = "1.5.11" +composeMultiplatform = "1.6.11" cache4k = "0.13.0" mockative = "2.2.2" From ed1e66b0799d396fa0d3ad8043e8e6862accccfb Mon Sep 17 00:00:00 2001 From: Victor Kabata Date: Tue, 11 Jun 2024 19:19:56 +0300 Subject: [PATCH 11/19] Update napier from v2.6.1 to v2.7.1 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 058dad8e..e4a054b1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,7 +13,7 @@ gradleVersionUpdate = "0.51.0" kotlinxCoroutines = "1.8.1" kotlinxSerializationJson = "1.6.2" kotlinxDateTime = "0.6.0" -napier = "2.6.1" +napier = "2.7.1" ktor = "2.3.11" kotlinxTestResources = "0.2.2" composeMultiplatform = "1.6.11" From 4eb1b3513df7f15736d5e91dc72ed03eacedc52e Mon Sep 17 00:00:00 2001 From: Victor Kabata Date: Wed, 12 Jun 2024 10:03:12 +0300 Subject: [PATCH 12/19] Updated kotlin from v1.9.21 to v2.0.0 & added compose compiler plugin --- app-android/build.gradle.kts | 1 + app-desktop/build.gradle.kts | 1 + build.gradle.kts | 1 + daraja/daraja.podspec | 6 +++++- gradle/libs.versions.toml | 5 +++-- 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app-android/build.gradle.kts b/app-android/build.gradle.kts index b1254c85..2cbf6af3 100644 --- a/app-android/build.gradle.kts +++ b/app-android/build.gradle.kts @@ -1,6 +1,7 @@ plugins { alias(libs.plugins.android.application) alias(libs.plugins.android.kotlin) + alias(libs.plugins.compose.compiler) } android { diff --git a/app-desktop/build.gradle.kts b/app-desktop/build.gradle.kts index e9bc8e48..a81edb8c 100644 --- a/app-desktop/build.gradle.kts +++ b/app-desktop/build.gradle.kts @@ -1,6 +1,7 @@ plugins { alias(libs.plugins.jvm) alias(libs.plugins.compose) + alias(libs.plugins.compose.compiler) } repositories { diff --git a/build.gradle.kts b/build.gradle.kts index 1656a8b1..eeb43f99 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,6 +5,7 @@ plugins { alias(libs.plugins.multiplatform) apply false alias(libs.plugins.jvm) apply false alias(libs.plugins.nativeCocoapod) apply false + alias(libs.plugins.compose.compiler) apply false alias(libs.plugins.ktLint) alias(libs.plugins.detekt) diff --git a/daraja/daraja.podspec b/daraja/daraja.podspec index 0e10d72d..a329e110 100644 --- a/daraja/daraja.podspec +++ b/daraja/daraja.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |spec| spec.summary = 'Daraja API Swift Wrapper built using Kotlin Multiplatform' spec.vendored_frameworks = 'build/cocoapods/framework/DarajaMultiplatform.framework' spec.libraries = 'c++' - spec.ios.deployment_target = '14.1' + spec.ios.deployment_target = '14.1' if !Dir.exist?('build/cocoapods/framework/DarajaMultiplatform.framework') || Dir.empty?('build/cocoapods/framework/DarajaMultiplatform.framework') @@ -22,6 +22,10 @@ Pod::Spec.new do |spec| Alternatively, proper pod installation is performed during Gradle sync in the IDE (if Podfile location is set)" end + spec.xcconfig = { + 'ENABLE_USER_SCRIPT_SANDBOXING' => 'NO', + } + spec.pod_target_xcconfig = { 'KOTLIN_PROJECT_PATH' => ':daraja', 'PRODUCT_MODULE_NAME' => 'DarajaMultiplatform', diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e4a054b1..0446bd49 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -kotlin = "1.9.21" +kotlin = "2.0.0" agp = "7.4.2" ktLint = "11.6.0" detekt = "1.19.0" @@ -37,6 +37,7 @@ multiplatformSwiftPackage = { id = "com.chromaticnoise.multiplatform-swiftpackag gradleVersionUpdate = { id = "com.github.ben-manes.versions", version.ref = "gradleVersionUpdate" } compose = { id = "org.jetbrains.compose", version.ref = "composeMultiplatform" } +compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } [libraries] #Kotlin Multiplatform Lib Dependencies @@ -58,4 +59,4 @@ cache4k = { module = "io.github.reactivecircus.cache4k:cache4k", version.ref = " #Tests Lib Dependencies # kotlinX-testResources = { module = "com.goncalossilva:resources", version.ref = "kotlinxTestResources" } kotlinX-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinxCoroutines" } -mockative={module="io.mockative:mockative", version.ref="mockative"} \ No newline at end of file +mockative = { module = "io.mockative:mockative", version.ref = "mockative" } \ No newline at end of file From 4085b8c6f2abf2097fd813d875f1fa952724df46 Mon Sep 17 00:00:00 2001 From: Victor Kabata Date: Wed, 12 Jun 2024 10:56:07 +0300 Subject: [PATCH 13/19] Code clean up --- app-android/build.gradle.kts | 17 ++++++++--------- daraja/build.gradle.kts | 10 +++++----- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/app-android/build.gradle.kts b/app-android/build.gradle.kts index 2cbf6af3..11bc4b8a 100644 --- a/app-android/build.gradle.kts +++ b/app-android/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { alias(libs.plugins.android.application) alias(libs.plugins.android.kotlin) @@ -31,20 +33,17 @@ android { ) } } - compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 - } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() - } buildFeatures { compose = true } - composeOptions { - kotlinCompilerExtensionVersion = "1.5.7" + + kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_17) + } } + packagingOptions { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" diff --git a/daraja/build.gradle.kts b/daraja/build.gradle.kts index 6e1fc725..7c007272 100644 --- a/daraja/build.gradle.kts +++ b/daraja/build.gradle.kts @@ -46,6 +46,10 @@ kotlin { iosArm64() iosSimulatorArm64() + jvm() + + // js() + cocoapods { summary = "Daraja API Swift Wrapper built using Kotlin Multiplatform" homepage = "https://github.com/VictorKabata/DarajaMultiplatform.git" @@ -57,10 +61,6 @@ kotlin { } } - jvm() - - // js() - sourceSets { sourceSets["commonMain"].dependencies { implementation(libs.kotlinX.coroutines) @@ -108,7 +108,7 @@ android { defaultConfig { minSdk = 21 } - namespace = "com.vickikbt.darajakmp" + namespace = "com.vickikbt.darajamultiplatform" compileOptions { sourceCompatibility = JavaVersion.VERSION_17 From 4a58d1451aab1adf3f76d08082bf930a09d1e672 Mon Sep 17 00:00:00 2001 From: Victor Kabata Date: Wed, 12 Jun 2024 11:53:21 +0300 Subject: [PATCH 14/19] Update kover from v0.7.5 to v0.8.1 --- daraja/build.gradle.kts | 21 ++++++++++++++------- gradle/libs.versions.toml | 2 +- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/daraja/build.gradle.kts b/daraja/build.gradle.kts index 7c007272..9b24ca01 100644 --- a/daraja/build.gradle.kts +++ b/daraja/build.gradle.kts @@ -104,11 +104,11 @@ kotlin { } android { - compileSdk = 34 defaultConfig { minSdk = 21 + compileSdk=34 } - namespace = "com.vickikbt.darajamultiplatform" + namespace = "com.vickikbt.darajakmp" compileOptions { sourceCompatibility = JavaVersion.VERSION_17 @@ -151,11 +151,18 @@ val javadocJar = tasks.register("javadocJar") { from(dokkaOutputDir) } -koverReport { - verify { - rule { - isEnabled = false - bound { minValue = 20 } +kover{ + reports{ + verify{ + rule{ + minBound(30) + } + } + + filters{ + excludes{ + classes("*BuildConfig") + } } } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0446bd49..9ce0a6f7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,7 +5,7 @@ ktLint = "11.6.0" detekt = "1.19.0" spotless = "6.2.2" dokka = "1.9.20" -kover = "0.7.5" +kover = "0.8.1" mulitplatformSwiftPackage = "2.0.3" gradleVersionUpdate = "0.51.0" From 0324cb6ddf8c8efcc94d18cc51759423df584f89 Mon Sep 17 00:00:00 2001 From: Victor Kabata Date: Wed, 12 Jun 2024 11:54:28 +0300 Subject: [PATCH 15/19] Linting --- app-android/build.gradle.kts | 2 +- daraja/build.gradle.kts | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app-android/build.gradle.kts b/app-android/build.gradle.kts index 11bc4b8a..21fe5439 100644 --- a/app-android/build.gradle.kts +++ b/app-android/build.gradle.kts @@ -40,7 +40,7 @@ android { kotlin { compilerOptions { - jvmTarget.set(JvmTarget.JVM_17) + jvmTarget.set(JvmTarget.JVM_17) } } diff --git a/daraja/build.gradle.kts b/daraja/build.gradle.kts index 9b24ca01..b4764cbb 100644 --- a/daraja/build.gradle.kts +++ b/daraja/build.gradle.kts @@ -106,7 +106,7 @@ kotlin { android { defaultConfig { minSdk = 21 - compileSdk=34 + compileSdk = 34 } namespace = "com.vickikbt.darajakmp" @@ -151,16 +151,16 @@ val javadocJar = tasks.register("javadocJar") { from(dokkaOutputDir) } -kover{ - reports{ - verify{ - rule{ +kover { + reports { + verify { + rule { minBound(30) } } - filters{ - excludes{ + filters { + excludes { classes("*BuildConfig") } } From 996e66bb825ac4563d95a033d3b972f2c2bc9013 Mon Sep 17 00:00:00 2001 From: Victor Kabata Date: Wed, 12 Jun 2024 12:13:42 +0300 Subject: [PATCH 16/19] Code clean up --- daraja/build.gradle.kts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/daraja/build.gradle.kts b/daraja/build.gradle.kts index b4764cbb..b69f86f6 100644 --- a/daraja/build.gradle.kts +++ b/daraja/build.gradle.kts @@ -252,7 +252,3 @@ multiplatformSwiftPackage { kotlin.sourceSets.all { languageSettings.optIn("kotlin.experimental.ExperimentalObjCName") } - -task("testClasses").doLast { - println("This is a dummy testClasses task") -} From cc0686274090511a40a05dc3db8a9fb20ec91b9c Mon Sep 17 00:00:00 2001 From: Victor Kabata Date: Wed, 12 Jun 2024 12:31:41 +0300 Subject: [PATCH 17/19] Update kotlinxCoroutines from v1.8.1 to v1.9.0-RC --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9ce0a6f7..74a91a31 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -10,7 +10,7 @@ mulitplatformSwiftPackage = "2.0.3" gradleVersionUpdate = "0.51.0" # Kotlin Multiplatform Version -kotlinxCoroutines = "1.8.1" +kotlinxCoroutines = "1.9.0-RC" kotlinxSerializationJson = "1.6.2" kotlinxDateTime = "0.6.0" napier = "2.7.1" From b21a048729236e34f4dc31bbfa7ab825c669d08e Mon Sep 17 00:00:00 2001 From: Victor Kabata Date: Wed, 12 Jun 2024 12:47:17 +0300 Subject: [PATCH 18/19] Update kotlinxSerializationJson from v1.6.2 to v1.7.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 74a91a31..b9d2aedb 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,7 +11,7 @@ gradleVersionUpdate = "0.51.0" # Kotlin Multiplatform Version kotlinxCoroutines = "1.9.0-RC" -kotlinxSerializationJson = "1.6.2" +kotlinxSerializationJson = "1.7.0" kotlinxDateTime = "0.6.0" napier = "2.7.1" ktor = "2.3.11" From 9f0352fe84570f36bafe926d70ff1fa5e96190c6 Mon Sep 17 00:00:00 2001 From: Victor Kabata Date: Wed, 12 Jun 2024 12:47:31 +0300 Subject: [PATCH 19/19] Fix android sample issue --- app-android/build.gradle.kts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app-android/build.gradle.kts b/app-android/build.gradle.kts index 21fe5439..c93c6891 100644 --- a/app-android/build.gradle.kts +++ b/app-android/build.gradle.kts @@ -38,6 +38,11 @@ android { compose = true } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + kotlin { compilerOptions { jvmTarget.set(JvmTarget.JVM_17)