Merge pull request #16 from stslex/dev

setup cocoapods for ios build
stslex · Nov 30, 2023 · 5c32e14 · 5c32e14
2 parents 800884f + f33b671
commit 5c32e14
Show file tree

Hide file tree

Showing 26 changed files with 304 additions and 97 deletions.
diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
@@ -0,0 +1,53 @@
+name: Project Build Linux
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+
+  build-android:
+
+    runs-on: ubuntu-latest
+
+    steps:
+
+      - name: Checkout branch
+        uses: actions/checkout@v2
+
+      - name: set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: gradle
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: Build with Gradle
+        run: ./gradlew assembleAndroidTest
+
+  build-desktop:
+
+    runs-on: ubuntu-latest
+
+    steps:
+
+      - name: Checkout branch
+        uses: actions/checkout@v2
+
+      - name: set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: gradle
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: Build with Gradle
+        run: ./gradlew desktopMainClasses desktopSourcesJar desktopTestClasses
diff --git a/.github/workflows/build_app.yml → .github/workflows/build_mac_os.yml b/.github/workflows/build_app.yml → .github/workflows/build_mac_os.yml
@@ -1,4 +1,4 @@
-name: Project Build
+name: Project Build MacOs
 
 on:
   push:
@@ -31,7 +31,4 @@ jobs:
           xcode-version: latest-stable
 
       - name: Build with Gradle
-        run: ./gradlew build
-
-      - name: Junit tests with Gradle
-        run: ./gradlew testDebugUnitTest
+        run: ./gradlew iosArm64Binaries
diff --git a/.gitignore b/.gitignore
@@ -17,3 +17,6 @@ captures
 !*.xcworkspace/contents.xcworkspacedata
 **/xcshareddata/WorkspaceSettings.xcsettings
 .fleet
