diff --git a/README.md b/README.md index 749479e..cbeb834 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![CI-MASTER](https://github.com/jarroyoesp/ComposeMultiplatformApp/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/jarroyoesp/ComposeMultiplatformApp/actions/workflows/ci.yml) [![Latest release](https://img.shields.io/github/v/release/JetBrains/compose-multiplatform?color=blue&label=Compose%20multiplatform)](https://github.com/JetBrains/compose-multiplatform/releases/tag/v1.10.1) -![Kotlin Version](https://img.shields.io/badge/Kotlin-2.3.10-blue?logo=kotlin&logoColor=white) +![Kotlin Version](https://img.shields.io/badge/Kotlin-2.3.20-blue?logo=kotlin&logoColor=white)
Compose multiplatform charts

🚀 Example project to show SpaceX data built with Kotlin Multiplatform and Compose UI Multiplatform

diff --git a/build-conventions/build/libs/build-conventions.jar b/build-conventions/build/libs/build-conventions.jar index 41ac05c..2d79659 100644 Binary files a/build-conventions/build/libs/build-conventions.jar and b/build-conventions/build/libs/build-conventions.jar differ diff --git a/build-conventions/src/main/kotlin/composeapp.android-app-conventions.gradle.kts b/build-conventions/src/main/kotlin/composeapp.android-app-conventions.gradle.kts index f3490d7..485e367 100644 --- a/build-conventions/src/main/kotlin/composeapp.android-app-conventions.gradle.kts +++ b/build-conventions/src/main/kotlin/composeapp.android-app-conventions.gradle.kts @@ -1,4 +1,4 @@ -import com.android.build.api.dsl.LibraryExtension +import com.android.build.api.dsl.ApplicationExtension import com.jarroyo.composeapp.gmd.configureGradleManagedDevices import com.mikepenz.aboutlibraries.plugin.DuplicateMode import com.mikepenz.aboutlibraries.plugin.DuplicateRule @@ -21,8 +21,8 @@ plugins { val libs = the() -plugins.withId("com.android.library") { - extensions.configure { +plugins.withId("com.android.application") { + extensions.configure { buildFeatures { compose = true diff --git a/desktop/build.gradle.kts b/desktop/build.gradle.kts index 959ecf9..5a2176b 100644 --- a/desktop/build.gradle.kts +++ b/desktop/build.gradle.kts @@ -26,6 +26,11 @@ compose.desktop { targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb) packageName = "desktop" packageVersion = "1.0.0" + modules( + "java.sql", // required by Firebase JVM & SQLDelight JDBC drivers + "java.naming", // required by Firebase/Firestore internals + "java.net.http", // required by Ktor/OkHttp HTTP client + ) } } } diff --git a/iosApp/iosApp.xcworkspace/xcuserdata/javier.arroyo.xcuserdatad/UserInterfaceState.xcuserstate b/iosApp/iosApp.xcworkspace/xcuserdata/javier.arroyo.xcuserdatad/UserInterfaceState.xcuserstate index 243e540..c5e5352 100644 Binary files a/iosApp/iosApp.xcworkspace/xcuserdata/javier.arroyo.xcuserdatad/UserInterfaceState.xcuserstate and b/iosApp/iosApp.xcworkspace/xcuserdata/javier.arroyo.xcuserdatad/UserInterfaceState.xcuserstate differ