Skip to content
This repository was archived by the owner on Sep 8, 2025. It is now read-only.

Commit 3fd5bf0

Browse files
committed
#309 add iosSimulatorArm64 target
1 parent 1220f8e commit 3fd5bf0

File tree

16 files changed

+36
-65
lines changed

16 files changed

+36
-65
lines changed

gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ org.gradle.parallel=true
44

55
kotlin.code.style=official
66
kotlin.mpp.androidSourceSetLayoutVersion=2
7+
kotlin.mpp.enableCInteropCommonization=true
78

89
android.useAndroidX=true
910

widgets-bottomsheet/src/iosArm64Main

Lines changed: 0 additions & 1 deletion
This file was deleted.

widgets-bottomsheet/src/iosMain/kotlin/dev/icerock/moko/widgets/bottomsheet/BottomSheetHolder.kt

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,26 @@
44

55
package dev.icerock.moko.widgets.bottomsheet
66

7+
import cocoapods.mokoWidgetsBottomSheet.BottomSheetController
78
import dev.icerock.moko.widgets.core.View
89
import platform.UIKit.UIViewController
910

10-
internal expect class BottomSheetHolder() : SelfDismisser {
11+
internal class BottomSheetHolder : SelfDismisser {
12+
private val bottomSheet = BottomSheetController()
13+
1114
fun show(
1215
viewController: UIViewController,
1316
view: View,
1417
onDismiss: (isSelfDismissed: Boolean) -> Unit
15-
)
18+
) {
19+
bottomSheet.showOnViewController(
20+
vc = viewController,
21+
withContent = view,
22+
onDismiss = onDismiss
23+
)
24+
}
25+
26+
override fun dismissSelf() {
27+
bottomSheet.dismiss()
28+
}
1629
}

widgets-bottomsheet/src/iosX64Main/kotlin/dev/icerock/moko/widgets/bottomsheet/BottomSheetHolder.kt

Lines changed: 0 additions & 29 deletions
This file was deleted.

widgets-build-logic/src/main/kotlin/multiplatform-library-convention.gradle.kts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,17 @@ kotlin {
1414
publishLibraryVariants("release", "debug")
1515
}
1616
ios()
17+
iosSimulatorArm64()
18+
19+
sourceSets {
20+
val iosMain by getting
21+
val iosTest by getting
22+
23+
val iosSimulatorArm64Main by getting {
24+
dependsOn(iosMain)
25+
}
26+
val iosSimulatorArm64Test by getting {
27+
dependsOn(iosTest)
28+
}
29+
}
1730
}

widgets-collection/src/iosArm64Main

Lines changed: 0 additions & 1 deletion
This file was deleted.

widgets-collection/src/iosMain/kotlin/dev/icerock/moko/widgets/collection/SimpleCollectionViewFactory.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
package dev.icerock.moko.widgets.collection
66

7+
import cocoapods.mokoWidgetsCollection.ALCollectionFlowLayout
78
import dev.icerock.moko.units.createUnitCollectionViewDataSource
89
import dev.icerock.moko.widgets.core.ViewBundle
910
import dev.icerock.moko.widgets.core.ViewFactory
@@ -30,7 +31,9 @@ import platform.UIKit.UIEdgeInsetsZero
3031
import platform.UIKit.backgroundColor
3132
import platform.UIKit.translatesAutoresizingMaskIntoConstraints
3233

33-
expect fun createCollectionFlowLayout(): UICollectionViewFlowLayout
34+
fun createCollectionFlowLayout(): UICollectionViewFlowLayout {
35+
return ALCollectionFlowLayout()
36+
}
3437

3538
actual class SimpleCollectionViewFactory actual constructor(
3639
private val orientation: Orientation,

widgets-collection/src/iosX64Main/kotlin/dev/icerock/moko/widgets/collection/createCollectionFlowLayout.kt

Lines changed: 0 additions & 12 deletions
This file was deleted.

widgets-datetime-picker/src/iosArm64Main

Lines changed: 0 additions & 1 deletion
This file was deleted.

widgets-datetime-picker/src/iosX64Main/kotlin/dev/icerock/moko/widgets/datetimepicker/ShowDatePickerExt.kt renamed to widgets-datetime-picker/src/iosMain/kotlin/dev/icerock/moko/widgets/datetimepicker/showDatePickerDialog.kt

File renamed without changes.

0 commit comments

Comments
 (0)