+**/*.podspec
+/iosApp/Podfile.lock
+/iosApp/Pods
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,4 +7,5 @@ plugins {
     alias(libs.plugins.androidLibrary) apply false
     alias(libs.plugins.kotlinMultiplatform) apply false
     alias(libs.plugins.jetbrainsKotlinAndroid) apply false
+    alias(libs.plugins.kotlinCocoapods).apply(false)
 }
diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
     alias(libs.plugins.kotlinMultiplatform)
     alias(libs.plugins.androidApplication)
     alias(libs.plugins.jetbrainsCompose)
+    alias(libs.plugins.kotlinCocoapods)
 }
 
 kotlin {
@@ -17,12 +18,17 @@ kotlin {
 
     jvm("desktop")
 
-    listOf(
-        iosX64(),
-        iosArm64(),
-        iosSimulatorArm64()
-    ).forEach { iosTarget ->
-        iosTarget.binaries.framework {
+    iosX64()
+    iosArm64()
+    iosSimulatorArm64()
+
+    cocoapods {
+        summary = "Some description for the Shared Module"
+        homepage = "Link to the Shared Module homepage"
+        version = "1.0"
+        ios.deploymentTarget = "16.0"
+        podfile = project.file("../iosApp/Podfile")
+        framework {
             baseName = "ComposeApp"
             isStatic = true
         }

diff --git a/core/core/build.gradle.kts b/core/core/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
     alias(libs.plugins.kotlinMultiplatform)
     alias(libs.plugins.androidLibrary)
     alias(libs.plugins.jetbrainsCompose)
+    alias(libs.plugins.kotlinCocoapods)
 }
 
 kotlin {
@@ -15,14 +16,17 @@ kotlin {
 
     jvm("desktop")
 
-    listOf(
-        iosX64(),
-        iosArm64(),
-        iosSimulatorArm64()
-    ).forEach {
-        it.binaries.framework {
+    iosX64()
+    iosArm64()
+    iosSimulatorArm64()
+    cocoapods {
+        summary = "Some description for the Shared Module"
+        homepage = "Link to the Shared Module homepage"
+        version = "1.0"
+        ios.deploymentTarget = "16.0"
+        podfile = project.file(project.rootProject.projectDir.path + "/iosApp/CorePodfile")
+        framework {
             baseName = "core"
-            isStatic = true
         }
     }
 

diff --git a/core/database/build.gradle.kts b/core/database/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
     alias(libs.plugins.kotlinMultiplatform)
     alias(libs.plugins.androidLibrary)
     alias(libs.plugins.jetbrainsCompose)
+    alias(libs.plugins.kotlinCocoapods)
     kotlin("plugin.serialization") version "1.9.20"
 }
 
@@ -16,14 +17,17 @@ kotlin {
 
     jvm("desktop")
 
-    listOf(
-        iosX64(),
-        iosArm64(),
-        iosSimulatorArm64()
-    ).forEach {
-        it.binaries.framework {
-            baseName = "database"
-            isStatic = true
+    iosX64()
+    iosArm64()
+    iosSimulatorArm64()
+    cocoapods {
+        summary = "Some description for the Shared Module"
+        homepage = "Link to the Shared Module homepage"
+        version = "1.0"
+        ios.deploymentTarget = "16.0"
+        podfile = project.file(project.rootProject.projectDir.path + "/iosApp/CoreDatabasePodfile")
+        framework {
+            baseName = "coreDatabase"
         }
     }
 

diff --git a/core/network/build.gradle.kts b/core/network/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
     alias(libs.plugins.kotlinMultiplatform)
     alias(libs.plugins.androidLibrary)
     alias(libs.plugins.jetbrainsCompose)
+    alias(libs.plugins.kotlinCocoapods)
     kotlin("plugin.serialization") version "1.9.20"
 }
 
@@ -16,14 +17,17 @@ kotlin {
 
     jvm("desktop")
 
-    listOf(
-        iosX64(),
-        iosArm64(),
-        iosSimulatorArm64()
-    ).forEach {
-        it.binaries.framework {
-            baseName = "network"
-            isStatic = true
+    iosX64()
+    iosArm64()
+    iosSimulatorArm64()
+    cocoapods {
+        summary = "Some description for the Shared Module"
+        homepage = "Link to the Shared Module homepage"
+        version = "1.0"
+        ios.deploymentTarget = "16.0"
+        podfile = project.file(project.rootProject.projectDir.path + "/iosApp/CoreNetworkPodfile")
+        framework {
+            baseName = "coreNetwork"
         }
     }
 

diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
     alias(libs.plugins.kotlinMultiplatform)
     alias(libs.plugins.androidLibrary)
     alias(libs.plugins.jetbrainsCompose)
+    alias(libs.plugins.kotlinCocoapods)
 }
 
 kotlin {
@@ -17,14 +18,17 @@ kotlin {
 
     jvm("desktop")
 
-    listOf(
-        iosX64(),
-        iosArm64(),
-        iosSimulatorArm64()
-    ).forEach {
-        it.binaries.framework {
-            baseName = "ui"
-            isStatic = true
+    iosX64()
+    iosArm64()
+    iosSimulatorArm64()
+    cocoapods {
+        summary = "Some description for the Shared Module"
+        homepage = "Link to the Shared Module homepage"
+        version = "1.0"
+        ios.deploymentTarget = "16.0"
+        podfile = project.file(project.rootProject.projectDir.path + "/iosApp/CoreUiPodfile")
+        framework {
+            baseName = "coreUi"
         }
     }
 

diff --git a/core/ui/src/commonMain/kotlin/com/stslex/core/ui/mvi/BaseStore.kt b/core/ui/src/commonMain/kotlin/com/stslex/core/ui/mvi/BaseStore.kt
@@ -42,45 +42,32 @@ abstract class BaseStore<S : State, E : Event, A : Action, N : Navigation>(
     private val _event: MutableSharedFlow<E> = MutableSharedFlow()
     val event: SharedFlow<E> = _event.asSharedFlow()
 
-    fun updateState(update: (S) -> S) {
+    protected fun updateState(update: (S) -> S) {
         mutableState.update(update)
     }
 
-    fun sendEvent(event: E) {
+    protected fun sendEvent(event: E) {
         screenModelScope.launch(appDispatcher.default) {
             this@BaseStore._event.emit(event)
         }
     }
 
-    fun navigate(event: N) {
+    protected fun navigate(event: N) {
         router(event)
     }
 
-    fun launch(
-        onError: suspend (Throwable) -> Unit = {},
-        onSuccess: suspend () -> Unit = {},
-        block: suspend CoroutineScope.() -> Unit,
-    ): Job = screenModelScope.launch(appDispatcher.default) {
-        runCatching { block() }
-            .onSuccess { onSuccess() }
-            .onFailure {
-                Logger.exception(it)
-                onError(it)
-            }
-    }
-
-    fun <T> launch(
-        action: suspend CoroutineScope.() -> T,
+    protected fun <T> launch(
         onError: suspend (Throwable) -> Unit = {},
         onSuccess: (T) -> Unit,
+        action: suspend CoroutineScope.() -> T,
     ): Job = screenModelScope.launch(
         context = exceptionHandler(onError) + appDispatcher.default,
         block = {
             onSuccess(action())
         }
     )
 
-    fun <T> Flow<T>.launchFlow(
+    protected fun <T> Flow<T>.launchFlow(
         onError: suspend (cause: Throwable) -> Unit = {},
         each: suspend (T) -> Unit
     ): Job = screenModelScope.launch(

diff --git a/feature/feed/build.gradle.kts b/feature/feed/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
     alias(libs.plugins.kotlinMultiplatform)
     alias(libs.plugins.androidLibrary)
     alias(libs.plugins.jetbrainsCompose)
+    alias(libs.plugins.kotlinCocoapods)
 }
 
 kotlin {
@@ -15,14 +16,17 @@ kotlin {
 
     jvm("desktop")
 
-    listOf(
-        iosX64(),
-        iosArm64(),
-        iosSimulatorArm64()
-    ).forEach {
-        it.binaries.framework {
-            baseName = "feed"
-            isStatic = true
+    iosX64()
+    iosArm64()
+    iosSimulatorArm64()
+    cocoapods {
+        summary = "Some description for the Shared Module"
+        homepage = "Link to the Shared Module homepage"
+        version = "1.0"
+        ios.deploymentTarget = "16.0"
+        podfile = project.file(project.rootProject.projectDir.path + "/iosApp/FeatureFeedPodfile")
+        framework {
+            baseName = "featureFeed"
         }
     }
 

diff --git a/feature/film/build.gradle.kts b/feature/film/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
     alias(libs.plugins.kotlinMultiplatform)
     alias(libs.plugins.androidLibrary)
     alias(libs.plugins.jetbrainsCompose)
+    alias(libs.plugins.kotlinCocoapods)
 }
 
 kotlin {
@@ -15,14 +16,17 @@ kotlin {
 
     jvm("desktop")
 
-    listOf(
-        iosX64(),
-        iosArm64(),
-        iosSimulatorArm64()
-    ).forEach {
-        it.binaries.framework {
-            baseName = "film"
-            isStatic = true
+    iosX64()
+    iosArm64()
+    iosSimulatorArm64()
+    cocoapods {
+        summary = "Some description for the Shared Module"
+        homepage = "Link to the Shared Module homepage"
+        version = "1.0"
+        ios.deploymentTarget = "16.0"
+        podfile = project.file(project.rootProject.projectDir.path + "/iosApp/FeatureFilmPodfile")
+        framework {
+            baseName = "featureFilm"
         }
     }