Skip to content

Commit 54f0698

Browse files
committed
revert: restore pre-xcode-26 ios state
1 parent 8398d50 commit 54f0698

File tree

7 files changed

+31
-198
lines changed

7 files changed

+31
-198
lines changed

.github/workflows/electron-release.yml

Lines changed: 2 additions & 92 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-26
254+
runs-on: macos-latest
255255
steps:
256256
- uses: actions/checkout@v4
257257

@@ -271,51 +271,6 @@ 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-
CANDIDATES=""
279-
if [[ -d /Applications/Xcode.app ]]; then
280-
CANDIDATES="/Applications/Xcode.app"
281-
fi
282-
EXTRA_CANDIDATES="$(find /Applications -maxdepth 1 -type d \( -name 'Xcode_26*.app' -o -name 'Xcode-26*.app' \) ! -name 'Xcode.app' | sort -r)"
283-
if [[ -n "$EXTRA_CANDIDATES" ]]; then
284-
CANDIDATES="${CANDIDATES:+${CANDIDATES}"$'\n'}${EXTRA_CANDIDATES}"
285-
fi
286-
SELECTED_XCODE_APP=""
287-
BETA_FALLBACK=""
288-
while IFS= read -r XCODE_APP; do
289-
[[ -n "$XCODE_APP" ]] || continue
290-
DEV_DIR="$XCODE_APP/Contents/Developer"
291-
SDK_DIR="$DEV_DIR/Platforms/iPhoneOS.platform/Developer/SDKs"
292-
XCODE_VERSION="$(DEVELOPER_DIR="$DEV_DIR" xcodebuild -version 2>/dev/null | awk 'NR==1 {print $2}')"
293-
SDK_VERSION="$(DEVELOPER_DIR="$DEV_DIR" xcrun --sdk iphoneos --show-sdk-version 2>/dev/null || true)"
294-
HAS_PLATFORM="no"
295-
if [[ -d "$SDK_DIR" ]] && find "$SDK_DIR" -maxdepth 1 -name 'iPhoneOS*.sdk' | grep -q .; then
296-
HAS_PLATFORM="yes"
297-
fi
298-
echo "Candidate: $XCODE_APP, Xcode ${XCODE_VERSION:-unknown}, iPhoneOS SDK ${SDK_VERSION:-missing}, platform installed: $HAS_PLATFORM"
299-
if [[ "$XCODE_VERSION" == 26.* && "$SDK_VERSION" == 26.* && "$HAS_PLATFORM" == "yes" ]]; then
300-
if [[ "$(basename "$XCODE_APP" | tr '[:upper:]' '[:lower:]')" == *beta* ]]; then
301-
[[ -n "$BETA_FALLBACK" ]] || BETA_FALLBACK="$XCODE_APP"
302-
continue
303-
fi
304-
SELECTED_XCODE_APP="$XCODE_APP"
305-
break
306-
fi
307-
done <<< "$CANDIDATES"
308-
[[ -n "$SELECTED_XCODE_APP" ]] || SELECTED_XCODE_APP="$BETA_FALLBACK"
309-
[[ -n "$SELECTED_XCODE_APP" ]] || { echo "No Xcode 26 installation with iPhoneOS 26 SDK platform found under /Applications"; exit 1; }
310-
sudo xcode-select -s "$SELECTED_XCODE_APP/Contents/Developer"
311-
XCODE_VERSION="$(xcodebuild -version | awk 'NR==1 {print $2}')"
312-
SDK_VERSION="$(xcrun --sdk iphoneos --show-sdk-version)"
313-
[[ "$XCODE_VERSION" == 26.* ]] || { echo "Expected Xcode 26.x but found $XCODE_VERSION"; exit 1; }
314-
[[ "$SDK_VERSION" == 26.* ]] || { echo "Expected iPhoneOS 26.x SDK but found $SDK_VERSION"; exit 1; }
315-
echo "Selected $SELECTED_XCODE_APP"
316-
xcodebuild -version
317-
echo "iPhoneOS SDK: $SDK_VERSION"
318-
319274
- name: Install fastlane gems
320275
working-directory: mobile/ios
321276
run: bundle install --jobs 4 --retry 3
@@ -460,59 +415,14 @@ jobs:
460415
ios-distribute:
461416
needs: [capacitor-ios, publish-release]
462417
if: startsWith(github.ref, 'refs/tags/v')
463-
runs-on: macos-26
418+
runs-on: macos-latest
464419
steps:
465420
- uses: actions/checkout@v4
466421

