Merge branch 'sam/vpn-ui-improvements' into sam/vpn-ui-improvements-2…

…-lottie-animation

* sam/vpn-ui-improvements:
  Fix unit tests.
  rollback #URL macro (#2585)
  Release 7.112.0-2 (#2579)
  Updates BSK (#2577)

Core/AppURLs.swift

@@ -19,7 +19,6 @@
 
 import BrowserServicesKit
 import Foundation
-import Macros
 
 public extension URL {
 
@@ -49,7 +48,7 @@ public extension URL {
     static let exti = URL(string: "\(base)/exti/\(devMode)")!
     static let feedback = URL(string: "\(base)/feedback.js?type=app-feedback")!
 
-    static let appStore = #URL("https://apps.apple.com/app/duckduckgo-privacy-browser/id663592361")
+    static let appStore = URL(string: "https://apps.apple.com/app/duckduckgo-privacy-browser/id663592361")!
 
     static let mac = URL(string: "\(base)/mac")!
     static let windows = URL(string: "\(base)/windows")!

Core/BookmarksImporter.swift

@@ -20,7 +20,6 @@
 import Bookmarks
 import Common
 import Foundation
-import Macros
 import Persistence
 import SwiftSoup
 
@@ -218,7 +217,7 @@ final public class BookmarksImporter {
         static let FavoritesFolder = "DuckDuckGo Favorites"
         static let BookmarksFolder = "DuckDuckGo Bookmarks"
         static let bookmarkURLString = "https://duckduckgo.com"
-        static let bookmarkURL = #URL("https://duckduckgo.com")
+        static let bookmarkURL = URL(string: "https://duckduckgo.com")!
         static let favoriteAttribute = "duckduckgo:favorite"
         static let isFavorite = "true"
         static let idAttribute = "id"

Core/DataStoreWarmup.swift

@@ -18,7 +18,6 @@
 //
 
 import Combine
-import Macros
 import WebKit
 
 /// WKWebsiteDataStore is basically non-functional until a web view has been instanciated and a page is successfully loaded.
@@ -28,7 +27,7 @@ public class DataStoreWarmup {
 
     @MainActor
     public func ensureReady() async {
-        await BlockingNavigationDelegate().loadInBackgroundWebView(url: #URL("about:blank"))
+        await BlockingNavigationDelegate().loadInBackgroundWebView(url: URL(string: "about:blank")!)
     }
 
 }

Core/UserAgentManager.swift

@@ -22,7 +22,6 @@
 import BrowserServicesKit
 import Common
 import Foundation
-import Macros
 import WebKit
 
 public protocol UserAgentManager {
@@ -47,7 +46,7 @@ public class DefaultUserAgentManager: UserAgentManager {
 
     private func prepareUserAgent() {
         let webview = WKWebView()
-        webview.load(URLRequest.developerInitiated(#URL("about:blank")))
+        webview.load(URLRequest.developerInitiated(URL(string: "about:blank")!))
         getDefaultAgent(webView: webview) { [weak self] agent in
             // Reference webview instance to keep it in scope and allow UA to be returned
             _ = webview