Cleanup and fix iOS deployment

.github/workflows/android.yml

@@ -8,6 +8,10 @@ on:
     branches:
       - main
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build-debug:
     runs-on: ubuntu-latest

.github/workflows/desktop-web.yml

@@ -3,11 +3,15 @@ name: Desktop and Web CI
 on:
   push:
     branches:
-    - main
+      - main
   pull_request:
     branches:
       - main
-
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   Build-Desktop:
     runs-on: ubuntu-latest

.github/workflows/ios.yml

@@ -8,6 +8,10 @@ on:
     branches: 
       - main
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs: 
   build: 
     runs-on: macos-latest

android/src/main/java/com/greenmiststudios/tidy/Application.kt

@@ -2,6 +2,7 @@ package com.greenmiststudios.tidy
 
 import android.app.Application
 import com.greenmiststudios.common.di.appModule
+import com.greenmiststudios.common.di.startTidyKoin
 import org.koin.android.ext.koin.androidContext
 import org.koin.android.ext.koin.androidLogger
 import org.koin.core.context.startKoin
@@ -10,13 +11,11 @@ class TidyApplication : Application() {
   override fun onCreate() {
     super.onCreate()
 
-    startKoin {
+    startTidyKoin {
       // Log Koin into Android logger
       androidLogger()
       // Reference Android context
       androidContext(this@TidyApplication)
-
-      modules(appModule())
     }
   }
 }

common/build.gradle.kts

@@ -1,17 +1,15 @@
-
 plugins {
   kotlin("multiplatform")
   alias(libs.plugins.compose)
   alias(libs.plugins.sqldelight)
   id("com.android.library")
-  kotlin("native.cocoapods")
 }
 
-group = "com.greenmiststudios"
-version = "1.0-SNAPSHOT"
+group = "com.greenmiststudios.tidy"
+version = "${libs.versions.version}-SNAPSHOT"
+
+@OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class) kotlin {
 
-@OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class)
-kotlin {
   androidTarget {
     compilations.all {
       kotlinOptions.jvmTarget = "11"
@@ -25,22 +23,11 @@ kotlin {
   js(IR) {
     browser()
   }
+
   iosX64()
   iosArm64()
   iosSimulatorArm64()
 
-  cocoapods {
-    summary = "Common module for Tidy"
-    homepage = "https://github.com/geoff-powell/tidy"
-    version = "1.0"
-    ios.deploymentTarget = "17.0"
-    podfile = project.file("../iosApp/Podfile")
-    framework {
-      baseName = "common"
-      isStatic = true
-    }
-  }
-
   sourceSets {
     val commonMain by getting {
       dependencies {
@@ -101,30 +88,26 @@ kotlin {
       }
     }
 
-    val iosX64Main by getting {
-      dependencies {
-      }
-    }
-    val iosArm64Main by getting {
-      dependencies {
-      }
-    }
-    val iosSimulatorArm64Main by getting {
-      dependencies {
-      }
+    iosMain.dependencies {
     }
+
+    // val wasmJsMain by getting {
+    //     dependencies {
+    //         implementation(libs.ktor.core.wasm)
+    //     }
+    // }
   }
 
   explicitApi()
 }
 
 android {
   namespace = "com.greenmiststudios.tidy.common"
-  compileSdk = 34
+  compileSdk = libs.versions.android.compileSdk.get().toInt()
   sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
   defaultConfig {
-    minSdk = 24
-    targetSdk = 34
+    minSdk = libs.versions.android.minSdk.get().toInt()
+    targetSdk = libs.versions.android.targetSdk.get().toInt()
   }
   compileOptions {
     sourceCompatibility = JavaVersion.VERSION_11
@@ -137,5 +120,6 @@ sqldelight {
     create("Database") {
       packageName.set("com.greenmiststudios.tidy")
     }
+    linkSqlite = true
   }
 }

common/src/commonMain/kotlin/com/greenmiststudios/common/components/App.kt

@@ -39,13 +39,13 @@ import org.koin.compose.KoinContext
 @OptIn(ExperimentalMaterialApi::class)
 @Composable
 internal fun App() {
-  Box(
-    modifier =
-    Modifier.fillMaxSize()
-      .statusBarsPadding()
-      .navigationBarsPadding()
-  ) {
-    KoinContext {
+  KoinContext {
+    Box(
+      modifier =
+      Modifier.fillMaxSize()
+        .statusBarsPadding()
+        .navigationBarsPadding()
+    ) {
       MaterialTheme(
         shapes = Shapes(
           small = RoundedCornerShape(4.dp),

common/src/commonMain/kotlin/com/greenmiststudios/common/di/Koins.kt

@@ -0,0 +1,11 @@
+package com.greenmiststudios.common.di
+
+import org.koin.dsl.KoinAppDeclaration
+import org.koin.core.context.startKoin as startInternalKoin
+
+public fun startTidyKoin(platformSpecificConfig: KoinAppDeclaration = {}) {
+  startInternalKoin {
+    modules(appModule())
+    platformSpecificConfig()
+  }
+}

common/src/iosMain/kotlin/com/greenmiststudios/common/platform.kt

@@ -18,22 +18,6 @@ public actual fun getPlatformName(): String {
 }
 
 @Composable
-private fun UIShow() {
+public fun UIShow() {
   App()
-}
-
-public fun MainViewController(): UIViewController = ComposeUIViewController {
-  MaterialTheme(
-    colorScheme = if (isSystemInDarkTheme()) darkColorScheme() else lightColorScheme()
-  ) {
-    Surface(
-      modifier = Modifier.fillMaxSize(),
-    ) {
-      Column(
-        modifier = Modifier.fillMaxSize(),
-      ) {
-        UIShow()
-      }
-    }
-  }
 }

common/src/jsMain/kotlin/com/greenmiststudios/common/platform.kt

@@ -4,15 +4,12 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.darkColorScheme
 import androidx.compose.material3.lightColorScheme
 import com.greenmiststudios.common.UIShow
-import com.greenmiststudios.common.di.appModule
+import com.greenmiststudios.common.di.startTidyKoin
 import org.jetbrains.skiko.wasm.onWasmReady
-import org.koin.core.context.startKoin
 
 public fun main() {
   onWasmReady {
-    startKoin {
-      modules(appModule())
-    }
+    startTidyKoin()
 
     Window("tidy") {
       MaterialTheme(colorScheme = if (isSystemInDarkTheme()) darkColorScheme() else lightColorScheme()) {