467422
- uses: ruby/setup-ruby@v1
468423
with:
469424
ruby-version: ${{ env.RUBY_VERSION }}
470425

471-
- name: Select Xcode 26
472-
shell: bash
473-
run: |
474-
set -euo pipefail
475-
CANDIDATES=""
476-
if [[ -d /Applications/Xcode.app ]]; then
477-
CANDIDATES="/Applications/Xcode.app"
478-
fi
479-
EXTRA_CANDIDATES="$(find /Applications -maxdepth 1 -type d \( -name 'Xcode_26*.app' -o -name 'Xcode-26*.app' \) ! -name 'Xcode.app' | sort -r)"
480-
if [[ -n "$EXTRA_CANDIDATES" ]]; then
481-
CANDIDATES="${CANDIDATES:+${CANDIDATES}"$'\n'}${EXTRA_CANDIDATES}"
482-
fi
483-
SELECTED_XCODE_APP=""
484-
BETA_FALLBACK=""
485-
while IFS= read -r XCODE_APP; do
486-
[[ -n "$XCODE_APP" ]] || continue
487-
DEV_DIR="$XCODE_APP/Contents/Developer"
488-
SDK_DIR="$DEV_DIR/Platforms/iPhoneOS.platform/Developer/SDKs"
489-
XCODE_VERSION="$(DEVELOPER_DIR="$DEV_DIR" xcodebuild -version 2>/dev/null | awk 'NR==1 {print $2}')"
490-
SDK_VERSION="$(DEVELOPER_DIR="$DEV_DIR" xcrun --sdk iphoneos --show-sdk-version 2>/dev/null || true)"
491-
HAS_PLATFORM="no"
492-
if [[ -d "$SDK_DIR" ]] && find "$SDK_DIR" -maxdepth 1 -name 'iPhoneOS*.sdk' | grep -q .; then
493-
HAS_PLATFORM="yes"
494-
fi
495-
echo "Candidate: $XCODE_APP, Xcode ${XCODE_VERSION:-unknown}, iPhoneOS SDK ${SDK_VERSION:-missing}, platform installed: $HAS_PLATFORM"
496-
if [[ "$XCODE_VERSION" == 26.* && "$SDK_VERSION" == 26.* && "$HAS_PLATFORM" == "yes" ]]; then
497-
if [[ "$(basename "$XCODE_APP" | tr '[:upper:]' '[:lower:]')" == *beta* ]]; then
498-
[[ -n "$BETA_FALLBACK" ]] || BETA_FALLBACK="$XCODE_APP"
499-
continue
500-
fi
501-
SELECTED_XCODE_APP="$XCODE_APP"
502-
break
503-
fi
504-
done <<< "$CANDIDATES"
505-
[[ -n "$SELECTED_XCODE_APP" ]] || SELECTED_XCODE_APP="$BETA_FALLBACK"
506-
[[ -n "$SELECTED_XCODE_APP" ]] || { echo "No Xcode 26 installation with iPhoneOS 26 SDK platform found under /Applications"; exit 1; }
507-
sudo xcode-select -s "$SELECTED_XCODE_APP/Contents/Developer"
508-
XCODE_VERSION="$(xcodebuild -version | awk 'NR==1 {print $2}')"
509-
SDK_VERSION="$(xcrun --sdk iphoneos --show-sdk-version)"
510-
[[ "$XCODE_VERSION" == 26.* ]] || { echo "Expected Xcode 26.x but found $XCODE_VERSION"; exit 1; }
511-
[[ "$SDK_VERSION" == 26.* ]] || { echo "Expected iPhoneOS 26.x SDK but found $SDK_VERSION"; exit 1; }
512-
echo "Selected $SELECTED_XCODE_APP"
513-
xcodebuild -version
514-
echo "iPhoneOS SDK: $SDK_VERSION"
515-
516426
- name: Install fastlane gems
517427
working-directory: mobile/ios
518428
run: bundle install --jobs 4 --retry 3

