Merge pull request #100 from c0de-wizard/kmm-hirechical-structure-mig…

…ration Kmm hirechical structure migration
thomaskioko · Nov 4, 2023 · 0a6e9ed · 0a6e9ed
2 parents 25ef3ae + d263032
commit 0a6e9ed
Show file tree

Hide file tree

Showing 93 changed files with 992 additions and 1,198 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -33,7 +33,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 18
 
       - name: Setup Gradle
         uses: gradle/[email protected]

diff --git a/.github/workflows/kmm-bridge-spm-publish.yml b/.github/workflows/kmm-bridge-spm-publish.yml
@@ -5,4 +5,4 @@ jobs:
   call-kmmbridge-publish:
     uses: touchlab/KMMBridgeGithubWorkflow/.github/workflows/[email protected]
     with:
-      jvmVersion: 17
+      jvmVersion: 18
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ This is my playground for learning Kotlin Multiplatform. With that said, I'm sur
 ## 🖥 Project Setup & Environment
 
 #### Requirements
-- [Zulu Java 17](https://www.azul.com/downloads/?package=jdk#zulu)
+- [Zulu Java 18](https://www.azul.com/downloads/?package=jdk#zulu)
 - You require the latest [Android Studio](https://developer.android.com/studio/preview) release to be able to build the app.
 - Install KMP Plugin. Checkout [this setup guide](https://kotlinlang.org/docs/multiplatform-mobile-setup.html).
 

diff --git a/android-core/resources/build.gradle.kts b/android-core/resources/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("tvmaniac.android.library")
+    id("plugin.tvmaniac.android.library")
 }
 
 android {

diff --git a/android-core/workmanager/build.gradle.kts b/android-core/workmanager/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("tvmaniac.android.library")
+    id("plugin.tvmaniac.android.library")
     alias(libs.plugins.ksp)
 }
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -12,7 +12,6 @@ plugins {
     alias(libs.plugins.dependency.analysis) apply false
     alias(libs.plugins.kmmbridge) apply false
     alias(libs.plugins.kotlin.android) apply false
-    alias(libs.plugins.kotlin.kapt) apply false
     alias(libs.plugins.ksp) apply false
     alias(libs.plugins.multiplatform) apply false
     alias(libs.plugins.serialization) apply false
@@ -40,18 +39,3 @@ allprojects {
 tasks.register("clean", Delete::class) {
     delete(rootProject.buildDir)
 }
-
-subprojects {
-    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-        with(kotlinOptions) {
-            jvmTarget = JavaVersion.VERSION_17.toString()
-
-            freeCompilerArgs = freeCompilerArgs + listOf(
-                "-opt-in=kotlin.RequiresOptIn",
-                "-opt-in=kotlin.time.ExperimentalTime",
-                "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
-                "-opt-in=kotlinx.coroutines.FlowPreview",
-            )
-        }
-    }
-}
diff --git a/core/database/build.gradle.kts b/core/database/build.gradle.kts
@@ -1,41 +1,52 @@
 plugins {
-    id("tvmaniac.kmm.library")
+    id("plugin.tvmaniac.kotlin.android")
+    id("plugin.tvmaniac.multiplatform")
     alias(libs.plugins.sqldelight)
     alias(libs.plugins.ksp)
 }
 
 
 kotlin {
-    android()
-    ios()
-
     sourceSets {
-
-        sourceSets["androidMain"].dependencies {
-            implementation(libs.sqldelight.driver.android)
+        androidMain {
+            dependencies {
+                implementation(libs.sqldelight.driver.android)
+            }
         }
 
-        sourceSets["commonMain"].dependencies {
-            implementation(projects.core.util)
-            implementation(libs.sqldelight.primitive.adapters)
-            implementation(libs.kotlinInject.runtime)
-            implementation(libs.kotlinx.datetime)
+        commonMain {
+            dependencies {
+                implementation(projects.core.util)
+                implementation(libs.sqldelight.primitive.adapters)
+                implementation(libs.kotlinInject.runtime)
+                implementation(libs.kotlinx.datetime)
+            }
         }
 
-
-        sourceSets["androidUnitTest"].dependencies {
-            implementation(kotlin("test"))
-            implementation(libs.sqldelight.driver.jvm)
+        androidUnitTest {
+            dependencies {
+                implementation(kotlin("test"))
+                implementation(libs.sqldelight.driver.jvm)
+            }
         }
 
+        commonTest {
+            dependencies {
+                implementation(kotlin("test"))
+                implementation(libs.kotest.assertions)
+            }
+        }
 
-        sourceSets["commonTest"].dependencies {
-            implementation(kotlin("test"))
-            implementation(libs.kotest.assertions)
+        iosMain {
+            dependencies {
+                implementation(libs.sqldelight.driver.native)
+            }
         }
 
-        sourceSets["iosMain"].dependencies {
-            implementation(libs.sqldelight.driver.native)
+        jvmTest {
+            dependencies {
+                implementation(libs.sqldelight.driver.jvm)
+            }
         }
     }
 }

diff --git a/core/database/src/jvmMain/kotlin/com/thomaskioko/tvmaniac/db/DatabaseComponent.kt b/core/database/src/jvmMain/kotlin/com/thomaskioko/tvmaniac/db/DatabaseComponent.kt
@@ -0,0 +1,3 @@
+package com.thomaskioko.tvmaniac.db
+
+actual interface DatabaseComponent
diff --git a/core/database/src/jvmTest/kotlin/com/thomaskioko/tvmaniac/core/db/BaseDatabaseTest.kt b/core/database/src/jvmTest/kotlin/com/thomaskioko/tvmaniac/core/db/BaseDatabaseTest.kt
@@ -0,0 +1,9 @@
+package com.thomaskioko.tvmaniac.core.db
+
+import app.cash.sqldelight.db.SqlDriver
+import app.cash.sqldelight.driver.jdbc.sqlite.JdbcSqliteDriver
+
+actual fun inMemorySqlDriver(): SqlDriver =
+    JdbcSqliteDriver(JdbcSqliteDriver.IN_MEMORY).apply {
+        TvManiacDatabase.Schema.create(this)
+    }
diff --git a/core/datastore/api/build.gradle.kts b/core/datastore/api/build.gradle.kts
@@ -1,29 +1,24 @@
 plugins {
-    id("tvmaniac.kmm.library")
+    id("plugin.tvmaniac.multiplatform")
 }
 
 
 kotlin {
-    android()
-    ios()
-
     sourceSets {
-
-        sourceSets["commonMain"].dependencies {
-            api(libs.coroutines.core)
+        commonMain {
+            dependencies {
+                api(libs.coroutines.core)
+            }
         }
 
-        sourceSets["commonTest"].dependencies {
-            implementation(kotlin("test"))
+        commonMain {
+            dependencies {
+                implementation(kotlin("test"))
 
-            implementation(libs.coroutines.test)
-            implementation(libs.kotest.assertions)
-            implementation(libs.turbine)
+                implementation(libs.coroutines.test)
+                implementation(libs.kotest.assertions)
+                implementation(libs.turbine)
+            }
         }
-
     }
-}
-
-android {
-    namespace = "com.thomaskioko.tvmaniac.shared.domain.datastore.api"
-}
+}
diff --git a/core/datastore/implementation/build.gradle.kts b/core/datastore/implementation/build.gradle.kts
@@ -1,29 +1,31 @@
 plugins {
-    id("tvmaniac.kmm.library")
+    id("plugin.tvmaniac.kotlin.android")
+    id("plugin.tvmaniac.multiplatform")
     alias(libs.plugins.ksp)
 }
 
 
 kotlin {
-    android()
-    ios()
-
     sourceSets {
-        sourceSets["commonMain"].dependencies {
-            implementation(projects.core.datastore.api)
-            implementation(projects.core.util)
+        commonMain {
+            dependencies {
+                implementation(projects.core.datastore.api)
+                implementation(projects.core.util)
 
-            api(libs.androidx.datastore.preference)
+                api(libs.androidx.datastore.preference)
 
-            implementation(libs.kotlinInject.runtime)
+                implementation(libs.kotlinInject.runtime)
+            }
         }
 
-        sourceSets["commonTest"].dependencies {
-            implementation(kotlin("test"))
+        commonTest {
+            dependencies {
+                implementation(kotlin("test"))
 
-            implementation(libs.coroutines.test)
-            implementation(libs.kotest.assertions)
-            implementation(libs.turbine)
+                implementation(libs.coroutines.test)
+                implementation(libs.kotest.assertions)
+                implementation(libs.turbine)
+            }
         }
     }
 }

diff --git a/...in/kotlin/com/thomaskioko/tvmaniac/datastore/implementation/DataStorePlatformComponent.kt b/...in/kotlin/com/thomaskioko/tvmaniac/datastore/implementation/DataStorePlatformComponent.kt
@@ -5,6 +5,7 @@ import androidx.datastore.preferences.core.Preferences
 import com.thomaskioko.tvmaniac.datastore.api.DatastoreRepository
 import com.thomaskioko.tvmaniac.util.model.AppCoroutineScope
 import com.thomaskioko.tvmaniac.util.scope.ApplicationScope
+import kotlinx.cinterop.ExperimentalForeignApi
 import me.tatarka.inject.annotations.Provides
 import platform.Foundation.NSDocumentDirectory
 import platform.Foundation.NSFileManager
@@ -13,6 +14,7 @@ import platform.Foundation.NSUserDomainMask
 
 actual interface DataStorePlatformComponent {
 
+    @OptIn(ExperimentalForeignApi::class)
     @ApplicationScope
     @Provides
     fun provideDataStore(

diff --git a/...in/kotlin/com/thomaskioko/tvmaniac/datastore/implementation/DataStorePlatformComponent.kt b/...in/kotlin/com/thomaskioko/tvmaniac/datastore/implementation/DataStorePlatformComponent.kt
@@ -0,0 +1,3 @@
+package com.thomaskioko.tvmaniac.datastore.implementation
+
+actual interface DataStorePlatformComponent
diff --git a/...ntation/src/jvmMain/kotlin/com/thomaskioko/tvmaniac/datastore/implementation/IgnoreIos.kt b/...ntation/src/jvmMain/kotlin/com/thomaskioko/tvmaniac/datastore/implementation/IgnoreIos.kt
@@ -0,0 +1,4 @@
+package com.thomaskioko.tvmaniac.datastore.implementation
+
+@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
+actual annotation class IgnoreIos()
diff --git a/core/datastore/testing/build.gradle.kts b/core/datastore/testing/build.gradle.kts
@@ -1,20 +1,15 @@
 plugins {
-    id("tvmaniac.kmm.library")
+    id("plugin.tvmaniac.multiplatform")
 }
 
 
 kotlin {
-    android()
-    ios()
-
     sourceSets {
-        sourceSets["commonMain"].dependencies {
-            implementation(projects.core.datastore.api)
-            implementation(libs.coroutines.core)
+        commonMain {
+            dependencies {
+                implementation(projects.core.datastore.api)
+                implementation(libs.coroutines.core)
+            }
         }
     }
-}
-
-android {
-    namespace = "com.thomaskioko.tvmaniac.datastore.testing"
-}
+}
diff --git a/core/networkutil/build.gradle.kts b/core/networkutil/build.gradle.kts
@@ -1,19 +1,18 @@
 plugins {
-    id("tvmaniac.kmm.library")
+    id("plugin.tvmaniac.kotlin.android")
+    id("plugin.tvmaniac.multiplatform")
     alias(libs.plugins.ksp)
 }
 
 kotlin {
-    android()
-    ios()
-
     sourceSets {
+        commonMain {
+            dependencies {
+                implementation(projects.core.util)
 
-        sourceSets["commonMain"].dependencies {
-            implementation(projects.core.util)
-
-            implementation(libs.coroutines.core)
-            implementation(libs.kotlinInject.runtime)
+                implementation(libs.coroutines.core)
+                implementation(libs.kotlinInject.runtime)
+            }
         }
     }
 }

diff --git a/...mMain/kotlin/com/thomaskioko/tvmaniac/core/networkutil/inject/NetworkPlatformComponent.kt b/...mMain/kotlin/com/thomaskioko/tvmaniac/core/networkutil/inject/NetworkPlatformComponent.kt
@@ -0,0 +1,3 @@
+package com.thomaskioko.tvmaniac.core.networkutil.inject
+
+actual interface NetworkPlatformComponent
diff --git a/core/tmdb-api/api/build.gradle.kts b/core/tmdb-api/api/build.gradle.kts
@@ -1,23 +1,17 @@
 plugins {
-    id("tvmaniac.kmm.library")
+    id("plugin.tvmaniac.multiplatform")
     alias(libs.plugins.serialization)
 }
 
 kotlin {
-    android()
-    ios()
-
     sourceSets {
-        sourceSets["commonMain"].dependencies {
-            api(projects.core.database)
-            api(projects.core.networkutil)
+        commonMain {
+            dependencies {
+                api(projects.core.database)
+                api(projects.core.networkutil)
 
-            implementation(libs.ktor.serialization)
+                implementation(libs.ktor.serialization)
+            }
         }
-
     }
 }
-
-android {
-    namespace = "com.thomaskioko.tvmaniac.tmdb.api"
-}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		package com.thomaskioko.tvmaniac.db

		actual interface DatabaseComponent
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		package com.thomaskioko.tvmaniac.datastore.implementation

		actual interface DataStorePlatformComponent
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		package com.thomaskioko.tvmaniac.core.networkutil.inject

		actual interface NetworkPlatformComponent