Fix - iOS app not building (#285)

alexandregpereira · Jul 7, 2024 · b858a85 · b858a85
1 parent aae0977
commit b858a85
Show file tree

Hide file tree

Showing 23 changed files with 38 additions and 59 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -94,7 +94,7 @@ multiplatform {
     }
 
     jvmMain()
-    iosMain(iosFramework = { linkerOpts("-l", "sqlite3") })
+    iosMain()
 
     jvmTest {
         implementation(libs.bundles.unittest)

diff --git a/buildSrc/src/main/kotlin/TargetConfig.kt b/buildSrc/src/main/kotlin/TargetConfig.kt
@@ -76,7 +76,6 @@ fun KotlinMultiplatformExtension.jvmTest(block: KotlinDependencyHandler.() -> Un
 }
 
 fun KotlinMultiplatformExtension.iosMain(
-    iosFramework: Framework.() -> Unit = {},
     block: KotlinDependencyHandler.() -> Unit = {}
 ) {
     if (Os.isArch("aarch64")) {
@@ -90,7 +89,8 @@ fun KotlinMultiplatformExtension.iosMain(
         )
     }.onEach {
         it.binaries.framework {
-            iosFramework()
+            baseName = "KotlinApp"
+            isStatic = true
         }
     }
 

diff --git a/.../app/data/src/androidMain/kotlin/br/alexandregpereira/hunter/data/di/AndroidDataModule.kt b/.../app/data/src/androidMain/kotlin/br/alexandregpereira/hunter/data/di/AndroidDataModule.kt
@@ -26,7 +26,6 @@ internal actual fun getAdditionalModule(): List<Module> {
     return listOf(
         module {
             factory { get<Context>().getSharedPreferences("preferences", Context.MODE_PRIVATE) }
-            factory { DriverFactory(get()) }
         }
     )
 }

diff --git a/...ata/src/androidMain/kotlin/br/alexandregpereira/hunter/data/di/AndroidSqlDriverFactory.kt b/...ata/src/androidMain/kotlin/br/alexandregpereira/hunter/data/di/AndroidSqlDriverFactory.kt
@@ -20,9 +20,9 @@ import android.content.Context
 import br.alexandregpereira.hunter.data.Database
 import com.squareup.sqldelight.android.AndroidSqliteDriver
 import com.squareup.sqldelight.db.SqlDriver
+import org.koin.core.scope.Scope
 
-actual class DriverFactory(private val context: Context) {
-    actual fun createDriver(): SqlDriver {
-        return AndroidSqliteDriver(Database.Schema, context, "hunter-database")
-    }
+internal actual fun Scope.createSqlDriver(): SqlDriver {
+    val context = get<Context>()
+    return AndroidSqliteDriver(Database.Schema, context, "hunter-database")
 }
diff --git a/domain/app/data/src/commonMain/kotlin/br/alexandregpereira/hunter/data/di/DatabaseModule.kt b/domain/app/data/src/commonMain/kotlin/br/alexandregpereira/hunter/data/di/DatabaseModule.kt
@@ -32,7 +32,7 @@ import org.koin.dsl.module
 
 val databaseModule = module {
     single {
-        createDatabase(get())
+        Database(createSqlDriver())
     }
     factory<AlternativeSourceDao> {
         AlternativeSourceDaoImpl(
@@ -82,8 +82,3 @@ val databaseModule = module {
 }
 
 expect fun getDispatcherIO(): CoroutineDispatcher
-
-private fun createDatabase(driverFactory: DriverFactory): Database {
-    val driver = driverFactory.createDriver()
-    return Database(driver)
-}
diff --git a/...in/app/data/src/commonMain/kotlin/br/alexandregpereira/hunter/data/di/SqlDriverFactory.kt b/...in/app/data/src/commonMain/kotlin/br/alexandregpereira/hunter/data/di/SqlDriverFactory.kt
@@ -17,7 +17,6 @@
 package br.alexandregpereira.hunter.data.di
 
 import com.squareup.sqldelight.db.SqlDriver
+import org.koin.core.scope.Scope
 
-expect class DriverFactory {
-    fun createDriver(): SqlDriver
-}
+internal expect fun Scope.createSqlDriver(): SqlDriver
diff --git a/domain/app/data/src/iosMain/kotlin/br/alexandregpereira/hunter/data/di/IosDataModule.kt b/domain/app/data/src/iosMain/kotlin/br/alexandregpereira/hunter/data/di/IosDataModule.kt
@@ -19,14 +19,7 @@ package br.alexandregpereira.hunter.data.di
 import br.alexandregpereira.hunter.data.IosDispatchers
 import kotlinx.coroutines.CoroutineDispatcher
 import org.koin.core.module.Module
-import org.koin.dsl.module
 
-internal actual fun getAdditionalModule(): List<Module> {
-    return listOf(
-        module {
-            factory { DriverFactory() }
-        }
-    )
-}
+internal actual fun getAdditionalModule(): List<Module> = emptyList()
 
 actual fun getDispatcherIO(): CoroutineDispatcher = IosDispatchers.IO
diff --git a/...in/app/data/src/iosMain/kotlin/br/alexandregpereira/hunter/data/di/IosSqlDriverFactory.kt b/...in/app/data/src/iosMain/kotlin/br/alexandregpereira/hunter/data/di/IosSqlDriverFactory.kt
@@ -19,9 +19,8 @@ package br.alexandregpereira.hunter.data.di
 import br.alexandregpereira.hunter.data.Database
 import com.squareup.sqldelight.db.SqlDriver
 import com.squareup.sqldelight.drivers.native.NativeSqliteDriver
+import org.koin.core.scope.Scope
 
-actual class DriverFactory{
-    actual fun createDriver(): SqlDriver {
-        return NativeSqliteDriver(Database.Schema, "hunter-database")
-    }
+internal actual fun Scope.createSqlDriver(): SqlDriver {
+    return NativeSqliteDriver(Database.Schema, "hunter-database")
 }
diff --git a/domain/app/data/src/jvmMain/kotlin/br/alexandregpereira/hunter/data/di/JvmModule.kt b/domain/app/data/src/jvmMain/kotlin/br/alexandregpereira/hunter/data/di/JvmModule.kt
@@ -19,14 +19,7 @@ package br.alexandregpereira.hunter.data.di
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 import org.koin.core.module.Module
-import org.koin.dsl.module
 
-internal actual fun getAdditionalModule(): List<Module> {
-    return listOf(
-        module {
-            factory { DriverFactory() }
-        }
-    )
-}
+internal actual fun getAdditionalModule(): List<Module> = emptyList()
 
 actual fun getDispatcherIO(): CoroutineDispatcher = Dispatchers.IO
diff --git a/...in/app/data/src/jvmMain/kotlin/br/alexandregpereira/hunter/data/di/JvmSqlDriverFactory.kt b/...in/app/data/src/jvmMain/kotlin/br/alexandregpereira/hunter/data/di/JvmSqlDriverFactory.kt
@@ -19,11 +19,10 @@ package br.alexandregpereira.hunter.data.di
 import br.alexandregpereira.hunter.data.Database
 import com.squareup.sqldelight.db.SqlDriver
 import com.squareup.sqldelight.sqlite.driver.JdbcSqliteDriver
+import org.koin.core.scope.Scope
 
-actual class DriverFactory{
-    actual fun createDriver(): SqlDriver {
-        val driver: SqlDriver = JdbcSqliteDriver(JdbcSqliteDriver.IN_MEMORY)
-        Database.Schema.create(driver)
-        return driver
-    }
+internal actual fun Scope.createSqlDriver(): SqlDriver {
+    val driver: SqlDriver = JdbcSqliteDriver(JdbcSqliteDriver.IN_MEMORY)
+    Database.Schema.create(driver)
+    return driver
 }
diff --git a/iosApp/MonsterCompendium.xcodeproj/project.pbxproj b/iosApp/MonsterCompendium.xcodeproj/project.pbxproj
@@ -570,7 +570,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"MonsterCompendium/Preview Content\"";
 				ENABLE_PREVIEWS = YES;
-				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
+				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../app/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
@@ -584,8 +584,9 @@
 				MARKETING_VERSION = 1.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
+					"-lsqlite3",
 					"-framework",
-					shared,
+					KotlinApp,
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = br.alexandregpereira.MonsterCompendium;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -604,7 +605,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_ASSET_PATHS = "\"MonsterCompendium/Preview Content\"";
 				ENABLE_PREVIEWS = YES;
-				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
+				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../app/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
@@ -618,8 +619,9 @@
 				MARKETING_VERSION = 1.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
+					"-lsqlite3",
 					"-framework",
-					shared,
+					KotlinApp,
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = br.alexandregpereira.MonsterCompendium;
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/iosApp/MonsterCompendium/Feature/MonsterCompendium/MonsterCompendiumViewModel.swift b/iosApp/MonsterCompendium/Feature/MonsterCompendium/MonsterCompendiumViewModel.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-import shared
+import KotlinApp
 
 @MainActor class MonsterCompendiumViewModel : ObservableObject {
 

diff --git a/iosApp/MonsterCompendium/Feature/MonsterCompendium/UI/MonsterCompendiumItemUiState.swift b/iosApp/MonsterCompendium/Feature/MonsterCompendium/UI/MonsterCompendiumItemUiState.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-import shared
+import KotlinApp
 
 extension MonsterCompendiumItemState {
     static let sampleData: [MonsterCompendiumItemState] = (0...100).map {

diff --git a/iosApp/MonsterCompendium/Feature/MonsterCompendium/UI/MonsterCompendiumView.swift b/iosApp/MonsterCompendium/Feature/MonsterCompendium/UI/MonsterCompendiumView.swift
@@ -5,7 +5,7 @@
 //  Created by Alexandre G Pereira on 29/01/23.
 //
 
-import shared
+import KotlinApp
 import SwiftUI
 
 struct MonsterCompendiumView: View {

diff --git a/iosApp/MonsterCompendium/Feature/MonsterCompendium/UI/TableContentPopup.swift b/iosApp/MonsterCompendium/Feature/MonsterCompendium/UI/TableContentPopup.swift
@@ -5,7 +5,7 @@
 //  Created by Alexandre G Pereira on 08/03/23.
 //
 
-import shared
+import KotlinApp
 import SwiftUI
 
 struct TableContentPopup: View {

diff --git a/iosApp/MonsterCompendium/Feature/MonsterCompendium/UI/TableContentView.swift b/iosApp/MonsterCompendium/Feature/MonsterCompendium/UI/TableContentView.swift
@@ -5,7 +5,7 @@
 //  Created by Alexandre G Pereira on 08/03/23.
 //
 
-import shared
+import KotlinApp
 import SwiftUI
 
 struct TableContent: View {

diff --git a/iosApp/MonsterCompendium/Feature/MonsterDetail/MonsterDetailStrings.swift b/iosApp/MonsterCompendium/Feature/MonsterDetail/MonsterDetailStrings.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-import shared
+import KotlinApp
 
 class MonsterDetailStringsWrapper: ObservableObject {
     @Published var value: MonsterDetailStrings

diff --git a/iosApp/MonsterCompendium/Feature/MonsterDetail/MonsterDetailViewModel.swift b/iosApp/MonsterCompendium/Feature/MonsterDetail/MonsterDetailViewModel.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-import shared
+import KotlinApp
 
 @MainActor class MonsterDetailViewModel : ObservableObject {
 

diff --git a/iosApp/MonsterCompendium/Feature/MonsterDetail/UI/MonsterDetailPagerView.swift b/iosApp/MonsterCompendium/Feature/MonsterDetail/UI/MonsterDetailPagerView.swift
@@ -5,7 +5,7 @@
 //  Created by Alexandre G Pereira on 26/03/23.
 //
 
-import shared
+import KotlinApp
 import SwiftUI
 
 // Not working properly

diff --git a/iosApp/MonsterCompendium/Feature/MonsterDetail/UI/MonsterDetailView.swift b/iosApp/MonsterCompendium/Feature/MonsterDetail/UI/MonsterDetailView.swift
@@ -5,7 +5,7 @@
 //  Created by Alexandre G Pereira on 02/03/23.
 //
 
-import shared
+import KotlinApp
 import SwiftUI
 
 struct MonsterDetailView : View {

diff --git a/iosApp/MonsterCompendium/MonsterCompendiumApp.swift b/iosApp/MonsterCompendium/MonsterCompendiumApp.swift
@@ -6,7 +6,7 @@
 //
 
 import SwiftUI
-import shared
+import KotlinApp
 
 @main
 struct MonsterCompendiumApp: App {

diff --git a/iosApp/MonsterCompendium/UI/MonsterCardView.swift b/iosApp/MonsterCompendium/UI/MonsterCardView.swift
@@ -6,7 +6,7 @@
 //
 
 import SDWebImageSwiftUI
-import shared
+import KotlinApp
 import SwiftUI
 
 struct MonsterCardView: View {

diff --git a/iosApp/MonsterCompendium/UI/MonsterUiState.swift b/iosApp/MonsterCompendium/UI/MonsterUiState.swift
@@ -6,7 +6,7 @@
 //
 
 import Foundation
-import shared
+import KotlinApp
 
 struct MonsterUiState {
     let index: String