diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 6daa30296..93505162a 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -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 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 9574e0f0b..0db12bcbf 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -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 diff --git a/platforms/ios/example/Wysiwyg.xcodeproj/project.pbxproj b/platforms/ios/example/Wysiwyg.xcodeproj/project.pbxproj index 5475af6e1..7291960d2 100644 --- a/platforms/ios/example/Wysiwyg.xcodeproj/project.pbxproj +++ b/platforms/ios/example/Wysiwyg.xcodeproj/project.pbxproj @@ -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 */, @@ -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 */ diff --git a/platforms/ios/example/WysiwygUITests/WysiwygUITests+Keyboard.swift b/platforms/ios/example/WysiwygUITests/WysiwygUITests+Keyboard.swift index e0089355d..12640e924 100644 --- a/platforms/ios/example/WysiwygUITests/WysiwygUITests+Keyboard.swift +++ b/platforms/ios/example/WysiwygUITests/WysiwygUITests+Keyboard.swift @@ -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) diff --git a/platforms/ios/example/ios-test-coverage.sh b/platforms/ios/example/ios-test-coverage.sh index 056e3b925..345fbda58 100755 --- a/platforms/ios/example/ios-test-coverage.sh +++ b/platforms/ios/example/ios-test-coverage.sh @@ -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 \ diff --git a/platforms/ios/example/ios-ui-test-coverage.sh b/platforms/ios/example/ios-ui-test-coverage.sh index 19e98dea2..423dcfa8b 100755 --- a/platforms/ios/example/ios-ui-test-coverage.sh +++ b/platforms/ios/example/ios-ui-test-coverage.sh @@ -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 \