Skip to content

Commit 21552bb

Browse files
committed
fix ios submission compliance and xcode selection
1 parent c38f1b3 commit 21552bb

File tree

3 files changed

+41
-2
lines changed

3 files changed

+41
-2
lines changed

.github/workflows/electron-release.yml

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ jobs:
251251
if-no-files-found: error
252252

253253
capacitor-ios:
254-
runs-on: macos-latest
254+
runs-on: macos-26
255255
steps:
256256
- uses: actions/checkout@v4
257257

@@ -271,6 +271,23 @@ jobs:
271271
with:
272272
ruby-version: ${{ env.RUBY_VERSION }}
273273

274+
- name: Select Xcode 26
275+
shell: bash
276+
run: |
277+
set -euo pipefail
278+
mapfile -t XCODE_APPS < <(find /Applications -maxdepth 1 -type d \( -name 'Xcode_26*.app' -o -name 'Xcode-26*.app' \) | sort -V)
279+
if [[ ${#XCODE_APPS[@]} -eq 0 && -d /Applications/Xcode.app ]]; then
280+
XCODE_APPS=(/Applications/Xcode.app)
281+
fi
282+
[[ ${#XCODE_APPS[@]} -gt 0 ]] || { echo "No Xcode 26 installation found under /Applications"; exit 1; }
283+
XCODE_APP="${XCODE_APPS[-1]}"
284+
sudo xcode-select -s "$XCODE_APP/Contents/Developer"
285+
XCODE_VERSION="$(xcodebuild -version | awk 'NR==1 {print $2}')"
286+
[[ "$XCODE_VERSION" == 26.* ]] || { echo "Expected Xcode 26.x but found $XCODE_VERSION"; exit 1; }
287+
echo "Selected $XCODE_APP"
288+
xcodebuild -version
289+
xcrun --sdk iphoneos --show-sdk-version
290+
274291
- name: Install fastlane gems
275292
working-directory: mobile/ios
276293
run: bundle install --jobs 4 --retry 3
@@ -415,14 +432,31 @@ jobs:
415432
ios-distribute:
416433
needs: [capacitor-ios, publish-release]
417434
if: startsWith(github.ref, 'refs/tags/v')
418-
runs-on: macos-latest
435+
runs-on: macos-26
419436
steps:
420437
- uses: actions/checkout@v4
421438

422439
- uses: ruby/setup-ruby@v1
423440
with:
424441
ruby-version: ${{ env.RUBY_VERSION }}
425442

443+
- name: Select Xcode 26
444+
shell: bash
445+
run: |
446+
set -euo pipefail
447+
mapfile -t XCODE_APPS < <(find /Applications -maxdepth 1 -type d \( -name 'Xcode_26*.app' -o -name 'Xcode-26*.app' \) | sort -V)
448+
if [[ ${#XCODE_APPS[@]} -eq 0 && -d /Applications/Xcode.app ]]; then
449+
XCODE_APPS=(/Applications/Xcode.app)
450+
fi
451+
[[ ${#XCODE_APPS[@]} -gt 0 ]] || { echo "No Xcode 26 installation found under /Applications"; exit 1; }
452+
XCODE_APP="${XCODE_APPS[-1]}"
453+
sudo xcode-select -s "$XCODE_APP/Contents/Developer"
454+
XCODE_VERSION="$(xcodebuild -version | awk 'NR==1 {print $2}')"
455+
[[ "$XCODE_VERSION" == 26.* ]] || { echo "Expected Xcode 26.x but found $XCODE_VERSION"; exit 1; }
456+
echo "Selected $XCODE_APP"
457+
xcodebuild -version
458+
xcrun --sdk iphoneos --show-sdk-version
459+
426460
- name: Install fastlane gems
427461
working-directory: mobile/ios
428462
run: bundle install --jobs 4 --retry 3

mobile/ios/App/App/Info.plist

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
<string>$(CURRENT_PROJECT_VERSION)</string>
2323
<key>LSRequiresIPhoneOS</key>
2424
<true/>
25+
<key>ITSAppUsesNonExemptEncryption</key>
26+
<false/>
2527
<key>UILaunchStoryboardName</key>
2628
<string>LaunchScreen</string>
2729
<key>UIMainStoryboardFile</key>

mobile/ios/fastlane/Fastfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,9 @@ platform :ios do
147147
ipa: ipa_path,
148148
skip_metadata: true,
149149
skip_screenshots: true,
150+
submission_information: {
151+
export_compliance_uses_encryption: false
152+
},
150153
submit_for_review: true,
151154
automatic_release: false,
152155
force: true,

0 commit comments

Comments
 (0)