Skip to content

Commit f1593b0

Browse files
jarroyoespjarroyoesp
authored
Merge pull request #37 from jarroyoesp/feature/update_deps
Feature: Update deps
2 parents 33d2809 + 6380c5e commit f1593b0

File tree

13 files changed

+4835
-4729
lines changed

13 files changed

+4835
-4729
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[![CI-MASTER](https://github.com/jarroyoesp/ComposeMultiplatformApp/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/jarroyoesp/ComposeMultiplatformApp/actions/workflows/ci.yml)
2-
[![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)
3-
![Kotlin Version](https://img.shields.io/badge/Kotlin-2.2.20-blue?logo=kotlin&logoColor=white)
2+
[![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)
3+
![Kotlin Version](https://img.shields.io/badge/Kotlin-2.2.21-blue?logo=kotlin&logoColor=white)
44
<div align="center">
55
<img alt="Compose multiplatform charts" src="./screenshots/compose_multiplatform_logo.png"/>
66
<h1>🚀 Example project to show SpaceX data built with Kotlin Multiplatform and Compose UI Multiplatform</h1>

‎app/versions/dependencies/debugAndroidTestRuntimeClasspathDependencies.txt‎

Lines changed: 334 additions & 311 deletions
Large diffs are not rendered by default.

‎app/versions/dependencies/debugRuntimeClasspathDependencies.txt‎

Lines changed: 1119 additions & 1099 deletions
Large diffs are not rendered by default.

‎app/versions/dependencies/debugUnitTestRuntimeClasspathDependencies.txt‎

Lines changed: 1130 additions & 1110 deletions
Large diffs are not rendered by default.

‎app/versions/dependencies/releaseRuntimeClasspathDependencies.txt‎

Lines changed: 1083 additions & 1063 deletions
Large diffs are not rendered by default.

‎app/versions/dependencies/releaseUnitTestRuntimeClasspathDependencies.txt‎

Lines changed: 1094 additions & 1074 deletions
Large diffs are not rendered by default.

‎app/versions/mergedManifests/debug/processDebugManifest/AndroidManifest.xml‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -55,30 +55,6 @@
5555
android:exported="false" >
5656
</provider>
5757

58-
<service
59-
android:name="com.google.firebase.components.ComponentDiscoveryService"
60-
android:directBootAware="true"
61-
android:exported="false" >
62-
<meta-data
63-
android:name="com.google.firebase.components:com.google.firebase.firestore.FirebaseFirestoreKtxRegistrar"
64-
android:value="com.google.firebase.components.ComponentRegistrar" />
65-
<meta-data
66-
android:name="com.google.firebase.components:com.google.firebase.firestore.FirestoreRegistrar"
67-
android:value="com.google.firebase.components.ComponentRegistrar" />
68-
<meta-data
69-
android:name="com.google.firebase.components:com.google.firebase.auth.ktx.FirebaseAuthLegacyRegistrar"
70-
android:value="com.google.firebase.components.ComponentRegistrar" />
71-
<meta-data
72-
android:name="com.google.firebase.components:com.google.firebase.auth.FirebaseAuthRegistrar"
73-
android:value="com.google.firebase.components.ComponentRegistrar" />
74-
<meta-data
75-
android:name="com.google.firebase.components:com.google.firebase.ktx.FirebaseCommonLegacyRegistrar"
76-
android:value="com.google.firebase.components.ComponentRegistrar" />
77-
<meta-data
78-
android:name="com.google.firebase.components:com.google.firebase.FirebaseCommonKtxRegistrar"
79-
android:value="com.google.firebase.components.ComponentRegistrar" />
80-
</service>
81-
8258
<activity
8359
android:name="com.google.firebase.auth.internal.GenericIdpActivity"
8460
android:excludeFromRecents="true"
@@ -116,6 +92,26 @@
11692
</intent-filter>
11793
</activity>
11894

95+
<service
96+
android:name="com.google.firebase.components.ComponentDiscoveryService"
97+
android:directBootAware="true"
98+
android:exported="false" >
99+
<meta-data
100+
android:name="com.google.firebase.components:com.google.firebase.auth.FirebaseAuthRegistrar"
101+
android:value="com.google.firebase.components.ComponentRegistrar" />
102+
<meta-data
103+
android:name="com.google.firebase.components:com.google.firebase.firestore.FirebaseFirestoreKtxRegistrar"
104+
android:value="com.google.firebase.components.ComponentRegistrar" />
105+
<meta-data
106+
android:name="com.google.firebase.components:com.google.firebase.firestore.FirestoreRegistrar"
107+
android:value="com.google.firebase.components.ComponentRegistrar" />
108+
<meta-data
109+
android:name="com.google.firebase.components:com.google.firebase.ktx.FirebaseCommonLegacyRegistrar"
110+
android:value="com.google.firebase.components.ComponentRegistrar" />
111+
<meta-data
112+
android:name="com.google.firebase.components:com.google.firebase.FirebaseCommonKtxRegistrar"
113+
android:value="com.google.firebase.components.ComponentRegistrar" />
114+
</service>
119115
<service
120116
android:name="androidx.credentials.playservices.CredentialProviderMetadataHolder"
121117
android:enabled="true"
@@ -290,7 +286,12 @@
290286
<intent-filter>
291287
<action android:name="androidx.profileinstaller.action.BENCHMARK_OPERATION" />
292288
</intent-filter>
293-
</receiver>
289+
</receiver> <!-- The activities will be merged into the manifest of the hosting app. -->
290+
<activity
291+
android:name="com.google.android.play.core.common.PlayCoreDialogWrapperActivity"
292+
android:exported="false"
293+
android:stateNotNeeded="true"
294+
android:theme="@style/Theme.PlayCore.Transparent" />
294295
</application>
295296

296297
</manifest>

‎app/versions/mergedManifests/release/processReleaseManifest/AndroidManifest.xml‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -48,31 +48,6 @@
4848
android:name="android.app.lib_name"
4949
android:value="" />
5050
</activity>
51-
52-
<service
53-
android:name="com.google.firebase.components.ComponentDiscoveryService"
54-
android:directBootAware="true"
55-
android:exported="false" >
56-
<meta-data
57-
android:name="com.google.firebase.components:com.google.firebase.firestore.FirebaseFirestoreKtxRegistrar"
58-
android:value="com.google.firebase.components.ComponentRegistrar" />
59-
<meta-data
60-
android:name="com.google.firebase.components:com.google.firebase.firestore.FirestoreRegistrar"
61-
android:value="com.google.firebase.components.ComponentRegistrar" />
62-
<meta-data
63-
android:name="com.google.firebase.components:com.google.firebase.auth.ktx.FirebaseAuthLegacyRegistrar"
64-
android:value="com.google.firebase.components.ComponentRegistrar" />
65-
<meta-data
66-
android:name="com.google.firebase.components:com.google.firebase.auth.FirebaseAuthRegistrar"
67-
android:value="com.google.firebase.components.ComponentRegistrar" />
68-
<meta-data
69-
android:name="com.google.firebase.components:com.google.firebase.ktx.FirebaseCommonLegacyRegistrar"
70-
android:value="com.google.firebase.components.ComponentRegistrar" />
71-
<meta-data
72-
android:name="com.google.firebase.components:com.google.firebase.FirebaseCommonKtxRegistrar"
73-
android:value="com.google.firebase.components.ComponentRegistrar" />
74-
</service>
75-
7651
<activity
7752
android:name="com.google.firebase.auth.internal.GenericIdpActivity"
7853
android:excludeFromRecents="true"
@@ -110,6 +85,26 @@
11085
</intent-filter>
11186
</activity>
11287

88+
<service
89+
android:name="com.google.firebase.components.ComponentDiscoveryService"
90+
android:directBootAware="true"
91+
android:exported="false" >
92+
<meta-data
93+
android:name="com.google.firebase.components:com.google.firebase.auth.FirebaseAuthRegistrar"
94+
android:value="com.google.firebase.components.ComponentRegistrar" />
95+
<meta-data
96+
android:name="com.google.firebase.components:com.google.firebase.firestore.FirebaseFirestoreKtxRegistrar"
97+
android:value="com.google.firebase.components.ComponentRegistrar" />
98+
<meta-data
99+
android:name="com.google.firebase.components:com.google.firebase.firestore.FirestoreRegistrar"
100+
android:value="com.google.firebase.components.ComponentRegistrar" />
101+
<meta-data
102+
android:name="com.google.firebase.components:com.google.firebase.ktx.FirebaseCommonLegacyRegistrar"
103+
android:value="com.google.firebase.components.ComponentRegistrar" />
104+
<meta-data
105+
android:name="com.google.firebase.components:com.google.firebase.FirebaseCommonKtxRegistrar"
106+
android:value="com.google.firebase.components.ComponentRegistrar" />
107+
</service>
113108
<service
114109
android:name="androidx.credentials.playservices.CredentialProviderMetadataHolder"
115110
android:enabled="true"
@@ -199,7 +194,12 @@
199194
<intent-filter>
200195
<action android:name="androidx.profileinstaller.action.BENCHMARK_OPERATION" />
201196
</intent-filter>
202-
</receiver>
197+
</receiver> <!-- The activities will be merged into the manifest of the hosting app. -->
198+
<activity
199+
android:name="com.google.android.play.core.common.PlayCoreDialogWrapperActivity"
200+
android:exported="false"
201+
android:stateNotNeeded="true"
202+
android:theme="@style/Theme.PlayCore.Transparent" />
203203
</application>
204204

205205
</manifest>

‎build-conventions/build/libs/build-conventions.jar‎

50 Bytes
Binary file not shown.

‎gradle/libs.versions.toml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,36 @@
33

44
[versions]
55
aboutlibraries = "12.2.4"
6-
agp = "8.13.0"
6+
agp = "8.13.1"
77
androidCompileSdk = "36"
8-
androidx-compose = "1.9.3"
8+
androidx-compose = "1.9.5"
99
apollo = "4.3.3"
1010
coil3 = "3.3.0"
1111
coroutines = "1.10.2"
1212
detekt = "1.23.8"
1313
diktat = "1.2.5"
14-
gitlive = "2.1.0"
14+
gitlive = "2.4.0"
1515
gradle = "8.1.1"
16-
jetbrains-lifecycle = "2.9.5"
16+
jetbrains-lifecycle = "2.9.6"
1717
jetbrains-navigation = "2.9.1"
1818
koin = "4.1.1"
19-
koin-ksp = "2.3.0"
20-
kotlin = "2.2.20"
19+
koin-ksp = "2.3.1"
20+
kotlin = "2.2.21"
2121
kotlinpoet = "2.2.0"
22-
kotlin-multiplatform = "1.9.1"
22+
kotlin-multiplatform = "1.9.3"
2323
kotlin-result = "2.1.0"
2424
ksp = "2.2.20-2.0.3"
2525
ktlint = "0.43.0"
26-
ktor = "3.3.1"
26+
ktor = "3.3.2"
2727
material3 = "1.9.0"
2828
mockk = "1.14.6"
2929
okhttp = "4.12.0"
3030
prettier = "2.7.1"
31-
sqlDelight = "2.1.0"
31+
sqlDelight = "2.2.1"
3232
junitVersion = "1.3.0"
3333

3434
[libraries]
35-
androidx-activity-compose = { module = "androidx.activity:activity-compose", version = "1.11.0" }
35+
androidx-activity-compose = { module = "androidx.activity:activity-compose", version = "1.12.0" }
3636
androidx-compose-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "androidx-compose" }
3737
androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "androidx-compose" }
3838
androidx-compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "androidx-compose" }
@@ -47,7 +47,7 @@ apollo-cache = { module = "com.apollographql.apollo:apollo-normalized-cache", ve
4747
apollo-cache-sqlite = { module = "com.apollographql.apollo:apollo-normalized-cache-sqlite", version.ref = "apollo" }
4848
apollo-testing-support = { module = "com.apollographql.apollo:apollo-testing-support", version.ref = "apollo" }
4949
calendar = { module = "com.kizitonwose.calendar:compose-multiplatform", version = "2.9.0" }
50-
composemultiplatformcharts = { module = "io.github.koalaplot:koalaplot-core", version = "0.9.1" }
50+
composemultiplatformcharts = { module = "io.github.koalaplot:koalaplot-core", version = "0.10.3" }
5151
composemultiplatformcharts2 = { module = "io.github.thechance101:chart", version = "Beta-0.0.5" }
5252
coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil3" }
5353
coil-compose-core = { module = "io.coil-kt.coil3:coil-compose-core", version.ref = "coil3" }
@@ -116,18 +116,18 @@ timber = { module = "com.jakewharton.timber:timber", version = "5.0.1" }
116116

117117
# plugins
118118
plugin-aboutlibraries = { module = "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin", version.ref = "aboutlibraries" }
119-
plugin-android-gradle = { module = "com.android.tools.build:gradle", version = "8.13.0" }
119+
plugin-android-gradle = { module = "com.android.tools.build:gradle", version.ref = "agp" }
120120
plugin-androidcachefix = { module = "gradle.plugin.org.gradle.android:android-cache-fix-gradle-plugin", version = "3.0.1" }
121121
plugin-appversioning = { module = "io.github.reactivecircus.appversioning:app-versioning-gradle-plugin", version = "1.5.0" }
122122
plugin-compose-compiler = { module = "org.jetbrains.kotlin:compose-compiler-gradle-plugin", version.ref = "kotlin" }
123123
plugin-detekt = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" }
124124
plugin-easylauncher = { module = "com.project.starter:easylauncher", version = "6.4.1" }
125-
plugin-firebase-perf = { module = "com.google.firebase:perf-plugin", version = "2.0.1" }
125+
plugin-firebase-perf = { module = "com.google.firebase:perf-plugin", version = "2.0.2" }
126126
plugin-google-services = { module = "com.google.gms:google-services", version = "4.4.4" }
127127
plugin-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
128128
plugin-ksp = { module = "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin", version.ref = "ksp" }
129129
plugin-ruler = { module = "com.spotify.ruler:ruler-gradle-plugin", version = "1.4.0" }
130-
plugin-spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "8.0.0" }
130+
plugin-spotless = { module = "com.diffplug.spotless:spotless-plugin-gradle", version = "8.1.0" }
131131
plugin-versions = "com.github.ben-manes:gradle-versions-plugin:0.52.0"
132132
plugin-versions-update = "nl.littlerobots.vcu:plugin:1.0.1"
133133
plugin-violation = { module = "se.bjurr.violations:violation-comments-to-github-gradle-plugin", version = "1.70.0" }
@@ -140,8 +140,8 @@ gradledoctor = { id = "com.osacky.doctor", version = "0.12.1" }
140140
kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
141141
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
142142
multiplatform = { id = "org.jetbrains.compose", version.ref = "kotlin-multiplatform" }
143-
sqldelight = { id = "app.cash.sqldelight", version = "2.1.0" }
144-
tripletplay = { id = "com.github.triplet.play", version = "3.12.1" }
143+
sqldelight = { id = "app.cash.sqldelight", version.ref = "sqlDelight" }
144+
tripletplay = { id = "com.github.triplet.play", version = "3.12.2" }
145145
com-android-application = { id = "com.android.application", version.ref = "agp" }
146146
android-library = { id = "com.android.library", version.ref = "agp" }
147147
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }

0 commit comments

Comments
 (0)