using BSK branch

duckduckgo · Jan 2, 2024 · 2693adf · 2693adf
1 parent 1c76ee2
commit 2693adf
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
@@ -13079,8 +13079,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
 			requirement = {
-				kind = exactVersion;
-				version = 100.0.1;
+				branch = shane/onboarding;
+				kind = branch;
 			};
 		};
 		AA06B6B52672AF8100F541C5 /* XCRemoteSwiftPackageReference "Sparkle" */ = {
@@ -13616,11 +13616,6 @@
 			package = B65CD8C92B316DF100A595BB /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */;
 			productName = SnapshotTesting;
 		};
-		B692D0DE2B209FB7003F2548 /* SwiftLintPlugin */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
-			productName = "plugin:SwiftLintPlugin";
-		};
 		B69D06132A4C0AC50032D14D /* SwiftLintPlugin */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = "plugin:SwiftLintPlugin";

diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -14,17 +14,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/BrowserServicesKit",
       "state" : {
-        "revision" : "e9c344c15d550112d02853c07efeaa154e911e2b",
-        "version" : "100.0.1"
+        "branch" : "shane/onboarding",
+        "revision" : "a4e2bac7e5abe5e79373ed77c77040b366f12fc6"
       }
     },
     {
       "identity" : "content-scope-scripts",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/duckduckgo/content-scope-scripts",
       "state" : {
-        "revision" : "b7ad9843e70cede0c2ca9c4260d970f62cb28156",
-        "version" : "4.52.0"
+        "branch" : "01-02-compiled_assets_for_testing",
+        "revision" : "c88b9d234de23979e3edc79e75ce8a7ec1a1df3a"
       }
     },
     {
@@ -147,7 +147,7 @@
     {
       "identity" : "trackerradarkit",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/duckduckgo/TrackerRadarKit",
+      "location" : "https://github.com/duckduckgo/TrackerRadarKit.git",
       "state" : {
         "revision" : "a6b7ba151d9dc6684484f3785293875ec01cc1ff",
         "version" : "1.2.2"

diff --git a/DuckDuckGo/Onboarding/OnboardingUserScript.swift b/DuckDuckGo/Onboarding/OnboardingUserScript.swift
@@ -152,7 +152,7 @@ final class OnboardingUserScript: NSObject, Subfeature {
     @MainActor
     func requestImport(params: Any, original: WKScriptMessage) async throws -> Encodable? {
         let response: Response = try await withCheckedThrowingContinuation { continuation in
-            DataImportViewController.show {
+            DataImportView.show {
                 let response = Response()
                 continuation.resume(returning: response)
             }