Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -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.8.2)
![Kotlin Version](https://img.shields.io/badge/Kotlin-2.2.20-blue?logo=kotlin&logoColor=white)
[![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.9.3)
![Kotlin Version](https://img.shields.io/badge/Kotlin-2.2.21-blue?logo=kotlin&logoColor=white)
<div align="center">
<img alt="Compose multiplatform charts" src="./screenshots/compose_multiplatform_logo.png"/>
<h1>🚀 Example project to show SpaceX data built with Kotlin Multiplatform and Compose UI Multiplatform</h1>
Expand Down

Large diffs are not rendered by default.

2,218 changes: 1,119 additions & 1,099 deletions app/versions/dependencies/debugRuntimeClasspathDependencies.txt

Large diffs are not rendered by default.

2,240 changes: 1,130 additions & 1,110 deletions app/versions/dependencies/debugUnitTestRuntimeClasspathDependencies.txt

Large diffs are not rendered by default.

2,146 changes: 1,083 additions & 1,063 deletions app/versions/dependencies/releaseRuntimeClasspathDependencies.txt

Large diffs are not rendered by default.

2,168 changes: 1,094 additions & 1,074 deletions app/versions/dependencies/releaseUnitTestRuntimeClasspathDependencies.txt

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -55,30 +55,6 @@
android:exported="false" >
</provider>

<service
android:name="com.google.firebase.components.ComponentDiscoveryService"
android:directBootAware="true"
android:exported="false" >
<meta-data
android:name="com.google.firebase.components:com.google.firebase.firestore.FirebaseFirestoreKtxRegistrar"
android:value="com.google.firebase.components.ComponentRegistrar" />
<meta-data
android:name="com.google.firebase.components:com.google.firebase.firestore.FirestoreRegistrar"
android:value="com.google.firebase.components.ComponentRegistrar" />
<meta-data
android:name="com.google.firebase.components:com.google.firebase.auth.ktx.FirebaseAuthLegacyRegistrar"
android:value="com.google.firebase.components.ComponentRegistrar" />
<meta-data
android:name="com.google.firebase.components:com.google.firebase.auth.FirebaseAuthRegistrar"
android:value="com.google.firebase.components.ComponentRegistrar" />
<meta-data
android:name="com.google.firebase.components:com.google.firebase.ktx.FirebaseCommonLegacyRegistrar"
android:value="com.google.firebase.components.ComponentRegistrar" />
<meta-data
android:name="com.google.firebase.components:com.google.firebase.FirebaseCommonKtxRegistrar"
android:value="com.google.firebase.components.ComponentRegistrar" />
</service>

<activity
android:name="com.google.firebase.auth.internal.GenericIdpActivity"
android:excludeFromRecents="true"
Expand Down Expand Up @@ -116,6 +92,26 @@
</intent-filter>
</activity>

<service
android:name="com.google.firebase.components.ComponentDiscoveryService"
android:directBootAware="true"
android:exported="false" >
<meta-data
android:name="com.google.firebase.components:com.google.firebase.auth.FirebaseAuthRegistrar"
android:value="com.google.firebase.components.ComponentRegistrar" />
<meta-data
android:name="com.google.firebase.components:com.google.firebase.firestore.FirebaseFirestoreKtxRegistrar"
android:value="com.google.firebase.components.ComponentRegistrar" />
<meta-data
android:name="com.google.firebase.components:com.google.firebase.firestore.FirestoreRegistrar"
android:value="com.google.firebase.components.ComponentRegistrar" />
<meta-data
android:name="com.google.firebase.components:com.google.firebase.ktx.FirebaseCommonLegacyRegistrar"
android:value="com.google.firebase.components.ComponentRegistrar" />
<meta-data
android:name="com.google.firebase.components:com.google.firebase.FirebaseCommonKtxRegistrar"
android:value="com.google.firebase.components.ComponentRegistrar" />
</service>
<service
android:name="androidx.credentials.playservices.CredentialProviderMetadataHolder"
android:enabled="true"
Expand Down Expand Up @@ -290,7 +286,12 @@
<intent-filter>
<action android:name="androidx.profileinstaller.action.BENCHMARK_OPERATION" />
</intent-filter>
</receiver>
</receiver> <!-- The activities will be merged into the manifest of the hosting app. -->
<activity
android:name="com.google.android.play.core.common.PlayCoreDialogWrapperActivity"
android:exported="false"
android:stateNotNeeded="true"
android:theme="@style/Theme.PlayCore.Transparent" />
</application>

</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -48,31 +48,6 @@
android:name="android.app.lib_name"
android:value="" />
</activity>

<service
android:name="com.google.firebase.components.ComponentDiscoveryService"
android:directBootAware="true"
android:exported="false" >
<meta-data
android:name="com.google.firebase.components:com.google.firebase.firestore.FirebaseFirestoreKtxRegistrar"
android:value="com.google.firebase.components.ComponentRegistrar" />
<meta-data
android:name="com.google.firebase.components:com.google.firebase.firestore.FirestoreRegistrar"
android:value="com.google.firebase.components.ComponentRegistrar" />
<meta-data
android:name="com.google.firebase.components:com.google.firebase.auth.ktx.FirebaseAuthLegacyRegistrar"
android:value="com.google.firebase.components.ComponentRegistrar" />
<meta-data
android:name="com.google.firebase.components:com.google.firebase.auth.FirebaseAuthRegistrar"
android:value="com.google.firebase.components.ComponentRegistrar" />
<meta-data
android:name="com.google.firebase.components:com.google.firebase.ktx.FirebaseCommonLegacyRegistrar"
android:value="com.google.firebase.components.ComponentRegistrar" />
<meta-data
android:name="com.google.firebase.components:com.google.firebase.FirebaseCommonKtxRegistrar"
android:value="com.google.firebase.components.ComponentRegistrar" />
</service>

<activity
android:name="com.google.firebase.auth.internal.GenericIdpActivity"
android:excludeFromRecents="true"
Expand Down Expand Up @@ -110,6 +85,26 @@
</intent-filter>
</activity>

<service
android:name="com.google.firebase.components.ComponentDiscoveryService"
android:directBootAware="true"
android:exported="false" >
<meta-data
android:name="com.google.firebase.components:com.google.firebase.auth.FirebaseAuthRegistrar"
android:value="com.google.firebase.components.ComponentRegistrar" />
<meta-data
android:name="com.google.firebase.components:com.google.firebase.firestore.FirebaseFirestoreKtxRegistrar"
android:value="com.google.firebase.components.ComponentRegistrar" />
<meta-data
android:name="com.google.firebase.components:com.google.firebase.firestore.FirestoreRegistrar"
android:value="com.google.firebase.components.ComponentRegistrar" />
<meta-data
android:name="com.google.firebase.components:com.google.firebase.ktx.FirebaseCommonLegacyRegistrar"
android:value="com.google.firebase.components.ComponentRegistrar" />
<meta-data
android:name="com.google.firebase.components:com.google.firebase.FirebaseCommonKtxRegistrar"
android:value="com.google.firebase.components.ComponentRegistrar" />
</service>
<service
android:name="androidx.credentials.playservices.CredentialProviderMetadataHolder"
android:enabled="true"
Expand Down Expand Up @@ -199,7 +194,12 @@
<intent-filter>
<action android:name="androidx.profileinstaller.action.BENCHMARK_OPERATION" />
</intent-filter>
</receiver>
</receiver> <!-- The activities will be merged into the manifest of the hosting app. -->
<activity
android:name="com.google.android.play.core.common.PlayCoreDialogWrapperActivity"
android:exported="false"
android:stateNotNeeded="true"
android:theme="@style/Theme.PlayCore.Transparent" />
</application>

</manifest>
Binary file modified build-conventions/build/libs/build-conventions.jar
Binary file not shown.
32 changes: 16 additions & 16 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,36 +3,36 @@

[versions]
aboutlibraries = "12.2.4"
agp = "8.13.0"
agp = "8.13.1"
androidCompileSdk = "36"
androidx-compose = "1.9.3"
androidx-compose = "1.9.5"
apollo = "4.3.3"
coil3 = "3.3.0"
coroutines = "1.10.2"
detekt = "1.23.8"
diktat = "1.2.5"
gitlive = "2.1.0"
gitlive = "2.4.0"
gradle = "8.1.1"
jetbrains-lifecycle = "2.9.5"
jetbrains-lifecycle = "2.9.6"
jetbrains-navigation = "2.9.1"
koin = "4.1.1"
koin-ksp = "2.3.0"
kotlin = "2.2.20"
koin-ksp = "2.3.1"
kotlin = "2.2.21"
kotlinpoet = "2.2.0"
kotlin-multiplatform = "1.9.1"
kotlin-multiplatform = "1.9.3"
kotlin-result = "2.1.0"
ksp = "2.2.20-2.0.3"
ktlint = "0.43.0"
ktor = "3.3.1"
ktor = "3.3.2"
material3 = "1.9.0"
mockk = "1.14.6"
okhttp = "4.12.0"
prettier = "2.7.1"
sqlDelight = "2.1.0"
sqlDelight = "2.2.1"
junitVersion = "1.3.0"

[libraries]
androidx-activity-compose = { module = "androidx.activity:activity-compose", version = "1.11.0" }
androidx-activity-compose = { module = "androidx.activity:activity-compose", version = "1.12.0" }
androidx-compose-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "androidx-compose" }
androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "androidx-compose" }
androidx-compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "androidx-compose" }
Expand All @@ -47,7 +47,7 @@ apollo-cache = { module = "com.apollographql.apollo:apollo-normalized-cache", ve
apollo-cache-sqlite = { module = "com.apollographql.apollo:apollo-normalized-cache-sqlite", version.ref = "apollo" }
apollo-testing-support = { module = "com.apollographql.apollo:apollo-testing-support", version.ref = "apollo" }
calendar = { module = "com.kizitonwose.calendar:compose-multiplatform", version = "2.9.0" }
composemultiplatformcharts = { module = "io.github.koalaplot:koalaplot-core", version = "0.9.1" }
composemultiplatformcharts = { module = "io.github.koalaplot:koalaplot-core", version = "0.10.3" }
composemultiplatformcharts2 = { module = "io.github.thechance101:chart", version = "Beta-0.0.5" }
coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil3" }
coil-compose-core = { module = "io.coil-kt.coil3:coil-compose-core", version.ref = "coil3" }
Expand Down Expand Up @@ -116,18 +116,18 @@ timber = { module = "com.jakewharton.timber:timber", version = "5.0.1" }

# plugins
plugin-aboutlibraries = { module = "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin", version.ref = "aboutlibraries" }
plugin-android-gradle = { module = "com.android.tools.build:gradle", version = "8.13.0" }
plugin-android-gradle = { module = "com.android.tools.build:gradle", version.ref = "agp" }
plugin-androidcachefix = { module = "gradle.plugin.org.gradle.android:android-cache-fix-gradle-plugin", version = "3.0.1" }
plugin-appversioning = { module = "io.github.reactivecircus.appversioning:app-versioning-gradle-plugin", version = "1.5.0" }
plugin-compose-compiler = { module = "org.jetbrains.kotlin:compose-compiler-gradle-plugin", version.ref = "kotlin" }
plugin-detekt = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" }
plugin-easylauncher = { module = "com.project.starter:easylauncher", version = "6.4.1" }
plugin-firebase-perf = { module = "com.google.firebase:perf-plugin", version = "2.0.1" }
plugin-firebase-perf = { module = "com.google.firebase:perf-plugin", version = "2.0.2" }
plugin-google-services = { module = "com.google.gms:google-services", version = "4.4.4" }
plugin-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
plugin-ksp = { module = "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin", version.ref = "ksp" }
plugin-ruler = { module = "com.spotify.ruler:ruler-gradle-plugin", version = "1.4.0" }
plugin-spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "8.0.0" }
plugin-spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "8.1.0" }
plugin-versions = "com.github.ben-manes:gradle-versions-plugin:0.52.0"
plugin-versions-update = "nl.littlerobots.vcu:plugin:1.0.1"
plugin-violation = { module = "se.bjurr.violations:violation-comments-to-github-gradle-plugin", version = "1.70.0" }
Expand All @@ -140,8 +140,8 @@ gradledoctor = { id = "com.osacky.doctor", version = "0.12.1" }
kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
multiplatform = { id = "org.jetbrains.compose", version.ref = "kotlin-multiplatform" }
sqldelight = { id = "app.cash.sqldelight", version = "2.1.0" }
tripletplay = { id = "com.github.triplet.play", version = "3.12.1" }
sqldelight = { id = "app.cash.sqldelight", version.ref = "sqlDelight" }
tripletplay = { id = "com.github.triplet.play", version = "3.12.2" }
com-android-application = { id = "com.android.application", version.ref = "agp" }
android-library = { id = "com.android.library", version.ref = "agp" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
2 changes: 2 additions & 0 deletions iosApp/iosApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\"";
DEVELOPMENT_TEAM = AUD79LTG7P;
ENABLE_PREVIEWS = YES;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../modules/feature-home-shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
Expand Down Expand Up @@ -376,6 +377,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\"";
DEVELOPMENT_TEAM = AUD79LTG7P;
ENABLE_PREVIEWS = YES;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../modules/feature-home-shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,8 @@ private fun ColumnScope.XYSamplePlot(state: State) {
Column {
Text("Minimun prize: $minValue € at $hourMin")
Text("Maximum prize: $maxValue € at $hourMax")
chart(
points,
Chart(
data = points,
modifier = Modifier.fillMaxWidth(),
)
}
Expand All @@ -175,7 +175,7 @@ private val hourList: List<String> =
List(25) { it.toString() }

@Composable
private fun XYGraphScope<String, Float>.chart(
private fun XYGraphScope<String, Float>.Chart(
data: List<DefaultPoint<String, Float>>,
modifier: Modifier = Modifier,
) {
Expand Down
Loading