From b47ef2495c020067a6397cec45ba96b496f92d43 Mon Sep 17 00:00:00 2001 From: Juan Manuel Pereira Date: Fri, 1 Nov 2024 11:11:12 -0300 Subject: [PATCH] Fix bad merge --- DuckDuckGo.xcodeproj/project.pbxproj | 4 ++-- .../project.xcworkspace/xcshareddata/swiftpm/Package.resolved | 3 ++- UITests/OnboardingUITests.swift | 4 ---- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index ed815135da..0b93898037 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -14681,8 +14681,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit"; requirement = { - kind = revision; - revision = 748463efbe18152dfcacba297b5b8735f37bdfc2; + branch = "dominik/xcode-16"; + kind = branch; }; }; 9FF521422BAA8FF300B9819B /* XCRemoteSwiftPackageReference "lottie-spm" */ = { diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index d7115fc708..c9c5f1ff55 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -32,7 +32,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/duckduckgo/BrowserServicesKit", "state" : { - "revision" : "748463efbe18152dfcacba297b5b8735f37bdfc2" + "branch" : "dominik/xcode-16", + "revision" : "8fb01fbcaf16035d41f543e74c34c3df011847eb" } }, { diff --git a/UITests/OnboardingUITests.swift b/UITests/OnboardingUITests.swift index c5403a6288..79c3c8eee8 100644 --- a/UITests/OnboardingUITests.swift +++ b/UITests/OnboardingUITests.swift @@ -24,10 +24,6 @@ final class OnboardingUITests: UITestCase { try resetApplicationData() } - override func tearDownWithError() throws { - try resetApplicationData() - } - func testOnboardingToBrowsing() throws { try resetApplicationData() continueAfterFailure = false