refactor build process

.gitignore

@@ -1,22 +1,24 @@
 *.iml
 .gradle
-**/build/
-**/release/
-xcuserdata
-!src/**/build/
-local.properties
 .idea
+.kotlin
+.fleet
 .DS_Store
+build
 captures
 .externalNativeBuild
 .cxx
+local.properties
+xcuserdata
+play_config.*
+keystore.*
+Gemfile.lock
+
+**/*.podspec
+
 *.xcodeproj/*
 !*.xcodeproj/project.pbxproj
 !*.xcodeproj/xcshareddata/
 !*.xcodeproj/project.xcworkspace/
 !*.xcworkspace/contents.xcworkspacedata
 **/xcshareddata/WorkspaceSettings.xcsettings
-.fleet
-**/*.podspec
-/iosApp/Podfile.lock
-/iosApp/Pods

README.md

@@ -5,7 +5,7 @@ This is a Kotlin Multiplatform project targeting Android, iOS, Desktop, Server.
 * `/shared` is for the code that will be shared between all targets in the project.
   The most important subfolder is `commonMain`. If preferred, you can add code to the platform-specific folders here too.
 
-* `/composeApp` is for code that will be shared across your Compose Multiplatform applications.
+* `/commonApp` is for code that will be shared across your Compose Multiplatform applications.
   It contains several subfolders:
   - `commonMain` is for code that’s common for all targets.
   - Other folders are for Kotlin code that will be compiled for only the platform indicated in the folder name.

build-logic/convention/src/main/kotlin/AppExt.kt

@@ -24,7 +24,7 @@ internal object AppExt {
     /**
      * Find the id of plugin
      */
-    fun VersionCatalog.findPluginId(name: String) = findPlugin(name)
+    fun VersionCatalog.findPluginId(name: String): String = findPlugin(name)
         .get()
         .get()
         .pluginId

build-logic/convention/src/main/kotlin/com/stslex/wizard/convention/KmpCompose.kt

@@ -14,13 +14,15 @@ fun Project.configureKMPCompose(
             // todo need to add compose dependencies
             implementation(compose.ui)
             implementation(compose.material3)
+            implementation(compose.material)
             implementation(compose.foundation)
             implementation(compose.components.uiToolingPreview)
             implementation(compose.components.resources)
             implementation(compose.runtime)
             implementation(libs.findLibrary("kotlinx-collections-immutable").get())
             implementation(libs.findLibrary("koin-compose").get())
             implementation(libs.findLibrary("lifecycle-viewmodel").get())
+            implementation(libs.findLibrary("kamel").get())
         }
     }
 }

build-logic/convention/src/main/kotlin/com/stslex/wizard/convention/KotlinAndroidCompose.kt

