Feature/build ios

.github/pull_request_template.md

@@ -0,0 +1,24 @@
+# Description
+
+_What is the purpose of this PR?_
+
+## Changes
+
+_Describe your changes in details here: what did you add, remove or modified?_
+
+## Linked issues
+
+_If this PR resolves open issues, link them here._
+
+## Remaining TODOs
+
+_If there are still things about these changes that should be picked up in later PRs, please list
+them here and open issues if needed._
+
+## Checklist
+
+- [ ] Code compiles correctly on all platforms
+- [ ] All pre-existing tests are passing
+- [ ] If needed, new tests have been added
+- [ ] Extended the README / documentation if necessary
+- [ ] Added code has been documented

.github/workflows/test.yml

@@ -24,9 +24,16 @@ jobs:
       - name: Job set up
         uses: ./.github/actions/job-set-up
 
-      - run: ./gradlew :shared:cleanTestDebugUnitTest :shared:testDebugUnitTest
-
-
+      - name: Run tests
+        run: ./gradlew :shared:cleanTestDebugUnitTest :shared:testDebugUnitTest
+
+      - name: Upload reports
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: shared-reports
+          path: |
+            **/build/reports/*
 
   Android:
     if: ${{ inputs.shouldRunKmp == 'true' || inputs.shouldRunAndroid == 'true' }}
@@ -38,12 +45,20 @@ jobs:
       - name: Job set up
         uses: ./.github/actions/job-set-up
 
-      - run: ./gradlew :androidApp:cleanTestDebugUnitTest :shared:testDebugUnitTest
+      - name: Run tests
+        run: ./gradlew :androidApp:cleanTestDebugUnitTest :shared:testDebugUnitTest
+
+      - name: Upload reports
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: android-reports
+          path: |
+            **/build/reports/*
 
   iOS:
-    #if: ${{ inputs.shouldRunKmp == 'true' || inputs.shouldRunIos == 'true' }}
-    if: false # not ready for ios (linux dev env)
-    runs-on: macos-13
+    if: ${{ inputs.shouldRunKmp == 'true' || inputs.shouldRunIos == 'true' }}
+    runs-on: macos-latest
     timeout-minutes: 60
     steps:
       - uses: actions/checkout@v3
@@ -62,13 +77,12 @@ jobs:
         with:
           cache-disabled: true
 
-      - name: iosX64Test
-        # Disable CC due to https://github.com/google/ksp/issues/1463
-        run: ./gradlew iosX64Test --no-configuration-cache
+      - name: run tests
+        run: ./gradlew :shared:cleanIosSimulatorArm64Test :shared:iosSimulatorArm64Test
 
       - name: Upload reports
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ios-reports
           path: |

androidApp/build.gradle.kts

@@ -65,7 +65,7 @@ dependencies {
     // Appyx
     implementation(libs.appyx.navigation)
     implementation(libs.appyx.components.backstack)
-    ksp(libs.appyx.mutable.ui.processor)
+    ksp(libs.appyx.processor)
 
     // Koin
     implementation(libs.koin.android)

androidApp/src/main/kotlin/org/noise_planet/noisecapture/starter/MainActivity.kt

@@ -101,9 +101,9 @@ class MainActivity : NodeActivity() {
             AppyxStarterKitTheme {
                 NodeHost(
                     lifecycle = AndroidLifecycle(LocalLifecycleOwner.current.lifecycle),
-                    integrationPoint = appyxV2IntegrationPoint,
+                    integrationPoint = appyxIntegrationPoint,
                 ) {
-                    RootNode(buildContext = it, koin = koinApplication.koin)
+                    RootNode(nodeContext = it, koin = koinApplication.koin)
                 }
             }
         }

build.gradle.kts

@@ -4,5 +4,4 @@ plugins {
     id("com.android.application") version libs.versions.agp.get() apply false
     id("org.jetbrains.compose") version libs.versions.compose.plugin.get() apply false
     id("com.google.devtools.ksp") version libs.versions.ksp.get() apply false
-    id("com.goncalossilva.resources") version libs.versions.kotxresources.get() apply false
 }

gradle/libs.versions.toml

@@ -10,50 +10,48 @@ androidx-activity-compose = "1.8.2"
 androidx-lifecycle = "2.7.0"
 androidx-test-espresso-core = "3.5.1"
 androidx-test-junit = "1.1.5"
-appyx = "2.0.0-alpha09"
+appcompat = "1.6.1"
+appyx = "2.0.1"
+compose-compiler = "1.6.11"
+compose-plugin = "1.6.11"
 compose-ui-test-junit4 = "1.6.2"
-compose-compiler = "1.5.10"
-compose-plugin = "1.5.12"
 core-ktx = "1.12.0"
 coroutines = "1.8.0"
 junit = "4.13.2"
 jvm-target = "1.8"
-koin-android = "3.4.0"
+koin-android = "3.5.6"
+koin-core = "3.5.6"
 kotlin = "1.9.22"
-ksp = "1.9.22-1.0.17"
-koin-core = "3.4.0"
-appcompat = "1.6.1"
-kotxresources= "0.4.0"
-kotxdatetime = "0.5.0"
 kotlinWrappersVersion = "1.0.0-pre.700"
+kotxdatetime = "0.5.0"
+ksp = "1.9.22-1.0.17"
 sqliteFramework = "2.4.0"
 
 [libraries]
-androidx-sqlite-framework = { module = "androidx.sqlite:sqlite-framework", version.ref = "sqliteFramework" }
-sqldelight-android-driver = { module = "app.cash.sqldelight:android-driver", version.ref = "androidDriver" }
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" }
 androidx-core = { module = "androidx.core:core-ktx", version.ref = "core-ktx" }
 androidx-lifecycle-runtime = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidx-lifecycle" }
+androidx-sqlite-framework = { module = "androidx.sqlite:sqlite-framework", version.ref = "sqliteFramework" }
 androidx-test-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "androidx-test-espresso-core" }
 androidx-test-junit = { module = "androidx.test.ext:junit", version.ref = "androidx-test-junit" }
+appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
 appyx-components-backstack = { module = "com.bumble.appyx:backstack", version.ref = "appyx" }
-appyx-mutable-ui-processor = { module = "com.bumble.appyx:mutable-ui-processor", version.ref = "appyx" }
 appyx-navigation = { module = "com.bumble.appyx:appyx-navigation", version.ref = "appyx" }
+appyx-processor = { module = "com.bumble.appyx:appyx-processor", version.ref = "appyx" }
 compose-material = { module = "androidx.compose.material:material" }
 compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "compose-ui-test-junit4" }
 compose-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" }
 compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
 compose-ui-ui = { module = "androidx.compose.ui:ui" }
 junit = { module = "junit:junit", version.ref = "junit" }
 koin-android = { module = "io.insert-koin:koin-android", version.ref = "koin-android" }
-kotlin-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
 koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin-core" }
-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
-kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
-kotlinx-resources-test =  { module = "com.goncalossilva:resources", version.ref = "kotxresources" }
-kotlinx-datetime =  { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotxdatetime" }
 kotlin-browser = { module = "org.jetbrains.kotlin-wrappers:kotlin-browser", version.ref = "kotlinWrappersVersion" }
-sqldelight-native-driver = { module = "app.cash.sqldelight:native-driver", version.ref = "androidDriver" }
+kotlin-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
+kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
+kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotxdatetime" }
+sqldelight-android-driver = { module = "app.cash.sqldelight:android-driver", version.ref = "androidDriver" }
 sqldelight-driver = { module = "app.cash.sqldelight:web-worker-driver", version.ref = "androidDriver" }
+sqldelight-native-driver = { module = "app.cash.sqldelight:native-driver", version.ref = "androidDriver" }
 
 

ios/ios.podspec

@@ -46,5 +46,5 @@ Pod::Spec.new do |spec|
             SCRIPT
         }
     ]
-    spec.resources = ['build/compose/ios/ios/compose-resources']
+    spec.resources = ['build/compose/cocoapods/compose-resources']
 end

ios/src/iosMain/kotlin/main.ios.kt

@@ -10,8 +10,6 @@ import org.noise_planet.noisecapture.shared.root.RootNode
 import org.noise_planet.noisecapture.shared.ui.theme.AppyxStarterKitTheme
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.receiveAsFlow
-import org.koin.dsl.module
-import org.noise_planet.noisecapture.AudioSource
 import org.noise_planet.noisecapture.shared.initKoin
 
 val backEvents: Channel<Unit> = Channel()
@@ -34,7 +32,7 @@ fun MainViewController() = ComposeUIViewController {
                 integrationPoint = remember { integrationPoint }
             ) { buildContext ->
                 RootNode(
-                    buildContext = buildContext,
+                    nodeContext = buildContext,
                     koin = koinApplication.koin
                 )
             }

iosApp/Podfile.lock

@@ -9,8 +9,8 @@ EXTERNAL SOURCES:
     :path: "../ios"
 
 SPEC CHECKSUMS:
-  ios: 5b21e95f0c1d9cb095c7a93a139a4de48ea3acf5
+  ios: 989e584c71d4e679af44b91c48d4d976d44cbf4e
 
 PODFILE CHECKSUM: a1e557981a2880940a401c85ea35aafdd5895941
 
-COCOAPODS: 1.12.0
+COCOAPODS: 1.15.2