Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Xcode 16 #3573

Merged
merged 34 commits into from
Nov 15, 2024
Merged
Show file tree
Hide file tree
Changes from 31 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
12b1ff4
Update supported Xcode version to 16.0
ayoy Sep 20, 2024
eee242f
Update BSK
ayoy Sep 21, 2024
2e490c5
Update BSK ref
ayoy Sep 25, 2024
9509c67
Merge branch 'main' into dominik/xcode-16
ayoy Sep 25, 2024
966c1ab
Increases the wait time for a breaking test (#3419)
diegoreymendez Oct 8, 2024
f67e7f2
Update BSK ref
ayoy Oct 14, 2024
7d6ad39
Merge branch 'main' into dominik/xcode-16
samsymons Oct 21, 2024
0239e19
Update BSK reference.
samsymons Oct 21, 2024
4c98e85
Merge branch 'main' into dominik/xcode-16
samsymons Oct 29, 2024
6dabf71
Update BSK reference.
samsymons Oct 29, 2024
17abbed
Set Xcode version to 16.1.
samsymons Oct 29, 2024
0865e5e
Merge branch 'main' into dominik/xcode-16
samsymons Oct 30, 2024
4729ee6
Update Maestro simulator version for 16.1.
samsymons Oct 30, 2024
bac8b98
Fix iOS 18 widget UI tests.
samsymons Oct 30, 2024
4c27522
Rename data clearing test files to match others & work with run script.
samsymons Oct 30, 2024
aa55e99
Scroll down to the Passwords row correctly.
samsymons Oct 30, 2024
22a19c9
Merge branch 'main' into dominik/xcode-16
samsymons Nov 5, 2024
d695208
Update BSK reference.
samsymons Nov 5, 2024
737619b
Merge branch 'main' into dominik/xcode-16
samsymons Nov 7, 2024
313907c
Update BSK.
samsymons Nov 7, 2024
a492a86
Use 18.1 simulators.
samsymons Nov 7, 2024
d092e00
Merge branch 'main' into dominik/xcode-16
samsymons Nov 8, 2024
5438704
Update BSK reference.
samsymons Nov 8, 2024
6d8e563
Remove iOS 18 from the sync E2E tests.
samsymons Nov 8, 2024
3cad996
Set the widget tests back to iOS 17.
samsymons Nov 8, 2024
edf5dca
Merge branch 'main' into dominik/xcode-16
samsymons Nov 12, 2024
045e596
Update BSK reference.
samsymons Nov 12, 2024
7f9ac0e
Merge branch 'main' into dominik/xcode-16
samsymons Nov 13, 2024
7d4f576
Update Package.resolved.
samsymons Nov 13, 2024
ff8b429
Use macOS 15 runner.
samsymons Nov 13, 2024
95f4b37
Test the regular macOS runner.
samsymons Nov 13, 2024
5f0f86f
Merge branch 'main' into dominik/xcode-16
samsymons Nov 14, 2024
d5358c8
Update Package.resolved.
samsymons Nov 14, 2024
36b1818
Set BSK to 210.0.2
samsymons Nov 15, 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
2 changes: 1 addition & 1 deletion .github/workflows/end-to-end.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
run: |
set -o pipefail && xcodebuild \
-scheme "DuckDuckGo" \
-destination "platform=iOS Simulator,name=iPhone 15,OS=17.2" \
-destination "platform=iOS Simulator,name=iPhone 16,OS=18.1" \
-derivedDataPath "DerivedData" \
-skipPackagePluginValidation \
-skipMacroValidation \
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
run: |
set -o pipefail && xcodebuild test \
-scheme "AtbUITests" \
-destination "platform=iOS Simulator,name=iPhone 15,OS=17.2" \
-destination "platform=iOS Simulator,name=iPhone 16,OS=18.1" \
-derivedDataPath "DerivedData" \
-skipPackagePluginValidation \
-skipMacroValidation \
Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:
run: |
set -o pipefail && xcodebuild test \
-scheme "FingerprintingUITests" \
-destination "platform=iOS Simulator,name=iPhone 15,OS=17.2" \
-destination "platform=iOS Simulator,name=iPhone 16,OS=18.1" \
-derivedDataPath "DerivedData" \
-skipPackagePluginValidation \
-skipMacroValidation \
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:

name: Unit Tests

runs-on: macos-14-xlarge
runs-on: macos-15
timeout-minutes: 20

outputs:
Expand Down Expand Up @@ -79,7 +79,7 @@ jobs:
run: |
set -o pipefail && xcodebuild test \
-scheme "DuckDuckGo" \
-destination "platform=iOS Simulator,name=iPhone 15,OS=17.2" \
-destination "platform=iOS Simulator,name=iPhone 16,OS=18.1" \
-derivedDataPath "DerivedData" \
-skipPackagePluginValidation \
-skipMacroValidation \
Expand Down Expand Up @@ -132,7 +132,7 @@ jobs:
# Dependabot doesn't have access to all secrets, so we skip this job
if: github.actor != 'dependabot[bot]'

runs-on: macos-14-xlarge
runs-on: macos-15
timeout-minutes: 30

steps:
Expand Down Expand Up @@ -185,7 +185,7 @@ jobs:

set -o pipefail && xcodebuild \
-scheme "DuckDuckGo" \
-destination "platform=iOS Simulator,name=iPhone 15" \
-destination "platform=iOS Simulator,name=iPhone 16" \
-derivedDataPath "DerivedData" \
-configuration "Release" \
-skipPackagePluginValidation \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sync-end-to-end.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
run: |
set -o pipefail && xcodebuild \
-scheme "DuckDuckGo" \
-destination "platform=iOS Simulator,name=iPhone 15" \
-destination "platform=iOS Simulator,name=iPhone 16" \
-derivedDataPath "DerivedData" \
-skipPackagePluginValidation \
-skipMacroValidation \
Expand Down
6 changes: 3 additions & 3 deletions .maestro/setup_ui_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ source $(dirname $0)/common.sh
## Constants

# The simulator command requires the hyphens
target_device="iPhone-15"
target_os="iOS-17-0"
target_device="iPhone-16"
target_os="iOS-18-1"

## Functions

Expand Down Expand Up @@ -50,7 +50,7 @@ build_app() {
echo "⏲️ Building the app"
set -o pipefail && xcodebuild -project "$project_root"/DuckDuckGo.xcodeproj \
-scheme "DuckDuckGo" \
-destination "platform=iOS Simulator,name=iPhone 15,OS=17.2" \
-destination "platform=iOS Simulator,name=iPhone 16,OS=18.1" \
-derivedDataPath "$derived_data_path" \
-skipPackagePluginValidation \
-skipMacroValidation \
Expand Down
4 changes: 3 additions & 1 deletion .maestro/shared/remove_local_logins.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ appId: com.duckduckgo.mobile.ios
---

- tapOn: Settings
- scrollUntilVisible:
element: Passwords
- tapOn: Passwords
- tapOn: Passcode field
- inputText: "0000"
Expand All @@ -10,4 +12,4 @@ appId: com.duckduckgo.mobile.ios
- tapOn: Delete Password
- tapOn: Delete Password
- tapOn: Settings
- tapOn: Done
- tapOn: Done
2 changes: 1 addition & 1 deletion .xcode-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
15.4
16.1
4 changes: 2 additions & 2 deletions DuckDuckGo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -10991,8 +10991,8 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit";
requirement = {
kind = exactVersion;
version = 209.0.0;
branch = "dominik/xcode-16";
kind = branch;
};
};
9F8FE9472BAE50E50071E372 /* XCRemoteSwiftPackageReference "lottie-spm" */ = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/DuckDuckGo/BrowserServicesKit",
"state" : {
"revision" : "614ea57db48db644ce7f3a3de9c20c9a7fbb08ff",
"version" : "209.0.0"
"branch" : "dominik/xcode-16",
"revision" : "722c0b352c957e81c555d45a6fe1b8941aaf99a8"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion DuckDuckGoTests/ContextualDaxDialogsFactoryTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ extension ContextualDaxDialogsFactoryTests {
XCTAssertNotNil(host.view)

// THEN
waitForExpectations(timeout: 2.0)
waitForExpectations(timeout: 10.0)
completionHandler()
}

Expand Down
Loading