Skip to content

Commit 0eb2547

Browse files
HekmatullahAminHekmatullahAmin
authored
fix(ios): use CocoaPods integration for cmp-shared (#2968)
1 parent f47b961 commit 0eb2547

File tree

40 files changed

+724
-386
lines changed

40 files changed

+724
-386
lines changed

‎.run/cmp-ios.run.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="cmp-ios" type="AppleRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" EMULATE_TERMINAL="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="iosApp" TARGET_NAME="iosApp" CONFIG_NAME="Debug" IS_LOCATION_SIMULATION_SUPPORTED="true" SCHEME_NAME="cmp-ios" IS_LOCATION_SIMULATION_ALLOWED="true" LOCATION_SCENARIO_ID="com.apple.dt.IDEFoundation.CurrentLocationScenarioIdentifier" LOCATION_SCENARIO_TYPE="1" APPLICATION_LANGUAGE="IDELaunchSchemeLanguageUseSystemLanguage" APPLICATION_REGION="" RUN_TARGET_PROJECT_NAME="iosApp" RUN_TARGET_NAME="iosApp" MAKE_ACTIVE="TRUE" SHOULD_DEBUG_EXTENSIONS="false">
3+
<embedded_app_extension_list />
4+
<method v="2">
5+
<option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
6+
</method>
7+
</configuration>
8+
</component>

‎build-logic/convention/src/main/kotlin/CMPFeatureConventionPlugin.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ class CMPFeatureConventionPlugin : Plugin<Project> {
2424
add("commonMainImplementation", libs.findLibrary("koin.compose.viewmodel").get())
2525

2626
add("commonMainImplementation", libs.findLibrary("jb.composeRuntime").get())
27+
add("commonMainImplementation", libs.findLibrary("jb.lifecycle.compose").get())
2728
add("commonMainImplementation", libs.findLibrary("jb.composeViewmodel").get())
2829
add("commonMainImplementation", libs.findLibrary("jb.lifecycleViewmodel").get())
2930
add("commonMainImplementation", libs.findLibrary("jb.lifecycleViewmodelSavedState").get())

‎build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ buildscript {
88
}
99

1010
plugins {
11+
alias(libs.plugins.kotlinCocoapods) apply false
1112
alias(libs.plugins.android.application) apply false
1213
alias(libs.plugins.android.library) apply false
1314
alias(libs.plugins.android.test) apply false

‎cmp-android/dependencies/demoDebugRuntimeClasspath.txt‎

Lines changed: 96 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -17,61 +17,69 @@ androidx.camera:camera-view:1.4.1
1717
androidx.collection:collection-jvm:1.5.0
1818
androidx.collection:collection-ktx:1.5.0
1919
androidx.collection:collection:1.5.0
20-
androidx.compose.animation:animation-android:1.8.2
21-
androidx.compose.animation:animation-core-android:1.8.2
22-
androidx.compose.animation:animation-core:1.8.2
23-
androidx.compose.animation:animation:1.8.2
24-
androidx.compose.foundation:foundation-android:1.8.2
25-
androidx.compose.foundation:foundation-layout-android:1.8.2
26-
androidx.compose.foundation:foundation-layout:1.8.2
27-
androidx.compose.foundation:foundation:1.8.2
20+
androidx.compose.animation:animation-android:1.8.3
21+
androidx.compose.animation:animation-core-android:1.8.3
22+
androidx.compose.animation:animation-core:1.8.3
23+
androidx.compose.animation:animation:1.8.3
24+
androidx.compose.foundation:foundation-android:1.8.3
25+
androidx.compose.foundation:foundation-layout-android:1.8.3
26+
androidx.compose.foundation:foundation-layout:1.8.3
27+
androidx.compose.foundation:foundation:1.8.3
28+
androidx.compose.material3.adaptive:adaptive-android:1.1.0
29+
androidx.compose.material3.adaptive:adaptive-layout-android:1.1.0
30+
androidx.compose.material3.adaptive:adaptive-layout:1.1.0
31+
androidx.compose.material3.adaptive:adaptive-navigation-android:1.1.0
32+
androidx.compose.material3.adaptive:adaptive-navigation:1.1.0
33+
androidx.compose.material3.adaptive:adaptive:1.1.0
34+
androidx.compose.material3:material3-adaptive-navigation-suite-android:1.3.2
35+
androidx.compose.material3:material3-adaptive-navigation-suite:1.3.2
2836
androidx.compose.material3:material3-android:1.3.2
2937
androidx.compose.material3:material3:1.3.2
30-
androidx.compose.material:material-android:1.8.2
31-
androidx.compose.material:material-icons-core-android:1.7.6
32-
androidx.compose.material:material-icons-core:1.7.6
33-
androidx.compose.material:material-icons-extended-android:1.7.6
34-
androidx.compose.material:material-icons-extended:1.7.6
35-
androidx.compose.material:material-ripple-android:1.8.2
36-
androidx.compose.material:material-ripple:1.8.2
37-
androidx.compose.material:material:1.8.2
38-
androidx.compose.runtime:runtime-android:1.8.2
39-
androidx.compose.runtime:runtime-saveable-android:1.8.2
40-
androidx.compose.runtime:runtime-saveable:1.8.2
41-
androidx.compose.runtime:runtime:1.8.2
42-
androidx.compose.ui:ui-android:1.8.2
43-
androidx.compose.ui:ui-geometry-android:1.8.2
44-
androidx.compose.ui:ui-geometry:1.8.2
45-
androidx.compose.ui:ui-graphics-android:1.8.2
46-
androidx.compose.ui:ui-graphics:1.8.2
47-
androidx.compose.ui:ui-text-android:1.8.2
48-
androidx.compose.ui:ui-text:1.8.2
49-
androidx.compose.ui:ui-tooling-android:1.8.2
50-
androidx.compose.ui:ui-tooling-data-android:1.8.2
51-
androidx.compose.ui:ui-tooling-data:1.8.2
52-
androidx.compose.ui:ui-tooling-preview-android:1.8.2
53-
androidx.compose.ui:ui-tooling-preview:1.8.2
54-
androidx.compose.ui:ui-tooling:1.8.2
55-
androidx.compose.ui:ui-unit-android:1.8.2
56-
androidx.compose.ui:ui-unit:1.8.2
57-
androidx.compose.ui:ui-util-android:1.8.2
58-
androidx.compose.ui:ui-util:1.8.2
59-
androidx.compose.ui:ui:1.8.2
60-
androidx.compose:compose-bom:2024.12.01
38+
androidx.compose.material:material-android:1.8.3
39+
androidx.compose.material:material-icons-core-android:1.7.8
40+
androidx.compose.material:material-icons-core:1.7.8
41+
androidx.compose.material:material-icons-extended-android:1.7.8
42+
androidx.compose.material:material-icons-extended:1.7.8
43+
androidx.compose.material:material-ripple-android:1.8.3
44+
androidx.compose.material:material-ripple:1.8.3
45+
androidx.compose.material:material:1.8.3
46+
androidx.compose.runtime:runtime-android:1.8.3
47+
androidx.compose.runtime:runtime-saveable-android:1.8.3
48+
androidx.compose.runtime:runtime-saveable:1.8.3
49+
androidx.compose.runtime:runtime:1.8.3
50+
androidx.compose.ui:ui-android:1.8.3
51+
androidx.compose.ui:ui-geometry-android:1.8.3
52+
androidx.compose.ui:ui-geometry:1.8.3
53+
androidx.compose.ui:ui-graphics-android:1.8.3
54+
androidx.compose.ui:ui-graphics:1.8.3
55+
androidx.compose.ui:ui-text-android:1.8.3
56+
androidx.compose.ui:ui-text:1.8.3
57+
androidx.compose.ui:ui-tooling-android:1.8.3
58+
androidx.compose.ui:ui-tooling-data-android:1.8.3
59+
androidx.compose.ui:ui-tooling-data:1.8.3
60+
androidx.compose.ui:ui-tooling-preview-android:1.8.3
61+
androidx.compose.ui:ui-tooling-preview:1.8.3
62+
androidx.compose.ui:ui-tooling:1.8.3
63+
androidx.compose.ui:ui-unit-android:1.8.3
64+
androidx.compose.ui:ui-unit:1.8.3
65+
androidx.compose.ui:ui-util-android:1.8.3
66+
androidx.compose.ui:ui-util:1.8.3
67+
androidx.compose.ui:ui:1.8.3
68+
androidx.compose:compose-bom:2025.06.01
6169
androidx.concurrent:concurrent-futures-ktx:1.1.0
6270
androidx.concurrent:concurrent-futures:1.1.0
63-
androidx.core:core-ktx:1.15.0
71+
androidx.core:core-ktx:1.16.0
6472
androidx.core:core-splashscreen:1.0.1
6573
androidx.core:core-viewtree:1.0.0
66-
androidx.core:core:1.15.0
74+
androidx.core:core:1.16.0
6775
androidx.cursoradapter:cursoradapter:1.0.0
6876
androidx.customview:customview-poolingcontainer:1.0.0
6977
androidx.customview:customview:1.1.0
70-
androidx.databinding:databinding-adapters:8.7.3
71-
androidx.databinding:databinding-common:8.7.3
72-
androidx.databinding:databinding-ktx:8.7.3
73-
androidx.databinding:databinding-runtime:8.7.3
74-
androidx.databinding:viewbinding:8.7.3
78+
androidx.databinding:databinding-adapters:8.10.0
79+
androidx.databinding:databinding-common:8.10.0
80+
androidx.databinding:databinding-ktx:8.10.0
81+
androidx.databinding:databinding-runtime:8.10.0
82+
androidx.databinding:viewbinding:8.10.0
7583
androidx.datastore:datastore-core:1.0.0
7684
androidx.datastore:datastore-preferences-core:1.0.0
7785
androidx.datastore:datastore-preferences:1.0.0
@@ -130,15 +138,18 @@ androidx.savedstate:savedstate-ktx:1.3.1
130138
androidx.savedstate:savedstate:1.3.1
131139
androidx.slidingpanelayout:slidingpanelayout:1.2.0
132140
androidx.startup:startup-runtime:1.2.0
133-
androidx.tracing:tracing-ktx:1.2.0
134-
androidx.tracing:tracing:1.2.0
141+
androidx.tracing:tracing-android:1.3.0
142+
androidx.tracing:tracing-ktx:1.3.0
143+
androidx.tracing:tracing:1.3.0
135144
androidx.transition:transition:1.4.1
136145
androidx.vectordrawable:vectordrawable-animated:1.2.0
137146
androidx.vectordrawable:vectordrawable:1.2.0
138147
androidx.versionedparcelable:versionedparcelable:1.1.1
139148
androidx.viewpager:viewpager:1.0.0
140149
androidx.window.extensions.core:core:1.0.0
141-
androidx.window:window:1.2.0
150+
androidx.window:window-core-android:1.3.0
151+
androidx.window:window-core:1.3.0
152+
androidx.window:window:1.3.0
142153
co.touchlab:kermit-android-debug:2.0.6
143154
co.touchlab:kermit-core-android-debug:2.0.6
144155
co.touchlab:kermit-core:2.0.6
@@ -159,7 +170,8 @@ com.attafitamim.krop:ui-android:0.1.6
159170
com.attafitamim.krop:ui:0.1.6
160171
com.caverock:androidsvg-aar:1.4
161172
com.google.accompanist:accompanist-drawablepainter:0.37.3
162-
com.google.accompanist:accompanist-permissions:0.37.3
173+
com.google.accompanist:accompanist-pager:0.36.0
174+
com.google.accompanist:accompanist-permissions:0.36.0
163175
com.google.android.datatransport:transport-api:3.2.0
164176
com.google.android.datatransport:transport-backend-cct:3.3.0
165177
com.google.android.datatransport:transport-runtime:3.3.0
@@ -231,6 +243,7 @@ de.jensklingenberg.ktorfit:ktorfit-lib-light:2.5.2
231243
de.jensklingenberg.ktorfit:ktorfit-lib:2.5.2
232244
dev.chrisbanes.material3:material3-window-size-class-multiplatform-android:0.5.0
233245
dev.chrisbanes.material3:material3-window-size-class-multiplatform:0.5.0
246+
dev.chrisbanes.snapper:snapper:0.2.2
234247
io.coil-kt.coil3:coil-android:3.2.0
235248
io.coil-kt.coil3:coil-compose-android:3.2.0
236249
io.coil-kt.coil3:coil-compose-core-android:3.2.0
@@ -271,12 +284,14 @@ io.github.panpf.zoomimage:zoomimage-core-android:1.3.0
271284
io.github.panpf.zoomimage:zoomimage-core-coil3-android:1.3.0
272285
io.github.panpf.zoomimage:zoomimage-core-coil3:1.3.0
273286
io.github.panpf.zoomimage:zoomimage-core:1.3.0
274-
io.github.vinceglb:filekit-core-android:0.10.0
275-
io.github.vinceglb:filekit-core:0.10.0
276-
io.github.vinceglb:filekit-dialogs-android:0.10.0
277-
io.github.vinceglb:filekit-dialogs-compose-android:0.10.0
278-
io.github.vinceglb:filekit-dialogs-compose:0.10.0
279-
io.github.vinceglb:filekit-dialogs:0.10.0
287+
io.github.vinceglb:filekit-compose-android:0.8.8
288+
io.github.vinceglb:filekit-compose:0.8.8
289+
io.github.vinceglb:filekit-core-android:0.10.0-beta04
290+
io.github.vinceglb:filekit-core:0.10.0-beta04
291+
io.github.vinceglb:filekit-dialogs-android:0.10.0-beta04
292+
io.github.vinceglb:filekit-dialogs-compose-android:0.10.0-beta04
293+
io.github.vinceglb:filekit-dialogs-compose:0.10.0-beta04
294+
io.github.vinceglb:filekit-dialogs:0.10.0-beta04
280295
io.insert-koin:koin-android:4.1.0
281296
io.insert-koin:koin-androidx-compose:4.1.0
282297
io.insert-koin:koin-androidx-navigation:4.1.0
@@ -345,7 +360,8 @@ org.jetbrains.androidx.navigation:navigation-common:2.9.0-beta03
345360
org.jetbrains.androidx.navigation:navigation-compose:2.9.0-beta03
346361
org.jetbrains.androidx.navigation:navigation-runtime:2.9.0-beta03
347362
org.jetbrains.androidx.savedstate:savedstate-compose:1.3.1
348-
org.jetbrains.androidx.savedstate:savedstate:1.3.3
363+
org.jetbrains.androidx.savedstate:savedstate:1.3.1
364+
org.jetbrains.androidx.window:window-core:1.3.1
349365
org.jetbrains.compose.animation:animation-core:1.8.2
350366
org.jetbrains.compose.animation:animation:1.8.2
351367
org.jetbrains.compose.annotation-internal:annotation:1.8.2
@@ -356,6 +372,10 @@ org.jetbrains.compose.components:components-ui-tooling-preview-android:1.8.2
356372
org.jetbrains.compose.components:components-ui-tooling-preview:1.8.2
357373
org.jetbrains.compose.foundation:foundation-layout:1.8.2
358374
org.jetbrains.compose.foundation:foundation:1.8.2
375+
org.jetbrains.compose.material3.adaptive:adaptive-layout:1.1.2
376+
org.jetbrains.compose.material3.adaptive:adaptive-navigation:1.1.2
377+
org.jetbrains.compose.material3.adaptive:adaptive:1.1.2
378+
org.jetbrains.compose.material3:material3-adaptive-navigation-suite:1.8.2
359379
org.jetbrains.compose.material3:material3:1.8.2
360380
org.jetbrains.compose.material:material-icons-core:1.7.3
361381
org.jetbrains.compose.material:material-icons-extended:1.7.3
@@ -374,12 +394,12 @@ org.jetbrains.compose.ui:ui-tooling:1.8.2
374394
org.jetbrains.compose.ui:ui-unit:1.8.2
375395
org.jetbrains.compose.ui:ui-util:1.8.2
376396
org.jetbrains.compose.ui:ui:1.8.2
377-
org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.1.10
378-
org.jetbrains.kotlin:kotlin-parcelize-runtime:2.1.10
379-
org.jetbrains.kotlin:kotlin-reflect:2.1.0
380-
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.23
381-
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20
382-
org.jetbrains.kotlin:kotlin-stdlib:2.2.0
397+
org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.1.20
398+
org.jetbrains.kotlin:kotlin-parcelize-runtime:2.1.20
399+
org.jetbrains.kotlin:kotlin-reflect:2.1.20
400+
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.0
401+
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.0
402+
org.jetbrains.kotlin:kotlin-stdlib:2.1.21
383403
org.jetbrains.kotlinx:atomicfu-jvm:0.23.2
384404
org.jetbrains.kotlinx:atomicfu:0.23.2
385405
org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.8
@@ -390,19 +410,19 @@ org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.2
390410
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2
391411
org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.10.2
392412
org.jetbrains.kotlinx:kotlinx-coroutines-slf4j:1.10.2
393-
org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.7.1-0.6.x-compat
394-
org.jetbrains.kotlinx:kotlinx-datetime:0.7.1-0.6.x-compat
395-
org.jetbrains.kotlinx:kotlinx-io-bytestring-jvm:0.8.0
396-
org.jetbrains.kotlinx:kotlinx-io-bytestring:0.8.0
397-
org.jetbrains.kotlinx:kotlinx-io-core-jvm:0.8.0
398-
org.jetbrains.kotlinx:kotlinx-io-core:0.8.0
399-
org.jetbrains.kotlinx:kotlinx-serialization-bom:1.8.0
400-
org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.8.0
401-
org.jetbrains.kotlinx:kotlinx-serialization-core:1.8.0
402-
org.jetbrains.kotlinx:kotlinx-serialization-json-io-jvm:1.8.0
403-
org.jetbrains.kotlinx:kotlinx-serialization-json-io:1.8.0
404-
org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.8.0
405-
org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0
413+
org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.7.1
414+
org.jetbrains.kotlinx:kotlinx-datetime:0.7.1
415+
org.jetbrains.kotlinx:kotlinx-io-bytestring-jvm:0.7.0
416+
org.jetbrains.kotlinx:kotlinx-io-bytestring:0.7.0
417+
org.jetbrains.kotlinx:kotlinx-io-core-jvm:0.7.0
418+
org.jetbrains.kotlinx:kotlinx-io-core:0.7.0
419+
org.jetbrains.kotlinx:kotlinx-serialization-bom:1.8.1
420+
org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.8.1
421+
org.jetbrains.kotlinx:kotlinx-serialization-core:1.8.1
422+
org.jetbrains.kotlinx:kotlinx-serialization-json-io-jvm:1.8.1
423+
org.jetbrains.kotlinx:kotlinx-serialization-json-io:1.8.1
424+
org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.8.1
425+
org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.1
406426
org.jetbrains:annotations:23.0.0
407427
org.jspecify:jspecify:1.0.0
408428
org.slf4j:slf4j-api:2.0.16

0 commit comments

Comments
 (0)