mobile/ios/App/App.xcodeproj/project.pbxproj

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
2FAD9763203C412B000D30F8 /* config.xml in Resources */ = {isa = PBXBuildFile; fileRef = 2FAD9762203C412B000D30F8 /* config.xml */; };
1111
50379B232058CBB4000EE86E /* capacitor.config.json in Resources */ = {isa = PBXBuildFile; fileRef = 50379B222058CBB4000EE86E /* capacitor.config.json */; };
1212
504EC3081FED79650016851F /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 504EC3071FED79650016851F /* AppDelegate.swift */; };
13+
504EC30D1FED79650016851F /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 504EC30B1FED79650016851F /* Main.storyboard */; };
1314
504EC30F1FED79650016851F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 504EC30E1FED79650016851F /* Assets.xcassets */; };
1415
504EC3121FED79650016851F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 504EC3101FED79650016851F /* LaunchScreen.storyboard */; };
1516
50B271D11FEDC1A000F3C39B /* public in Resources */ = {isa = PBXBuildFile; fileRef = 50B271D01FEDC1A000F3C39B /* public */; };
@@ -21,6 +22,7 @@
2122
50379B222058CBB4000EE86E /* capacitor.config.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = capacitor.config.json; sourceTree = "<group>"; };
2223
504EC3041FED79650016851F /* App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = App.app; sourceTree = BUILT_PRODUCTS_DIR; };
2324
504EC3071FED79650016851F /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
25+
504EC30C1FED79650016851F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
2426
504EC30E1FED79650016851F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
2527
504EC3111FED79650016851F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
2628
504EC3131FED79650016851F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -73,6 +75,7 @@
7375
children = (
7476
50379B222058CBB4000EE86E /* capacitor.config.json */,
7577
504EC3071FED79650016851F /* AppDelegate.swift */,
78+
504EC30B1FED79650016851F /* Main.storyboard */,
7679
504EC30E1FED79650016851F /* Assets.xcassets */,
7780
504EC3101FED79650016851F /* LaunchScreen.storyboard */,
7881
504EC3131FED79650016851F /* Info.plist */,
@@ -158,6 +161,7 @@
158161
50B271D11FEDC1A000F3C39B /* public in Resources */,
159162
504EC30F1FED79650016851F /* Assets.xcassets in Resources */,
160163
50379B232058CBB4000EE86E /* capacitor.config.json in Resources */,
164+
504EC30D1FED79650016851F /* Main.storyboard in Resources */,
161165
2FAD9763203C412B000D30F8 /* config.xml in Resources */,
162166
);
163167
runOnlyForDeploymentPostprocessing = 0;
@@ -212,6 +216,14 @@
212216
/* End PBXSourcesBuildPhase section */
213217

