IOS-646 Update CI for Xcode 15

NYPL-Simplified · Feb 5, 2024 · eb531f7 · eb531f7
1 parent 3587bd2
commit eb531f7
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/archive-and-upload.yml b/.github/workflows/archive-and-upload.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Check Carthage version
         run: command -v carthage && carthage version
       - name: Checkout main repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           token: ${{ secrets.IOS_DEV_CI_PAT }}
       - name: Add Private Repo Auth
@@ -49,13 +49,13 @@ jobs:
       - name: Check available Xcodes
         run: ls -la /Applications | grep Xcode
       - name: Force Xcode we use for development
-        run: sudo xcode-select -switch /Applications/Xcode_14.3.app
+        run: sudo xcode-select -switch /Applications/Xcode_15.0.1.app
       - name: Install Firebase Tools
         run: npm install -g firebase-tools
       - name: Check Firebase Tools version
         run: command -v firebase && firebase --version
       - name: Checkout main repo and submodules
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
           token: ${{ secrets.IOS_DEV_CI_PAT }}
@@ -72,7 +72,7 @@ jobs:
           GITHUB_REPO_OWNER: ${{ github.repository_owner }}
       - name: Checkout Adobe RMSDK
         if: needs.version-check.outputs.simplye_changed == '1'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: NYPL-Simplified/DRM-iOS-AdeptConnector
           token: ${{ secrets.IOS_DEV_CI_PAT }}

diff --git a/.github/workflows/non-drm-build.yml b/.github/workflows/non-drm-build.yml
@@ -10,9 +10,9 @@ jobs:
       - name: Check available Xcodes
         run: ls -la /Applications | grep Xcode
       - name: Force Xcode we use for development
-        run: sudo xcode-select -switch /Applications/Xcode_14.3.app
+        run: sudo xcode-select -switch /Applications/Xcode_15.0.1.app
       - name: Checkout main repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up repo for nonDRM build
         run: exec ./scripts/setup-repo-nodrm.sh
         env:

diff --git a/.github/workflows/unit-testing.yml b/.github/workflows/unit-testing.yml
@@ -13,14 +13,14 @@ jobs:
       - name: Check available Xcodes
         run: ls -la /Applications | grep Xcode
       - name: Force Xcode we use for development
-        run: sudo xcode-select -switch /Applications/Xcode_14.3.app
+        run: sudo xcode-select -switch /Applications/Xcode_15.0.1.app
       - name: Checkout main repo and submodules
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
           token: ${{ secrets.IOS_DEV_CI_PAT }}
       - name: Checkout Adobe RMSDK
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: NYPL-Simplified/DRM-iOS-AdeptConnector
           token: ${{ secrets.IOS_DEV_CI_PAT }}

diff --git a/scripts/xcode-build-nodrm.sh b/scripts/xcode-build-nodrm.sh
@@ -17,6 +17,6 @@ echo "Building SimplyE without DRM support..."
 
 xcodebuild -project Simplified.xcodeproj \
            -scheme SimplyE-noDRM \
-           -destination platform=iOS\ Simulator,OS=16.4,name=iPhone\ 14\ Pro\
+           -destination platform=iOS\ Simulator,OS=17.2,name=iPhone\ 15\ Pro\
            clean build | \
            if command -v xcpretty &> /dev/null; then xcpretty; else cat; fi
diff --git a/scripts/xcode-test.sh b/scripts/xcode-test.sh
@@ -22,7 +22,7 @@ echo "Running unit tests for $APP_NAME..."
 # packages with the version checked in in Package.resolved
 xcodebuild -project "$PROJECT_NAME" \
            -scheme "$SCHEME" \
-           -destination platform=iOS\ Simulator,OS=16.4,name=iPhone\ 14 \
+           -destination platform=iOS\ Simulator,OS=17.2,name=iPhone\ 15 \
            -disableAutomaticPackageResolution \
            clean test | \
            if command -v xcpretty &> /dev/null; then xcpretty; else cat; fi