fix: ios build

makeevrserg · Aug 18, 2023 · d74efb0 · d74efb0
1 parent 66674bd
commit d74efb0
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 13 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,9 +1,9 @@
 [versions]
 # Kotlin
-kotlin-version = "1.8.20"
+kotlin-version = "1.9.0"
 kotlin-dokka = "1.8.10"
 kotlin-coroutines = "1.7.2"
-kotlin-compilerExtensionVersion = "1.4.5"
+kotlin-compilerExtensionVersion = "1.5.1"
 kotlin-android-application = "8.0.1"
 kotlin-serialization-json = "1.5.1"
 
@@ -55,7 +55,7 @@ klibs-kstorage = "1.0.0"
 klibs-kdi = "1.1.0"
 
 # Compose
-kotlin-compose = "1.4.0"
+kotlin-compose = "1.4.3"
 
 # Moko
 moko-mvvm = "0.16.1"

diff --git a/iosApp/iosApp.xcworkspace/xcuserdata/romanmakeev.xcuserdatad/UserInterfaceState.xcuserstate b/iosApp/iosApp.xcworkspace/xcuserdata/romanmakeev.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/iosApp/iosApp/Presentation/Root/RootHolder.swift b/iosApp/iosApp/Presentation/Root/RootHolder.swift
@@ -16,12 +16,12 @@ final class RootHolder {
 
     init() {
         lifecycle = LifecycleRegistryKt.LifecycleRegistry()
-        let platformConfiguration = DefaultIosPlatformConfiguration()
-        ServicesModuleCompanion.shared.platformConfiguration.initialize(value: platformConfiguration)
+        let platformConfiguration = DefaultNativePlatformConfiguration()
+        RootModuleCompanion.shared.servicesModule.platformConfiguration.initialize(value: platformConfiguration)
         root = DefaultRootComponent(
             componentContext: DefaultComponentContext(lifecycle: lifecycle),
             rootModule: RootModuleCompanion.shared,
-            servicesModule: ServicesModuleCompanion.shared
+            servicesModule: RootModuleCompanion.shared.servicesModule
         )
         lifecycle.onCreate()
     }

diff --git a/iosApp/iosApp/Presentation/Root/RootView.swift b/iosApp/iosApp/Presentation/Root/RootView.swift
@@ -45,7 +45,7 @@ private struct ChildView: View {
         case let child as DefaultRootComponentConfigurationSplash:
             SplashView(root, child.splashComponent)
         case let child as DefaultRootComponentConfigurationStatus:
-            StatusView(root, child.statusComponents)
+            StatusView(root, child.rootStatusComponent)
         default:
             EmptyView()
         }

diff --git a/iosApp/iosApp/Presentation/Status/StatusView.swift b/iosApp/iosApp/Presentation/Status/StatusView.swift
@@ -11,10 +11,10 @@ import Root
 
 struct StatusView: View {
     let rootComponent: RootComponent
-    let statusComponents: [StatusComponent]
+    let statusComponent: RootStatusComponent
 
-    init(_ rootComponent: RootComponent, _ statusComponents: [StatusComponent]) {
-        self.statusComponents = statusComponents
+    init(_ rootComponent: RootComponent, _ statusComponent: RootStatusComponent) {
+        self.statusComponent = statusComponent
         self.rootComponent = rootComponent
     }
     var body: some View {
@@ -27,7 +27,7 @@ struct StatusView: View {
                 Text(MR.strings.shared.status_subtitle.desc().localized())
                     .font(.body)
 
-                List(statusComponents,id: \.model.description) { statusComponent in
+                List(statusComponent.statusComponents,id: \.model.description) { statusComponent in
                     StatusWidget(statusComponent)
                 }.listStyle(.inset)
             }

diff --git a/modules/features/root/build.gradle.kts b/modules/features/root/build.gradle.kts
@@ -28,6 +28,7 @@ buildConfig {
 kotlin {
     android()
     ios()
+    iosSimulatorArm64()
     cocoapods {
         summary = projectInfo.description
         homepage = projectInfo.url
@@ -45,6 +46,7 @@ kotlin {
             export(libs.essenty)
             export(libs.moko.mvvm.core)
             export(libs.moko.mvvm.flow)
+            export(libs.klibs.mikro.platform)
         }
     }
     sourceSets {
@@ -54,7 +56,7 @@ kotlin {
                 implementation(libs.mppsettings)
                 // klibs
                 implementation(libs.klibs.mikro.core)
-                implementation(libs.klibs.mikro.platform)
+                api(libs.klibs.mikro.platform)
                 implementation(libs.klibs.kstorage)
                 implementation(libs.klibs.kdi)
                 // Decompose
@@ -99,6 +101,10 @@ kotlin {
         val iosArm64Main by getting {
             resources.srcDirs("build/generated/moko/iosArm64Main/src")
         }
+        val iosSimulatorArm64Main by getting {
+            this.dependsOn(iosMain)
+            resources.srcDirs("build/generated/moko/iosSimulatorArm64Main/src")
+        }
     }
 }
 android {

diff --git a/...kotlin/com/makeevrserg/empireprojekt/mobile/features/root/di/factories/SettingsFactory.kt b/...kotlin/com/makeevrserg/empireprojekt/mobile/features/root/di/factories/SettingsFactory.kt
@@ -1,5 +1,6 @@
 package com.makeevrserg.empireprojekt.mobile.features.root.di.factories
 
+import com.russhwolf.settings.NSUserDefaultsSettings
 import com.russhwolf.settings.Settings
 import ru.astrainteractive.klibs.kdi.Factory
 import ru.astrainteractive.klibs.mikro.platform.PlatformConfiguration
@@ -9,6 +10,6 @@ actual class SettingsFactory actual constructor(
     private val configuration: PlatformConfiguration
 ) : Factory<Settings> {
     override fun create(): Settings {
-        TODO()
+        return NSUserDefaultsSettings.Factory().create("SETTINGS")
     }
 }
diff --git a/modules/features/splash/build.gradle.kts b/modules/features/splash/build.gradle.kts
@@ -12,6 +12,7 @@ plugins {
 kotlin {
     android()
     ios()
+    iosSimulatorArm64()
     sourceSets {
         val commonMain by getting {
             dependencies {

diff --git a/modules/services/core/build.gradle.kts b/modules/services/core/build.gradle.kts
@@ -12,6 +12,7 @@ plugins {
 kotlin {
     android()
     ios()
+    iosSimulatorArm64()
     sourceSets {
         val commonMain by getting {
             dependencies {

diff --git a/modules/services/resources/build.gradle.kts b/modules/services/resources/build.gradle.kts
@@ -10,6 +10,7 @@ plugins {
 kotlin {
     android()
     ios()
+    iosSimulatorArm64()
     sourceSets {
         val commonMain by getting {
             dependencies {
@@ -22,6 +23,9 @@ kotlin {
         val iosArm64Main by getting {
             resources.srcDirs("build/generated/moko/iosArm64Main/src")
         }
+        val iosSimulatorArm64Main by getting {
+            resources.srcDirs("build/generated/moko/iosSimulatorArm64Main/src")
+        }
     }
 }
 multiplatformResources {
@@ -32,4 +36,7 @@ android {
     dependencies {
         implementation("com.google.android.material:material:1.9.0")
     }
+    sourceSets {
+        getByName("main").java.srcDirs("build/generated/moko/androidMain/src")
+    }
 }