Merge eea8a8c into ad629f4

Author: mauricecarrier7

.github/workflows/non-drm-build.yml

@@ -2,10 +2,15 @@ name: NonDRM Build
 on: workflow_dispatch
 jobs:
   build:
-    runs-on: macOS-latest
+    runs-on: macos-14
     steps:
-      - name: Use the latest Xcode
-        run: sudo xcode-select -switch /Applications/Xcode.app
+      - name: Set up Xcode 16.2
+        uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: '16.2'
+
+      - name: Verify Xcode Version
+        run: xcodebuild -version
       - name: Checkout main repo
         uses: actions/checkout@v3
       - name: Set up repo for nonDRM build

.github/workflows/release-on-merge.yml

@@ -6,10 +6,15 @@ on:
     types: [closed]
 jobs:
   create-release:
-    runs-on: macOS-latest
+    runs-on: macos-14
     steps:
-      - name: Use the latest Xcode
-        run: sudo xcode-select -switch /Applications/Xcode.app
+      - name: Set up Xcode 16.2
+        uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: '16.2'
+
+      - name: Verify Xcode Version
+        run: xcodebuild -version
       - name: Checkout main repo and submodules
         uses: actions/checkout@v3
         with:
@@ -36,7 +41,7 @@ jobs:
         env:
           RELEASE_NOTES_PATH: ${{ env.RELEASE_NOTES_PATH }}
           CHANGELOG_PATH: ${{ env.CHANGELOG_PATH }}
-          VERSION_NUM: ${{ env.VERSION_NUM }}          
+          VERSION_NUM: ${{ env.VERSION_NUM }}
       - name: Create Release
         id: create_release
         uses: actions/create-release@v1

.github/workflows/release.yml

@@ -6,6 +6,9 @@ jobs:
     steps:
       - name: Use the latest Xcode
         run: sudo xcode-select -switch /Applications/Xcode.app
+
+      - name: Verify Xcode Version
+        run: xcodebuild -version
       - name: Checkout main repo and submodules
         uses: actions/checkout@v3
         with:
@@ -32,7 +35,7 @@ jobs:
         env:
           RELEASE_NOTES_PATH: ${{ env.RELEASE_NOTES_PATH }}
           CHANGELOG_PATH: ${{ env.CHANGELOG_PATH }}
-          VERSION_NUM: ${{ env.VERSION_NUM }}          
+          VERSION_NUM: ${{ env.VERSION_NUM }}
       - name: Create Release
         id: create_release
         uses: actions/create-release@v1

.github/workflows/unit-testing.yml

@@ -2,38 +2,67 @@ name: Unit Tests
 on: [ pull_request, workflow_dispatch ]
 jobs:
   build-and-test:
-    runs-on: macOS-latest
+    runs-on: macos-14
     steps:
-      - name: Use the latest Xcode
-        run: sudo xcode-select -switch /Applications/Xcode.app
+      - name: Set up Xcode 16.2
+        uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: '16.2'
+
+      - name: Verify Xcode Version
+        run: xcodebuild -version
+        
       - name: Checkout main repo and submodules
         uses: actions/checkout@v3
         with:
           submodules: true
           token: ${{ secrets.CI_GITHUB_ACCESS_TOKEN }}
+          
+      - name: Cache Swift packages
+        uses: actions/cache@v4
+        with:
+          path: |
+            .build
+            SourcePackages
+            ~/Library/Developer/Xcode/DerivedData/**/SourcePackages
+          key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
+          restore-keys: |
+            ${{ runner.os }}-spm-
+            
+      - name: Cache Xcode DerivedData
+        uses: actions/cache@v4
+        with:
+          path: ~/Library/Developer/Xcode/DerivedData
+          key: ${{ runner.os }}-deriveddata-${{ hashFiles('**/*.xcodeproj/project.pbxproj') }}
+          restore-keys: |
+            ${{ runner.os }}-deriveddata-
+            
       - name: Checkout Certificates
         uses: actions/checkout@v3
         with:
           repository: ThePalaceProject/mobile-certificates
           token: ${{ secrets.CI_GITHUB_ACCESS_TOKEN }}
           path: ./mobile-certificates
+          
       - name: Checkout Adobe RMSDK
         uses: ./.github/actions/checkout-adobe
         with:
           token: ${{ secrets.CI_GITHUB_ACCESS_TOKEN }}
+          
       - name: Setup repo with DRM
         run: ./scripts/setup-repo-drm.sh
         env:
           BUILD_CONTEXT: ci
+          
       - name: Build non-Carthage 3rd party dependencies
         run: ./scripts/build-3rd-party-dependencies.sh
         env:
           BUILD_CONTEXT: ci
-      - name: Build Palace without DRM support
-        run: ./scripts/xcode-build-nodrm.sh
-        env:
-          BUILD_CONTEXT: ci
-      - name: Run Palace unit tests
-        run: ./scripts/xcode-test.sh
+          
+      - name: List available simulators for debugging
+        run: xcrun simctl list devices available | grep iPhone | head -10
+        
+      - name: Run Palace unit tests (builds automatically)
+        run: ./scripts/xcode-test-optimized.sh
         env:
           BUILD_CONTEXT: ci

