Cleanup separate modules

.github/workflows/android.yml

@@ -5,8 +5,6 @@ on:
     branches:
       - main
   pull_request:
-    branches:
-      - main
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -17,22 +15,27 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
+
     - name: set up JDK 17
       uses: actions/setup-java@v4
       with:
         java-version: '17'
         distribution: 'temurin'
         cache: gradle
 
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
+    - name: Setup gradle
+      uses: gradle/gradle-build-action@v2
+      with:
+        gradle-home-cache-cleanup: true
+
     - name: Build with Gradle
-      run: ./gradlew android:assembleDebug
+      run: ./gradlew composeApp:assembleDebug
 
   build-release:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+
       - name: set up JDK 17
         uses: actions/setup-java@v4
         with:
@@ -42,13 +45,15 @@ jobs:
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
+
       - name: Build with Gradle
-        run: ./gradlew android:assembleRelease
+        run: ./gradlew composeApp:assembleRelease
 
   test:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+
       - name: set up JDK 17
         uses: actions/setup-java@v4
         with:
@@ -58,5 +63,6 @@ jobs:
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
+
       - name: Build with Gradle
-        run: ./gradlew android:check
+        run: ./gradlew composeApp:testDebugUnitTest

.github/workflows/desktop-web.yml

@@ -5,8 +5,6 @@ on:
     branches:
       - main
   pull_request:
-    branches:
-      - main
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -27,11 +25,13 @@ jobs:
           distribution: 'temurin'
           cache: gradle
 
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
+      - name: Setup gradle
+        uses: gradle/gradle-build-action@v2
+        with:
+          gradle-home-cache-cleanup: true
 
       - name: Build with Gradle
-        run: ./gradlew desktop:assemble
+        run: ./gradlew composeApp:desktopJar
 
   Build-Web:
     runs-on: ubuntu-latest
@@ -56,4 +56,4 @@ jobs:
           node-version: '10.x'
 
       - name: Build with Gradle
-        run: ./gradlew jsApp:assemble
+        run: ./gradlew composeApp:jsJar

.github/workflows/ios.yml

@@ -4,9 +4,7 @@ on:
   push: 
     branches: 
       - main
-  pull_request: 
-    branches: 
-      - main
+  pull_request:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -16,6 +14,9 @@ jobs:
   build: 
     runs-on: macos-latest
     steps:
+      - name: Check Xcode version
+        run: /usr/bin/xcodebuild -version
+
       - name: Checkout Repo
         uses: actions/checkout@v4
 
@@ -26,20 +27,20 @@ jobs:
           distribution: 'temurin'
           cache: gradle
 
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-
-      - shell: bash
-        run: ./gradlew generateDummyFramework
-
-      - name: Set up cocoapods
-        uses: maxim-lobanov/setup-cocoapods@v1
-        with: 
-          version: latest
-
-      - name: Install cocoapods
-        shell: bash
-        run: ./gradlew podInstall
+      - name: Setup gradle
+        uses: gradle/gradle-build-action@v2
+        with:
+          gradle-home-cache-cleanup: true
 
-      - name: Build with Gradle
-        run: ./gradlew iosSimulatorArm64Binaries
+      - name: Build App
+        uses: yukiarrr/[email protected]
+        with:
+          project-path: iosApp/iosApp.xcodeproj
+          p12-base64: ${{ secrets.IOS_DEV_CERT }}
+          mobileprovision-base64: ${{ secrets.IOS_PROVISIONING_PROFILE }}
+          code-signing-identity: "Geoff Powell"
+          configuration: "Debug"
+          certificate-password: ${{ secrets.IOS_CERT_PASSWORD }}
+          scheme: "iosApp"
+          build-destination: "generic/platform=iOS"
+          team-id: ${{ secrets.IOS_TEAM_ID }}