Working on adding iOS support

androidbroadcast · Jun 20, 2024 · 653df15 · 653df15
1 parent 4b26424
commit 653df15
Show file tree

Hide file tree

Showing 30 changed files with 706 additions and 3 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 = "NewsComposeApp"
+            isStatic = true
+        }
+    }
+
     sourceSets  {
         commonMain.dependencies {
             implementation(projects.features.newsMain.ui)

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/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,6 +19,17 @@ kotlin {
 
     jvm()
 
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach { iosTarget ->
+        iosTarget.binaries.framework {
+            baseName = "CoreDatabase"
+            isStatic = true
+        }
+    }
+
     sourceSets  {
         commonMain.dependencies {
             implementation(libs.kotlinx.datetime)
@@ -28,6 +39,15 @@ kotlin {
 
         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 +76,9 @@ 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)
 }
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

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)

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,32 @@
+package dev.androidbroadcast.news.core
+
+import androidx.room.Room
+import androidx.room.RoomDatabase
+import dev.androidbroadcast.common.Logger
+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>> {
+        val dbFilePath = NSHomeDirectory() + "/my_room.db"
+        Room.databaseBuilder<NewsRoomDatabase>(
+            name = dbFilePath,
+            factory =  { NewsRoomDatabase::class.instantiateImpl() }
+        )
+    }
+
+    factory<Logger> {
+        object : Logger {
+            override fun d(tag: String, message: String) {
+            }
+
+            override fun e(tag: String, message: String) {
+            }
+        }
+    }
+}
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/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 {

diff --git a/gradle.properties b/gradle.properties
@@ -21,4 +21,6 @@ kotlin.code.style=official
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
-org.gradle.configuration-cache=true
+org.gradle.configuration-cache=true
+
+kotlin.native.disableCompilerDaemon=true
diff --git a/iosApp/Configuration/Config.xcconfig b/iosApp/Configuration/Config.xcconfig
@@ -0,0 +1,3 @@
+TEAM_ID=
+BUNDLE_ID=dev.androidbroadcast.news.KotlinProject
+APP_NAME=KotlinProject