Skip to content
This repository has been archived by the owner on Sep 27, 2024. It is now read-only.

Xcode 15.4 support #1020

Merged
merged 2 commits into from
Jul 16, 2024
Merged

Xcode 15.4 support #1020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e959232
Xcode 15.4 support
Velin92 Jul 16, 2024
04c7f47
disabled a test that only works on device
Velin92 Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ios.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ jobs:
- name: Install targets
run: make targets-ios

- name: Set Xcode 15.2
run: sudo xcode-select -switch /Applications/Xcode_15.2.app
- name: Set Xcode 15.4
run: sudo xcode-select -switch /Applications/Xcode_15.4.app

- name: Build framework & bindings
run: make ios
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ jobs:
- name: Install targets
run: make targets-ios

- name: Set Xcode 15.2
run: sudo xcode-select -switch /Applications/Xcode_15.2.app
- name: Set Xcode 15.4
run: sudo xcode-select -switch /Applications/Xcode_15.4.app

- name: Set SwiftPM Repo credentials
uses: de-vri-es/setup-git-credentials@v2
Expand Down
19 changes: 0 additions & 19 deletions platforms/ios/example/Wysiwyg.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,6 @@
isa = PBXNativeTarget;
buildConfigurationList = A6472CD12886CF840021A0E8 /* Build configuration list for PBXNativeTarget "WysiwygUITests" */;
buildPhases = (
A75C6AD32C3ECA450096D3A4 /* Force software keyboard on simulator */,
A6472CBD2886CF840021A0E8 /* Sources */,
A6472CBE2886CF840021A0E8 /* Frameworks */,
A6472CBF2886CF840021A0E8 /* Resources */,
Expand Down Expand Up @@ -396,24 +395,6 @@
shellPath = /bin/sh;
shellScript = "export PATH=\"$PATH:/opt/homebrew/bin\"\nif which swiftformat >/dev/null; then\n swiftformat $PROJECT_DIR\n swiftformat ../lib/WysiwygComposer\nelse\n echo \"warning: SwiftFormat not installed, download from https://github.com/nicklockwood/SwiftFormat\"\nfi\n";
};
A75C6AD32C3ECA450096D3A4 /* Force software keyboard on simulator */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "Force software keyboard on simulator";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "external_kb_connected=false\n\nosascript -e 'quit app \"Simulator\"'\n\nSIMUS_KEYBOARD=$(/usr/libexec/PlistBuddy -c \"Print :DevicePreferences\" ~/Library/Preferences/com.apple.iphonesimulator.plist | perl -lne 'print $1 if /^ (\\S*) =/')\n\necho \"$SIMUS_KEYBOARD\" | while read -r a; do /usr/libexec/PlistBuddy -c \"Set :DevicePreferences:$a:ConnectHardwareKeyboard $external_kb_connected\" ~/Library/Preferences/com.apple.iphonesimulator.plist || /usr/libexec/PlistBuddy -c \"Add :DevicePreferences:$a:ConnectHardwareKeyboard bool $external_kb_connected\" ~/Library/Preferences/com.apple.iphonesimulator.plist; done\n";
};
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
Expand Down
3 changes: 2 additions & 1 deletion platforms/ios/example/WysiwygUITests/WysiwygUITests+Keyboard.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,8 @@ extension WysiwygUITests {
)
}

func testDotAfterInlinePredictiveText() {
// This test only works on a real device, but not on simulator
func disabled_testDotAfterInlinePredictiveText() {
sleep(1)
setupKeyboard(.englishQWERTY)

Expand Down
2 changes: 1 addition & 1 deletion platforms/ios/example/ios-test-coverage.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ xcodebuild \
-project Wysiwyg.xcodeproj \
-scheme WysiwygComposerTests \
-sdk iphonesimulator \
-destination 'platform=iOS Simulator,name=iPhone 15,OS=17.2' \
-destination 'platform=iOS Simulator,name=iPhone 15,OS=17.5' \
-derivedDataPath ./DerivedData \
-resultBundlePath tests.xcresult \
-enableCodeCoverage YES \
Expand Down
2 changes: 1 addition & 1 deletion platforms/ios/example/ios-ui-test-coverage.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ xcodebuild \
-project Wysiwyg.xcodeproj \
-scheme Wysiwyg \
-sdk iphonesimulator \
-destination 'platform=iOS Simulator,name=iPhone 15,OS=17.2' \
-destination 'platform=iOS Simulator,name=iPhone 15,OS=17.5' \
-derivedDataPath ./DerivedData \
-resultBundlePath ui-tests.xcresult \
-enableCodeCoverage YES \
Expand Down
Loading