@@ -7,7 +7,7 @@ import org.gradle.api.Project
 import org.gradle.kotlin.dsl.dependencies
 
 fun Project.configureKotlinAndroidCompose(
-    commonExtension: CommonExtension<*, *, *, *, *>,
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
 ) = commonExtension.apply {
     buildFeatures.compose = true
     composeOptions.kotlinCompilerExtensionVersion = libs.findVersionString("compose-compiler")

build-logic/convention/src/main/kotlin/com/stslex/wizard/convention/KotlinMultiplatform.kt

@@ -13,7 +13,7 @@ internal fun Project.configureKotlinMultiplatform(
     extension: KotlinMultiplatformExtension,
     kspExtension: KspExtension
 ) = extension.apply {
-    kspExtension.arg("KOIN_CONFIG_CHECK", "true")
+    kspExtension.arg("KOIN_CONFIG_CHECK", true.toString())
 
     jvmToolchain(17)
 

commonApp/build.gradle.kts

@@ -0,0 +1,24 @@
+plugins {
+    alias(libs.plugins.convention.kmp.application)
+}
+
+kotlin {
+    sourceSets.apply {
+        commonMain.dependencies {
+            implementation(project(":core:core"))
+            implementation(project(":core:network"))
+            implementation(project(":core:database"))
+            implementation(project(":core:ui"))
+
+            implementation(project(":feature:film_feed"))
+            implementation(project(":feature:film"))
+            implementation(project(":feature:profile"))
+            implementation(project(":feature:match_feed"))
+            implementation(project(":feature:auth"))
+            implementation(project(":feature:follower"))
+            implementation(project(":feature:favourite"))
+            implementation(project(":feature:settings"))
+            implementation(project(":feature:match"))
+        }
+    }
+}

composeApp/src/androidMain/kotlin/com/stslex/wizard/MainActivity.kt → commonApp/src/androidMain/kotlin/com/stslex/wizard/MainActivity.kt

@@ -6,7 +6,6 @@ import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.tooling.preview.Preview
-import org.koin.android.BuildConfig
 import org.koin.android.ext.koin.androidContext
 import org.koin.android.ext.koin.androidLogger
 

composeApp/src/commonMain/kotlin/com/stslex/wizard/App.kt → commonApp/src/commonMain/kotlin/com/stslex/wizard/App.kt

@@ -4,18 +4,19 @@ import androidx.compose.runtime.Composable
 import com.stslex.wizard.core.core.coreModule
 import com.stslex.wizard.core.database.di.coreDatabaseModule
 import com.stslex.wizard.core.database.di.userSettingsModule
-import com.stslex.core.ui.di.coreUiModule
-import com.stslex.core.ui.theme.AppTheme
-import com.stslex.feature.auth.di.featureAuthModule
+import com.stslex.wizard.core.network.di.coreNetworkModule
+import com.stslex.wizard.core.ui.di.coreUiModule
+import com.stslex.wizard.core.ui.theme.AppTheme
+import com.stslex.wizard.di.appModule
+import com.stslex.wizard.feature.auth.di.featureAuthModule
 import com.stslex.wizard.feature.favourite.di.featureFavouriteModule
 import com.stslex.wizard.feature.film.di.featureFilmModule
-import com.stslex.feature.film_feed.di.featureFeedModule
+import com.stslex.wizard.feature.film_feed.di.featureFeedModule
 import com.stslex.wizard.feature.follower.di.featureFollowerModule
 import com.stslex.wizard.feature.match.di.featureMatchModule
-import com.stslex.feature.match_feed.di.featureMatchFeedModule
-import com.stslex.feature.profile.di.featureProfileModule
+import com.stslex.wizard.feature.match_feed.di.featureMatchFeedModule
+import com.stslex.wizard.feature.profile.di.featureProfileModule
 import com.stslex.wizard.feature.settings.di.featureSettingsModule
-import com.stslex.wizard.di.appModule
 import org.koin.compose.KoinApplication
 import org.koin.core.KoinApplication
 
@@ -41,7 +42,7 @@ private fun KoinApplication.setupCommonModules() {
             appModule,
             coreModule,
             coreUiModule,
-            com.stslex.wizard.core.network.di.coreNetworkModule,
+            coreNetworkModule,
             userSettingsModule,
             coreDatabaseModule,
             featureFeedModule,

composeApp/src/commonMain/kotlin/com/stslex/wizard/InitialApp.kt → commonApp/src/commonMain/kotlin/com/stslex/wizard/InitialApp.kt

@@ -11,10 +11,10 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import cafe.adriel.voyager.navigator.Navigator
 import cafe.adriel.voyager.transitions.SlideTransition
-import com.stslex.core.network.utils.token.AuthController
-import com.stslex.core.ui.navigation.AppNavigator
-import com.stslex.core.ui.navigation.AppScreen
-import com.stslex.feature.auth.ui.AuthScreen
+import com.stslex.wizard.core.network.utils.token.AuthController
+import com.stslex.wizard.core.ui.navigation.AppNavigator
+import com.stslex.wizard.core.ui.navigation.AppScreen
+import com.stslex.wizard.feature.auth.ui.AuthScreen
 import com.stslex.wizard.main_screen.MainScreen
 import org.koin.compose.getKoin
 

composeApp/src/commonMain/kotlin/com/stslex/wizard/di/appModule.kt → commonApp/src/commonMain/kotlin/com/stslex/wizard/di/appModule.kt

@@ -1,6 +1,6 @@
 package com.stslex.wizard.di
 
-import com.stslex.core.ui.navigation.AppNavigator
+import com.stslex.wizard.core.ui.navigation.AppNavigator
 import com.stslex.wizard.navigator.AppNavigatorImpl
 import org.koin.dsl.module
 

composeApp/src/commonMain/kotlin/com/stslex/wizard/main_screen/MainScreen.kt → commonApp/src/commonMain/kotlin/com/stslex/wizard/main_screen/MainScreen.kt

@@ -9,7 +9,7 @@ import androidx.compose.ui.Modifier
 import cafe.adriel.voyager.core.screen.Screen
 import cafe.adriel.voyager.navigator.tab.CurrentTab
 import cafe.adriel.voyager.navigator.tab.TabNavigator
-import com.stslex.core.ui.mvi.setupNavigator
+import com.stslex.wizard.core.ui.mvi.setupNavigator
 import com.stslex.wizard.main_screen.bottom_nav_bar.BottomNavigationBar
 import com.stslex.wizard.main_screen.bottom_nav_bar.BottomNavigationTabs
 

composeApp/src/commonMain/kotlin/com/stslex/wizard/main_screen/bottom_nav_bar/FeedTab.kt → commonApp/src/commonMain/kotlin/com/stslex/wizard/main_screen/bottom_nav_bar/FeedTab.kt

@@ -9,7 +9,7 @@ import cafe.adriel.voyager.navigator.Navigator
 import cafe.adriel.voyager.navigator.tab.Tab
 import cafe.adriel.voyager.navigator.tab.TabOptions
 import cafe.adriel.voyager.transitions.SlideTransition
-import com.stslex.feature.film_feed.ui.FeedScreen
+import com.stslex.wizard.feature.film_feed.ui.FeedScreen
 
 object FeedTab : Tab {
 

composeApp/src/commonMain/kotlin/com/stslex/wizard/main_screen/bottom_nav_bar/MatchTab.kt → commonApp/src/commonMain/kotlin/com/stslex/wizard/main_screen/bottom_nav_bar/MatchTab.kt

@@ -8,8 +8,8 @@ import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import cafe.adriel.voyager.navigator.Navigator
 import cafe.adriel.voyager.navigator.tab.Tab
 import cafe.adriel.voyager.navigator.tab.TabOptions
-import com.stslex.core.ui.navigation.args.MatchScreenArgs
-import com.stslex.feature.match.ui.MatchScreen
+import com.stslex.wizard.core.ui.navigation.args.MatchScreenArgs
+import com.stslex.wizard.feature.match.ui.MatchScreen
 
 object MatchTab : Tab {
 

composeApp/src/commonMain/kotlin/com/stslex/wizard/main_screen/bottom_nav_bar/ProfileTab.kt → commonApp/src/commonMain/kotlin/com/stslex/wizard/main_screen/bottom_nav_bar/ProfileTab.kt

@@ -9,7 +9,7 @@ import cafe.adriel.voyager.navigator.Navigator
 import cafe.adriel.voyager.navigator.tab.Tab
 import cafe.adriel.voyager.navigator.tab.TabOptions
 import com.stslex.wizard.feature.profile.navigation.ProfileScreenArguments
-import com.stslex.feature.profile.ui.ProfileScreen
+import com.stslex.wizard.feature.profile.ui.ProfileScreen
 
 object ProfileTab : Tab {
 

composeApp/src/commonMain/kotlin/com/stslex/wizard/navigator/AppNavigatorImpl.kt → commonApp/src/commonMain/kotlin/com/stslex/wizard/navigator/AppNavigatorImpl.kt

@@ -1,15 +1,15 @@
 package com.stslex.wizard.navigator
 
 import cafe.adriel.voyager.navigator.Navigator
-import com.stslex.core.ui.navigation.AppNavigator
-import com.stslex.core.ui.navigation.AppScreen
-import com.stslex.feature.auth.ui.AuthScreen
+import com.stslex.wizard.core.ui.navigation.AppNavigator
+import com.stslex.wizard.core.ui.navigation.AppScreen
+import com.stslex.wizard.feature.auth.ui.AuthScreen
 import com.stslex.wizard.feature.favourite.FavouriteScreen
 import com.stslex.wizard.feature.film.ui.FilmScreen
 import com.stslex.wizard.feature.follower.navigation.FollowerScreenArgs
 import com.stslex.wizard.feature.follower.ui.FollowerScreen
-import com.stslex.feature.match.ui.MatchScreen
-import com.stslex.feature.match_feed.ui.MatchFeedScreen
+import com.stslex.wizard.feature.match.ui.MatchScreen
+import com.stslex.wizard.feature.match_feed.ui.MatchFeedScreen
 import com.stslex.wizard.feature.settings.ui.SettingsScreen
 import com.stslex.wizard.main_screen.MainScreen