.github/workflows/upload-on-merge.yml

@@ -9,8 +9,19 @@ on:
 
 jobs:
   check-version:
-    runs-on: macos-15
+    # Using macos-14 explicitly to avoid transition issues with macos-latest
+    # See: https://github.com/actions/runner-images/issues/12520
+    # TODO: Plan migration to macos-15 before August 2025
+    runs-on: macos-14
     steps:
+
+      
+      - name: Checkout main repo and submodules
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+          token: ${{ secrets.CI_GITHUB_ACCESS_TOKEN }}
+
       - name: Set up Xcode 16.2
         uses: maxim-lobanov/setup-xcode@v1
         with:
@@ -19,12 +30,6 @@ jobs:
       - name: Verify Xcode Version
         run: xcodebuild -version
 
-      - name: Checkout main repo and submodules
-        uses: actions/checkout@v3
-        with:
-          submodules: true
-          token: ${{ secrets.CI_GITHUB_ACCESS_TOKEN }}
-
       - id: checkVersion
         name: Check Build Version
         run: ./scripts/ios-check-version.sh
@@ -34,11 +39,11 @@ jobs:
       should_upload: ${{ steps.checkVersion.outputs.version_changed }}
 
   upload-build:
-    runs-on: macos-15
+    runs-on: macos-14
     needs: check-version
     if: github.event.pull_request.merged == true && needs.check-version.outputs.should_upload == '1'
     steps:
-      - name: Set up Xcode 16.2
+      - name: Force Xcode 16
         uses: maxim-lobanov/setup-xcode@v1
         with:
           xcode-version: '16.2'
@@ -96,6 +101,10 @@ jobs:
         run: ./scripts/xcode-export-adhoc.sh
         env:
           BUILD_CONTEXT: ci
+          XCODE_VERSION: "16.2"
+          IPHONEOS_DEPLOYMENT_TARGET: "16.0"
+          ONLY_ACTIVE_ARCH: "NO"
+          ARCHS: "arm64"
 
       - name: Set up Python
         uses: actions/setup-python@v4
@@ -108,14 +117,12 @@ jobs:
           source .venv/bin/activate
           python3 -m pip install --upgrade pip
           python3 -m pip install requests
-
       - name: Debug Python Environment
         run: |
           source .venv/bin/activate
           echo "✅ Python Location: $(which python3)"
           python3 -m pip list
           python3 -m pip show requests || echo "❌ requests not found"
-
       - name: Create release notes
         run: |
           source .venv/bin/activate
@@ -140,5 +147,9 @@ jobs:
         run: ./scripts/xcode-export-appstore.sh
         env:
           BUILD_CONTEXT: ci
-          timeout-minutes: 15
+          XCODE_VERSION: "16.2"
+          IPHONEOS_DEPLOYMENT_TARGET: "16.0"
+          ONLY_ACTIVE_ARCH: "NO"
+          ARCHS: "arm64"
           CHANGELOG_PATH: ${{ env.CHANGELOG_PATH }}
+        timeout-minutes: 15

Cartfile

@@ -1 +1,2 @@
 
+

Gemfile.lock

@@ -177,4 +177,4 @@ DEPENDENCIES
   fastlane
 
 BUNDLED WITH
-   1.17.2
+   2.7.1

Palace.xcconfig

@@ -1,4 +1,4 @@
-HEADER_SEARCH_PATHS = $(inherited) "$(SDKROOT)/usr/include/libxml2" "$(SRCROOT)/readium-sdk/Platform/Apple/RDServices" "$(SRCROOT)/readium-sdk/Platform/Apple/include" "$(SRCROOT)/ios-tenprintcover/TenPrintCover" "$(SRCROOT)/ios-audiobook-overdrive/OverdriveProcessor" "$(SRCROOT)/adept-ios" "$(SRCROOT)/adobe-content-filter/public" "$(SRCROOT)/adobe-rmsdk/dp/public" "$(SRCROOT)/adobe-rmsdk/xml/uft/public"
+HEADER_SEARCH_PATHS = $(inherited) "$(SDKROOT)/usr/include/libxml2" "$(SRCROOT)/ios-tenprintcover/TenPrintCover" "$(SRCROOT)/ios-audiobook-overdrive/OverdriveProcessor" "$(SRCROOT)/adept-ios" "$(SRCROOT)/adobe-content-filter/public" "$(SRCROOT)/adobe-rmsdk/dp/public" "$(SRCROOT)/adobe-rmsdk/xml/uft/public"
 
 WARNING_CFLAGS = -Wall -Wextra -Weverything -Wno-objc-missing-property-synthesis -Wno-c11-extensions -Wno-documentation -Wno-c++98-compat-pedantic -Wno-c++98-compat