Merge branch 'main' into renovate/compose.bom

.github/workflows/build.yml

@@ -13,9 +13,10 @@ concurrency:
 env:
   JDK_VERSION: 17
   DISTRIBUTION: 'zulu'
+  FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT: 120
 
 jobs:
-  android:
+  build-android:
     runs-on: ubuntu-latest
     env:
       TMDB_API_KEY: ${{ secrets.TMDB_API_KEY }}
@@ -101,49 +102,6 @@ jobs:
           name: dependency-health-report
           path: ./**/build/reports/tests/
 
-  jvm_test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4
-        with:
-          distribution: ${{ env.DISTRIBUTION }}
-          java-version: ${{ env.JDK_VERSION }}
-
-      - name: Jvm Test
-        run: ./gradlew jvmTest
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: jvm-test-report
-          path: ./**/build/reports/tests/
-
-  common_test:
-    runs-on: macos-latest
-    steps:
-      - name: checkout
-        uses: actions/checkout@v4
-
-      - name: Set up JDK
-        uses: actions/setup-java@v4
-        with:
-          distribution: ${{ env.DISTRIBUTION }}
-          java-version: ${{ env.JDK_VERSION }}
-
-      - name: Run Common iOS Unit Tests
-        run: |
-          if [[ $(uname -m) == 'arm64' ]]; then
-            ./gradlew clean iosSimulatorArm64Test
-          else
-            ./gradlew clean iosX64Test
-          fi
-
-      - name: Upload Common Test Report
-        uses: actions/upload-artifact@v4
-        with:
-          name: common-test-report
-          path: ./**/build/reports/tests/
-
   android_screenshot_test:
     runs-on: macos-latest
 
@@ -200,33 +158,90 @@ jobs:
           name: screenshot-test-results
           path: '**/build/outputs/roborazzi/*_compare.png'
 
-  iOS:
+  jvm_test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
+        with:
+          distribution: ${{ env.DISTRIBUTION }}
+          java-version: ${{ env.JDK_VERSION }}
+
+      - name: Jvm Test
+        run: ./gradlew jvmTest
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: jvm-test-report
+          path: ./**/build/reports/tests/
+
+  common_test:
     runs-on: macos-latest
+
     steps:
       - name: checkout
         uses: actions/checkout@v4
 
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: 17
-          distribution: 'zulu'
+          distribution: ${{ env.DISTRIBUTION }}
+          java-version: ${{ env.JDK_VERSION }}
 
       - name: Run Common iOS Unit Tests
         run: |
           if [[ $(uname -m) == 'arm64' ]]; then
-            ./gradlew iosSimulatorArm64Test
+            ./gradlew clean iosSimulatorArm64Test
           else
-            ./gradlew iosX64Test
+            ./gradlew clean iosX64Test
           fi
 
-      - uses: actions/upload-artifact@v4
+      - name: Upload Common Test Report
+        uses: actions/upload-artifact@v4
         with:
-          name: unit-test-report
+          name: common-test-report
           path: ./**/build/reports/tests/
 
+  build-ios:
+    runs-on: macos-latest
+    timeout-minutes: 180
+
+    steps:
+      - name: Checkout project
+        uses: actions/checkout@v4
+
+      - name: Setup Xcode  
+        uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: 15.4
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.3.0
+          bundler-cache: true
+
+      - name: Install dependencies with Bundler
+        run: bundle install
+
+      - name: Build iOS App
+        run: bundle exec fastlane build_tvmaniac
+
+      - name: Clear Derived Data
+        run: bundle exec fastlane clear_derived_data_lane        
+
+      # - name: Run UI Tests
+      #   run: bundle exec fastlane ui_tests
+
+      - name: Upload test results
+        uses: actions/upload-artifact@v4
+        if: failure()
+        with:
+          name: test-results
+          path: fastlane/test_output        
+
   create-release:
-    needs: [android, android_lint, android_screenshot_test, common_test, iOS, spotless, jvm_test, ]
+    needs: [build-android, android_lint, android_screenshot_test, common_test, build-ios, spotless, jvm_test, ]
     if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }}
     runs-on: ubuntu-latest
     steps:

.gitignore

@@ -83,3 +83,14 @@ DerivedData/
 !default.perspectivev3
 
 *.xcuserstate
+
+###### FastLane #######
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/test_output
+fastlane/builds
+/ios/fastlane/report.xml
+
+
+derived_data/
+*.xcresult

Gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem 'fastlane', '~> 2.222.0'
+
+plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
+eval_gemfile(plugins_path) if File.exist?(plugins_path)