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.

Sign up for GitHub

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

Jump to bottom

Update to Xcode 15.1 #2247

Merged
merged 36 commits into from
Jan 9, 2024
Merged

Update to Xcode 15.1 #2247

merged 36 commits into from
Jan 9, 2024

Conversation

jaceklyp
Copy link
Contributor

@jaceklyp jaceklyp commented Dec 7, 2023

Task/Issue URL: https://app.asana.com/0/414709148257752/1205555242718448/f

Description:
Update Xcode to version 15.0.0

Steps to test this PR:

Make sure all tests pass

jaceklyp and others added 30 commits September 25, 2023 15:51
@jaceklyp
Update xcode version to 15
caeaa42
@jaceklyp
Fix version number
d4393db
@jaceklyp
Change simulator version
0ab0b16
@jaceklyp
Merge branch 'develop' into jacek/xcode15
65a796c
@jaceklyp
Update resolved
ca41d3c
@jaceklyp
Remove tests that fail because URL initialization now escapes spaces
c8beaeb
@jaceklyp
Increase timeouts to make tests pass
74c6059
@jaceklyp
Try using Sonoma image runner
0b50210
@jaceklyp
Try using latest runner
8962f3d
@jaceklyp
Back to macos 13
cb8d28d
@jaceklyp
Use M1 runner
e5c62a1
@jaceklyp
Fix multiple warnings
ecbc143
@jaceklyp
Silence Ignoring duplicate libraries -lc++ warnings
e179c1e
@jaceklyp
Revert the unarchiver change
2a4cf00
@jaceklyp
Remove unneeded swiftlint corrections
69be459
@jaceklyp
Merge branch 'develop' into jacek/xcode15
31408a3
@samsymons
Merge branch 'develop' into jacek/xcode15
bf9f4d5 
* develop: (28 commits)
  Update BSK with autofill 9.0.0 (#2103)
  Add an “Open VPN Settings” quick action (#2089)
  bump BSK (changed dashboard API) (#2111)
  Integrate BSK changes (#2101)
  bump bsk for duckplayer fixes on BigSur (#2106)
  iOS VPN Settings part 1 (#2109)
  Release 7.94.0 (#2107)
  Append build number to metricKit crash version (#2100)
  Disable NetP errors temporarily (#2102)
  NetP: Fix server location formatting (#2099)
  address bar position (#2072)
  Fix privacy tests (#2097)
  Add note about Danger matching rules (#2087)
  Release 7.93.0 (#2096)
  Release 7.93.0 (#2096)
  Update tabs tests (#2088)
  Ignore form factor specific favorites if they're received in Sync response (#2083)
  Update BSK with autofill 8.4.2 (#2084)
  Bump C-S-S to 4.39.0 (#2085)
  BSK hotfix 80.3.0-1 merged to the main branch (#2079)
  ...
@samsymons
Update Xcode version to 15.0.1.
5e8843b 
This is so that GitHub Actions uses the version of Xcode with the simulator launch fix.
@samsymons
Merge branch 'develop' into jacek/xcode15
ba92ef2 
* develop:
  Alert user about abnormal app conditions (#2110)
  Add e2e test for email protection deep-links (#2123)
  Update to config v4 (#2114)
  Release 7.95.0 (#2122)
  Add toggling of NetP Notifications to iOS (#2112)
  Fix for deeplink crash when preparing webview preview (#2116)
  Integrates the latest DBP changes in BSK (#2108)
  Switch to next phase of new experiment for UA (#2118)
@samsymons
Allow automatic provisioning on CI.
73e4494
@samsymons
Remove automatic provisioning.
05f9efe
@samsymons
Disable codesigning for test runs.
df276c9
@samsymons
Undo the CODE_SIGNING_ALLOWED change.
440dd9f
@samsymons
Merge branch 'develop' into jacek/xcode15
b0da844 
* develop: (36 commits)
  Rolls back a BSK change by mistake
  Updates BSK
  Updates BSK
  Document LinkPresentation usage (#2172)
  Autofill "Never Save for this Site" feature (#2104)
  Use upstream fastlane 2.217.0 (#2161)
  Update about screen (#2152)
  Fixes a crasher due to a test line merged by mistake. (#2162)
  remove return user pixel (#2146)
  Revert to auto signing (#2158)
  BSK changes for NetP iOS Geoswitching (#2141)
  Update sync e2e tests to new setup flow (#2151)
  Fix for duplicated "atb" in Pixel request (#2139)
  Updating tests to support latest reference tests (#2145)
  Add NetP widget (#2142)
  Normalize ampUrl in breakage pixel (#2154)
  Update embedded files
  Update version number
  Bump submodules/privacy-reference-tests from `0d23f76` to `7519c3d` (#2135)
  Properly refresh home page favorites view when updating favorites display mode (#2148)
  ...
@samsymons
Try using more generic certificates.
713c955
@samsymons
Revert "Try using more generic certificates."
5aaf30d 
This reverts commit 713c955.
@samsymons
Merge branch 'develop' into jacek/xcode15
10ef86e 
* develop: (40 commits)
  Address Bar Spoofing Tests + Remediation (#2181)
  Update Sync e2e tests to fit the new UI (#2215)
  NetP waitlist final touches (#2209)
  NetP: Remove port from server address (#2214)
  NetP: Fix list row colours (#2213)
  Reset VPN waitlist T&C (#2212)
  Report macOS active/new user for netP (#2207)
  Sabrina/sync setup update (#2198)
  new pixels for toolbars and share sheet  (#2208)
  Use design system fonts throughout NetP (#2211)
  moving the toggle to the top of the dashboard (#2166)
  Allow automated fetching of synced bookmarks' favicons (#2163)
  NetP Geoswitching Design Review feedback (#2206)
  update theme to use system colours (#2180)
  Release 7.99.0 (#2205)
  Update iOS privacy defaults (#2185)
  Remove disabled switches from VPN Settings screen (#2203)
  Update BSK for VPN settings (#2165)
  Fix migrating from Bookmarks V2 and older (#2196)
  Autofill pixel parameter removed (#2182)
  ...
@samsymons
Merge branch 'main' into jacek/xcode15
7a8f19e 
# By Graeme Arthur (3) and others
# Via GitHub
* main:
  Updates BSK (#2239)
  Add Geoswitching pixels (#2235)
  Fix spacing between buttons (#2237)
  Update all references to develop branch with main (#2231)
  Update TRK (#2200)
  Breakage report improvements (#2197)
  Update BSK reference to include the disable rekeying flag (#2219)
  Final NetP ship review feedback (#2221)
  Improve handling lists in Sync (#2192)
  remove address bar position pixels (#2220)

# Conflicts:
#	DuckDuckGo.xcodeproj/xcshareddata/xcschemes/DuckDuckGo.xcscheme
@samsymons
Use 17.0.1 simulators.
a1a1036
@samsymons
Upgrade to Xcode 15.1.
c23d095
samsymons and others added 3 commits December 20, 2023 16:21
@samsymons
Merge branch 'main' into jacek/xcode15
6a812a2 
* main: (35 commits)
  Add Sync feature flags (#2279)
  Add Sync Success Rate pixel  (#2277)
  add test 5 and fix test 4 (#2276)
  Fix: "SwiftLintPlugin" must be enabled before it can be used (#2274)
  Send WG invalid state reason (#2275)
  Typo
  Fix: "SwiftLintPlugin" must be enabled before it can be used
  Release 7.102.0 (#2273)
  Add search retention pixel for NetP (#2267)
  Run sync tests in matrix (#2263)
  SwiftLint build plugin (#2233)
  Update VPN active user check and debug options (#2269)
  Update Autofill Logins copy (#2246)
  Remove the reconnect/disconnect logic from the connection tester (#2272)
  Remove the Fastlane notes file temporarily (#2270)
  remove QR code from save recovery PDF view (#2271)
  Show dev environment indicator in Sync Settings (#2265)
  Release 7.101.0.1 (#2262)
  Sync Flow Error Handling (#2264)
  Fix fingerprinting UI tests (#2252)
  ...
@samsymons
Merge branch 'main' into jacek/xcode15
251b470 
* main:
  Update Link Tracking Protection to preserve headers (#2268)
  Custom config URL (#2278)
  Fix internal user toggling (#2282)
  Display warning icon in Sync Settings cell when data syncing is disabled (#2281)
@samsymons
Merge branch 'main' into jacek/xcode15
e168bc9 
* main:
  Fix alpha builds (#2293)
  Update latency & tunnel failure monitor implementation (#2290)
  Prevents VPNSettings from reporting fake changes (#2288)
  Fix SwiftLint violations (#2289)
  Disable parallel run for sync critical tests (#2287)
samsymons
samsymons reviewed Dec 24, 2023
View reviewed changes
DuckDuckGoTests/NetworkProtectionStatusViewModelTests.swift
wait(for: [expectation], timeout: 5)
wait(for: [expectation], timeout: 20)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now that the simulator issue has been fixed, we can consider reverting these timeout changes. Hopefully they'll no longer be necessary.

@samsymons
Merge branch 'main' into jacek/xcode15
f761958 
* main:
  Update BSK for NetP auth changes (#2286)
samsymons
samsymons approved these changes Dec 25, 2023
View reviewed changes
Copy link
Contributor

@samsymons samsymons left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me, thanks!

@jaceklyp I left one comment about reverting the timeout changes that were added back when the simulator performance was low.

Also if you could give the branch another try locally to make sure it looks good to you after all the main branch changes that have been merged, that would be great.

@ayoy ayoy changed the title Update to Xcode 15 Update to Xcode 15.1 Jan 5, 2024
ayoy
ayoy reviewed Jan 5, 2024
View reviewed changes
.github/workflows/alpha.yml Outdated Show resolved Hide resolved
@samsymons
Merge branch 'main' into jacek/xcode15
51a48fe 
* main:
  deps BrowserServicesKit 100.0.3 + content-scope-scripts 4.59.0 (#2304)
  bookmarks migration refactor (#2236)
  respect system theme on launch (#2302)
  remove unused pixels (#2303)
  Bump submodules/privacy-reference-tests from `a3acc21` to `6b7ad1e` (#2285)
  Update Sync End-to-End tests (#2300)
  Allow calculations in the address bar (#2298)
  Remove trailing space in unableToCreateRecoveryPDF error (#2297)
  Update errors (#2283)
  BSK update for autofill never prompt to save for site feature (#2280)
  Add timeouts to the alpha job.
@samsymons
Fix alpha Xcode version format.
84e9343
@jaceklyp jaceklyp merged commit 832a058 into main Jan 9, 2024
10 checks passed
@jaceklyp jaceklyp deleted the jacek/xcode15 branch January 9, 2024 08:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@samsymons samsymons samsymons approved these changes

@ayoy ayoy ayoy approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jaceklyp @ayoy @samsymons