214218
/* Begin PBXVariantGroup section */
219+
504EC30B1FED79650016851F /* Main.storyboard */ = {
220+
isa = PBXVariantGroup;
221+
children = (
222+
504EC30C1FED79650016851F /* Base */,
223+
);
224+
name = Main.storyboard;
225+
sourceTree = "<group>";
226+
};
215227
504EC3101FED79650016851F /* LaunchScreen.storyboard */ = {
216228
isa = PBXVariantGroup;
217229
children = (

mobile/ios/App/App.xcodeproj/xcshareddata/xcschemes/App.xcscheme

Lines changed: 0 additions & 76 deletions
This file was deleted.

mobile/ios/App/App/AppDelegate.swift

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@ import Capacitor
33

44
@UIApplicationMain
55
class AppDelegate: UIResponder, UIApplicationDelegate {
6+
67
var window: UIWindow?
78

89
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
9-
window = UIWindow(frame: UIScreen.main.bounds)
10-
window?.rootViewController = CAPBridgeViewController()
11-
window?.makeKeyAndVisible()
10+
// Override point for customization after application launch.
1211
return true
1312
}
1413

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,32 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="24124" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
3-
<device id="retina6_12" orientation="portrait" appearance="light"/>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17132" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
3+
<device id="retina4_7" orientation="portrait" appearance="light"/>
44
<dependencies>
55
<deployment identifier="iOS"/>
6-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="24093"/>
7-
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17105"/>
7+
<capability name="System colors in document resources" minToolsVersion="11.0"/>
88
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
99
</dependencies>
1010
<scenes>
1111
<!--View Controller-->
1212
<scene sceneID="EHf-IW-A2E">
1313
<objects>
1414
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
15-
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
16-
<rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
17-
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
18-
<subviews>
19-
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Splash" translatesAutoresizingMaskIntoConstraints="NO" id="snD-IY-ifK">
20-
</imageView>
21-
</subviews>
22-
<viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
23-
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
24-
<constraints>
25-
<constraint firstItem="snD-IY-ifK" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="1"/>
26-
<constraint firstAttribute="trailing" secondItem="snD-IY-ifK" secondAttribute="trailing" id="2"/>
27-
<constraint firstItem="snD-IY-ifK" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="3"/>
28-
<constraint firstAttribute="bottom" secondItem="snD-IY-ifK" secondAttribute="bottom" id="4"/>
29-
</constraints>
30-
</view>
15+
<imageView key="view" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Splash" id="snD-IY-ifK">
16+
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
17+
<autoresizingMask key="autoresizingMask"/>
18+
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
19+
</imageView>
3120
</viewController>
3221
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
3322
</objects>
3423
<point key="canvasLocation" x="53" y="375"/>
3524
</scene>
3625
</scenes>
3726
<resources>
38-
<image name="Splash" width="2732" height="2732"/>
27+
<image name="Splash" width="1366" height="1366"/>
28+
<systemColor name="systemBackgroundColor">
29+
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
30+
</systemColor>
3931
</resources>
4032
</document>

mobile/ios/App/App/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
<string>$(CURRENT_PROJECT_VERSION)</string>
2323
<key>LSRequiresIPhoneOS</key>
2424
<true/>
25-
<key>ITSAppUsesNonExemptEncryption</key>
26-
<false/>
2725
<key>UILaunchStoryboardName</key>
2826
<string>LaunchScreen</string>
27+
<key>UIMainStoryboardFile</key>
28+
<string>Main</string>
2929
<key>UIRequiredDeviceCapabilities</key>
3030
<array>
3131
<string>armv7</string>

mobile/ios/fastlane/Fastfile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ platform :ios do
9999
"-workspace", app_path("App.xcworkspace"),
100100
"-scheme", "App",
101101
"-configuration", "Release",
102-
"-destination", "generic/platform=iOS",
103102
"-archivePath", archive_path,
104103
"archive",
105104
].shelljoin
@@ -148,9 +147,6 @@ platform :ios do
148147
ipa: ipa_path,
149148
skip_metadata: true,
150149
skip_screenshots: true,
151-
submission_information: {
152-
export_compliance_uses_encryption: false
153-
},
154150
submit_for_review: true,
155151
automatic_release: false,
156152
force: true,

0 commit comments

Comments
 (0)