Add iOS target

androidbroadcast · Jun 20, 2024 · 6031fb0 · 6031fb0
1 parent 4b26424
commit 6031fb0
Show file tree

Hide file tree

Showing 41 changed files with 869 additions and 7 deletions.
diff --git a/compose-app/build.gradle.kts b/compose-app/build.gradle.kts
@@ -23,6 +23,17 @@ kotlin {
 
     jvm()
 
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach { iosTarget ->
+        iosTarget.binaries.framework {
+            baseName = "ComposeApp"
+            isStatic = true
+        }
+    }
+
     sourceSets  {
         commonMain.dependencies {
             implementation(projects.features.newsMain.ui)
@@ -36,6 +47,10 @@ kotlin {
         androidMain.dependencies {
             implementation(libs.koin.android)
         }
+
+        iosMain.dependencies {
+            implementation(projects.core.platform)
+        }
     }
 }
 

diff --git a/compose-app/src/iosMain/kotlin/dev.androidbroadcast.news.compose/NewsViewController.kt b/compose-app/src/iosMain/kotlin/dev.androidbroadcast.news.compose/NewsViewController.kt
@@ -0,0 +1,14 @@
+import androidx.compose.ui.window.ComposeUIViewController
+import dev.androidbroadcast.news.compose.NewsApp
+import dev.androidbroadcast.news.core.NewsAppPlatform
+import platform.UIKit.UIViewController
+
+public fun MainViewController(): UIViewController {
+    val appPlatform = NewsAppPlatform()
+    appPlatform.start(
+        debug = true,
+        newsApiKey = "155ae65d7264461397c901103488c01e",
+        newsApiBaseUrl = "https://newsapi.org/v2/"
+    )
+    return ComposeUIViewController { NewsApp() }
+}
diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts
@@ -20,6 +20,17 @@ kotlin {
 
     jvm()
 
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach { iosTarget ->
+        iosTarget.binaries.framework {
+            baseName = "CoreCommon"
+            isStatic = true
+        }
+    }
+
     sourceSets  {
         commonMain.dependencies {
             api(libs.kotlinx.coroutines.core)

diff --git a/core/common/src/commonMain/kotlin/dev/androidbroadcast/common/AppDispatchers.kt b/core/common/src/commonMain/kotlin/dev/androidbroadcast/common/AppDispatchers.kt
@@ -2,6 +2,7 @@ package dev.androidbroadcast.common
 
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.IO
 import kotlinx.coroutines.MainCoroutineDispatcher
 
 public class AppDispatchers(

diff --git a/core/common/src/iosMain/kotlin/dev/androidbroadcast/common/PrintLogger.kt b/core/common/src/iosMain/kotlin/dev/androidbroadcast/common/PrintLogger.kt
@@ -0,0 +1,28 @@
+package dev.androidbroadcast.common
+
+import platform.Foundation.NSLog
+
+public class PrintLogger(
+) : Logger {
+    private fun printMessage(
+        level: String,
+        tag: String,
+        message: String
+    ) {
+        NSLog("$level[$tag]: $message")
+    }
+
+    override fun d(
+        tag: String,
+        message: String
+    ) {
+        printMessage("D", tag, message)
+    }
+
+    override fun e(
+        tag: String,
+        message: String
+    ) {
+        printMessage("E", tag, message)
+    }
+}
diff --git a/core/data/build.gradle.kts b/core/data/build.gradle.kts
@@ -20,6 +20,17 @@ kotlin {
 
     jvm()
 
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach { iosTarget ->
+        iosTarget.binaries.framework {
+            baseName = "CoreData"
+            isStatic = true
+        }
+    }
+
     sourceSets  {
         commonMain.dependencies {
             implementation(libs.kotlinx.coroutines.core)

diff --git a/core/database/build.gradle.kts b/core/database/build.gradle.kts
@@ -19,15 +19,37 @@ kotlin {
 
     jvm()
 
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach { iosTarget ->
+        iosTarget.binaries.framework {
+            baseName = "CoreDatabase"
+            isStatic = true
+        }
+    }
+
     sourceSets  {
-        commonMain.dependencies {
-            implementation(libs.kotlinx.datetime)
-            api(libs.androidx.room.common)
-            api(libs.androidx.room.runtime)
+        commonMain {
+            dependencies {
+                implementation(libs.kotlinx.datetime)
+                api(libs.androidx.room.common)
+                api(libs.androidx.room.runtime)
+            }
         }
 
         androidMain.dependencies {
             implementation(libs.androidx.core.ktx)
+            implementation(libs.androidx.sqlite.bundled)
+        }
+
+        jvmMain.dependencies {
+            implementation(libs.androidx.sqlite.bundled)
+        }
+
+        iosMain.dependencies {
+            implementation(libs.androidx.sqlite.bundled)
         }
     }
 }
@@ -56,5 +78,10 @@ room {
 }
 
 dependencies {
-    ksp(libs.androidx.room.compiler)
+    add("kspJvm", libs.androidx.room.compiler)
+    add("kspAndroid", libs.androidx.room.compiler)
+    add("kspIosSimulatorArm64", libs.androidx.room.compiler)
+    add("kspIosX64", libs.androidx.room.compiler)
+    add("kspIosArm64", libs.androidx.room.compiler)
+//    add("kspCommonMainMetadata", libs.androidx.room.compiler)
 }
diff --git a/...ase/src/androidMain/kotlin/dev/androidbroadcast/news/database/NewsRoomDatabase.android.kt b/...ase/src/androidMain/kotlin/dev/androidbroadcast/news/database/NewsRoomDatabase.android.kt
@@ -0,0 +1,5 @@
+package dev.androidbroadcast.news.database
+
+actual fun instantiateNewsRoomDatabase(): NewsRoomDatabase {
+    error("Not implemented in Android")
+}
diff --git a/core/database/src/commonMain/kotlin/dev/androidbroadcast/news/database/NewsRoomDatabase.kt b/core/database/src/commonMain/kotlin/dev/androidbroadcast/news/database/NewsRoomDatabase.kt
@@ -8,6 +8,7 @@ import dev.androidbroadcast.news.database.models.ArticleDBO
 import dev.androidbroadcast.news.database.utils.Converters
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.IO
 
 class NewsDatabase internal constructor(private val database: NewsRoomDatabase) {
     val articlesDao: ArticleDao
@@ -31,3 +32,5 @@ fun NewsDatabase(
             .build()
     )
 }
+
+public expect fun instantiateNewsRoomDatabase(): NewsRoomDatabase
diff --git a/...e/src/iosArm64Main/kotlin/dev/androidbroadcast/news/database/NewsRoomDatabase.iosArm64.kt b/...e/src/iosArm64Main/kotlin/dev/androidbroadcast/news/database/NewsRoomDatabase.iosArm64.kt
@@ -0,0 +1,3 @@
+package dev.androidbroadcast.news.database
+
+actual fun instantiateNewsRoomDatabase(): NewsRoomDatabase = NewsRoomDatabase_Impl()
diff --git a/...Arm64Main/kotlin/dev/androidbroadcast/news/database/NewsRoomDatabase.iosSimulatorArm64.kt b/...Arm64Main/kotlin/dev/androidbroadcast/news/database/NewsRoomDatabase.iosSimulatorArm64.kt
@@ -0,0 +1,3 @@
+package dev.androidbroadcast.news.database
+
+actual fun instantiateNewsRoomDatabase(): NewsRoomDatabase = NewsRoomDatabase_Impl()
diff --git a/...abase/src/iosX64Main/kotlin/dev/androidbroadcast/news/database/NewsRoomDatabase.iosX64.kt b/...abase/src/iosX64Main/kotlin/dev/androidbroadcast/news/database/NewsRoomDatabase.iosX64.kt
@@ -0,0 +1,3 @@
+package dev.androidbroadcast.news.database
+
+actual fun instantiateNewsRoomDatabase(): NewsRoomDatabase = NewsRoomDatabase_Impl()
diff --git a/core/database/src/jvmMain/kotlin/dev/androidbroadcast/news/database/NewsRoomDatabase.jvm.kt b/core/database/src/jvmMain/kotlin/dev/androidbroadcast/news/database/NewsRoomDatabase.jvm.kt
@@ -0,0 +1,5 @@
+package dev.androidbroadcast.news.database
+
+actual fun instantiateNewsRoomDatabase(): NewsRoomDatabase {
+    error("Not implemented in JVM")
+}
diff --git a/core/opennews-api/build.gradle.kts b/core/opennews-api/build.gradle.kts
@@ -18,6 +18,17 @@ kotlin {
 
     jvm()
 
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach { iosTarget ->
+        iosTarget.binaries.framework {
+            baseName = "CoreOpenNewsApi"
+            isStatic = true
+        }
+    }
+
     sourceSets {
         commonMain.dependencies {
             implementation(libs.kotlinx.coroutines.core)
@@ -37,6 +48,10 @@ kotlin {
         jvmMain.dependencies {
             implementation(libs.ktor.client.okhttp)
         }
+
+        iosMain.dependencies {
+            implementation(libs.ktor.client.darwin)
+        }
     }
 }
 

diff --git a/core/opennews-api/src/commonMain/kotlin/dev/androidbroadcast/newsapi/NewsApi.kt b/core/opennews-api/src/commonMain/kotlin/dev/androidbroadcast/newsapi/NewsApi.kt
@@ -24,6 +24,7 @@ import io.ktor.serialization.kotlinx.json.json
 import kotlinx.datetime.Instant
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.json.Json
+import kotlin.jvm.JvmSuppressWildcards
 
 /**
  * [API Documentation](https://newsapi.org/docs/get-started)

diff --git a/core/platform/build.gradle.kts b/core/platform/build.gradle.kts
@@ -20,6 +20,17 @@ kotlin {
 
     jvm()
 
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach { iosTarget ->
+        iosTarget.binaries.framework {
+            baseName = "CorePlatform"
+            isStatic = true
+        }
+    }
+
     sourceSets  {
         commonMain.dependencies {
             api(projects.core.common)
@@ -32,6 +43,10 @@ kotlin {
         jvmMain.dependencies {
             implementation(libs.androidx.sqlite.bundled)
         }
+
+        iosMain.dependencies {
+            implementation(libs.androidx.sqlite.bundled)
+        }
     }
 }
 

diff --git a/...broadcast/news/core/KoinModules.common.kt → ...androidbroadcast/news/core/KoinModules.kt b/...broadcast/news/core/KoinModules.common.kt → ...androidbroadcast/news/core/KoinModules.kt
diff --git a/core/platform/src/iosMain/kotlin/dev/androidbroadcast/news/core/ImageLoader.ios.kt b/core/platform/src/iosMain/kotlin/dev/androidbroadcast/news/core/ImageLoader.ios.kt
@@ -0,0 +1,8 @@
+package dev.androidbroadcast.news.core
+
+import coil3.PlatformContext
+import coil3.disk.DiskCache
+
+internal actual fun newDiskCache(context: PlatformContext): DiskCache? {
+    TODO("Not yet implemented")
+}
diff --git a/core/platform/src/iosMain/kotlin/dev/androidbroadcast/news/core/KoinModules.ios.kt b/core/platform/src/iosMain/kotlin/dev/androidbroadcast/news/core/KoinModules.ios.kt
@@ -0,0 +1,27 @@
+package dev.androidbroadcast.news.core
+
+import androidx.room.Room
+import androidx.room.RoomDatabase
+import androidx.sqlite.driver.bundled.BundledSQLiteDriver
+import dev.androidbroadcast.common.Logger
+import dev.androidbroadcast.common.PrintLogger
+import dev.androidbroadcast.news.database.NewsRoomDatabase
+import org.koin.core.module.Module
+import org.koin.dsl.module
+import platform.Foundation.NSHomeDirectory
+
+/**
+ * Koin Module with target platform specifics dependencies
+ */
+internal actual val targetKoinModule: Module = module {
+    factory<RoomDatabase.Builder<NewsRoomDatabase>> {
+        Room.databaseBuilder<NewsRoomDatabase>(
+            name = "${NSHomeDirectory()}/news.db",
+            factory =  { instantiateNewsRoomDatabase() }
+        ).setDriver(BundledSQLiteDriver())
+    }
+
+    factory<Logger> {
+        PrintLogger()
+    }
+}
diff --git a/core/uikit/build.gradle.kts b/core/uikit/build.gradle.kts
@@ -20,6 +20,17 @@ kotlin {
 
     jvm()
 
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach { iosTarget ->
+        iosTarget.binaries.framework {
+            baseName = "CoreUiKit"
+            isStatic = true
+        }
+    }
+
     sourceSets  {
         commonMain.dependencies {
             api(compose.ui)

diff --git a/core/uikit/src/iosMain/kotlin/dev/androidbroadcast/news/Theme.ios.kt b/core/uikit/src/iosMain/kotlin/dev/androidbroadcast/news/Theme.ios.kt
@@ -0,0 +1,19 @@
+package dev.androidbroadcast.news
+
+import androidx.compose.material3.ColorScheme
+import androidx.compose.runtime.Composable
+
+@Composable
+internal actual fun dynamicColorScheme(darkTheme: Boolean): ColorScheme {
+    error("Dynamic theming isn't supported")
+}
+
+internal actual fun isPlatformWithDynamicSystemTheme(): Boolean = false
+
+@Composable
+internal actual fun platformThemeSetup(
+    darkTheme: Boolean,
+    colorScheme: ColorScheme,
+) {
+    // Do nothing
+}
diff --git a/features/news-main/ui-logic/build.gradle.kts b/features/news-main/ui-logic/build.gradle.kts
@@ -20,6 +20,17 @@ kotlin {
 
     jvm()
 
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach { iosTarget ->
+        iosTarget.binaries.framework {
+            baseName = "FeaturesNewsMainUiLogic"
+            isStatic = true
+        }
+    }
+
     sourceSets {
         commonMain.dependencies {
             api(projects.core.data)

diff --git a/features/news-main/ui/build.gradle.kts b/features/news-main/ui/build.gradle.kts
@@ -20,6 +20,17 @@ kotlin {
 
     jvm()
 
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach { iosTarget ->
+        iosTarget.binaries.framework {
+            baseName = "FeaturesNewsMainUi"
+            isStatic = true
+        }
+    }
+
     sourceSets  {
         commonMain.dependencies {
             implementation(projects.features.newsMain.uiLogic)
@@ -33,7 +44,6 @@ kotlin {
             implementation(libs.androidx.lifecycle.viewmodel)
 
             implementation(compose.components.resources)
-            implementation(libs.androidx.lifecycle.viewmodel.compose)
         }
 
         androidMain.dependencies {