diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index 1479662e48..218cc17d5b 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -5599,7 +5599,7 @@ buildRules = ( ); dependencies = ( - B6080BB52B20B03800B418EF /* PBXTargetDependency */, + B6F997D42B8F381A00476735 /* PBXTargetDependency */, 4B470EE7299C6DFB0086EBDC /* PBXTargetDependency */, ); name = PacketTunnelProvider; @@ -5621,7 +5621,7 @@ buildRules = ( ); dependencies = ( - B6080BBD2B20B05000B418EF /* PBXTargetDependency */, + B6F997DC2B8F383100476735 /* PBXTargetDependency */, 025CCFE82582601C001CD5BB /* PBXTargetDependency */, ); name = FingerprintingUITests; @@ -5641,7 +5641,7 @@ buildRules = ( ); dependencies = ( - B6080BAF2B20B02800B418EF /* PBXTargetDependency */, + B6F997CE2B8F380D00476735 /* PBXTargetDependency */, ); name = ShareExtension; productName = ShareExtension; @@ -5656,7 +5656,6 @@ 0A991F5B239418D100AA1F64 /* Prevent Version Override */, 98B0CE69251C937D003FB601 /* Update Localizable.strings */, 84E3418E1E2F7EFB00BDBA6F /* Sources */, - 8558AA7D20EE3CB200A346E9 /* Swift Lint */, 84E3418F1E2F7EFB00BDBA6F /* Frameworks */, 84E341901E2F7EFB00BDBA6F /* Resources */, F143C2F01E4A4CD400CFDE3A /* Embed Frameworks */, @@ -5668,7 +5667,7 @@ buildRules = ( ); dependencies = ( - B6080BAD2B20B02400B418EF /* PBXTargetDependency */, + B6F997CC2B8F380A00476735 /* PBXTargetDependency */, F143C2EA1E4A4CD400CFDE3A /* PBXTargetDependency */, 8390447520BDCE10006461CD /* PBXTargetDependency */, 85482D932462DCD100EDEDD1 /* PBXTargetDependency */, @@ -5701,7 +5700,7 @@ buildRules = ( ); dependencies = ( - B6080BBB2B20B04D00B418EF /* PBXTargetDependency */, + B6F997DA2B8F382E00476735 /* PBXTargetDependency */, 84E341A81E2F7EFB00BDBA6F /* PBXTargetDependency */, ); name = UnitTests; @@ -5726,7 +5725,7 @@ buildRules = ( ); dependencies = ( - B6080BB32B20B03400B418EF /* PBXTargetDependency */, + B6F997D22B8F381600476735 /* PBXTargetDependency */, 85DF714924F7FE6100C89288 /* PBXTargetDependency */, ); name = WidgetsExtension; @@ -5748,7 +5747,7 @@ buildRules = ( ); dependencies = ( - B6080BB12B20B02B00B418EF /* PBXTargetDependency */, + B6F997D02B8F381100476735 /* PBXTargetDependency */, ); name = OpenAction; productName = OpenAction; @@ -5766,7 +5765,7 @@ buildRules = ( ); dependencies = ( - B6080BBF2B20B05300B418EF /* PBXTargetDependency */, + B6F997DE2B8F383400476735 /* PBXTargetDependency */, 85D33FD125C97B6E002B91A6 /* PBXTargetDependency */, ); name = IntegrationTests; @@ -5789,7 +5788,7 @@ buildRules = ( ); dependencies = ( - B6080BB92B20B04A00B418EF /* PBXTargetDependency */, + B6F997D82B8F382900476735 /* PBXTargetDependency */, 85F21DB3210F5E32002631A6 /* PBXTargetDependency */, ); name = AtbUITests; @@ -5811,7 +5810,7 @@ buildRules = ( ); dependencies = ( - B6080BC12B20B05600B418EF /* PBXTargetDependency */, + B6F997E02B8F383700476735 /* PBXTargetDependency */, 9825F9CC293F2DE900F220F2 /* PBXTargetDependency */, ); name = PerformanceTests; @@ -5848,7 +5847,7 @@ buildRules = ( ); dependencies = ( - B6080BB72B20B03B00B418EF /* PBXTargetDependency */, + B6F997D62B8F381D00476735 /* PBXTargetDependency */, ); name = Core; packageProductDependencies = ( @@ -5991,6 +5990,7 @@ 0238E44D29C0FAA100615E30 /* XCRemoteSwiftPackageReference "ios-js-support" */, 4B2754EA29E8C7DF00394032 /* XCRemoteSwiftPackageReference "lottie-ios" */, 854007E52B57FB020001BD98 /* XCRemoteSwiftPackageReference "ZIPFoundation" */, + B6F997C22B8F374300476735 /* XCRemoteSwiftPackageReference "apple-toolbox" */, ); productRefGroup = 84E341931E2F7EFB00BDBA6F /* Products */; projectDirPath = ""; @@ -6298,21 +6298,6 @@ shellPath = /bin/sh; shellScript = "# This script copies GRDB.framework to the bundle and signs it\n# It's required because GRDB is not an explicit app dependency\n# and as such it can't be selected in \"Copy Frameworks\" build phase.\n\ngrdb_source_dir=\"${BUILT_PRODUCTS_DIR}/GRDB.framework\"\ngrdb_install_dir=\"${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}/GRDB.framework\"\n\n# Remove any existing files in the destination\nrm -rf \"${grdb_install_dir}\"\nmkdir -p \"${grdb_install_dir}\"\n\n# Copy the framework and the Info.plist\ncp -f \"${grdb_source_dir}/GRDB\" \"${grdb_source_dir}/Info.plist\" \"${grdb_install_dir}\"\n\n# Sign the framework directory contents\n/usr/bin/codesign \\\n --force \\\n --sign \"${EXPANDED_CODE_SIGN_IDENTITY}\" \\\n --timestamp\\=none \\\n --preserve-metadata\\=identifier,entitlements,flags \\\n --generate-entitlement-der \"${grdb_install_dir}\"\n"; }; - 8558AA7D20EE3CB200A346E9 /* Swift Lint */ = { - isa = PBXShellScriptBuildPhase; - alwaysOutOfDate = 1; - buildActionMask = 12; - files = ( - ); - inputPaths = ( - ); - name = "Swift Lint"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "./lint.sh --strict\n"; - }; 98B0CE69251C937D003FB601 /* Update Localizable.strings */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; @@ -7289,49 +7274,49 @@ target = 84E341911E2F7EFB00BDBA6F /* DuckDuckGo */; targetProxy = 9825F9CD293F2DE900F220F2 /* PBXContainerItemProxy */; }; - B6080BAD2B20B02400B418EF /* PBXTargetDependency */ = { + B6F997CC2B8F380A00476735 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - productRef = B6080BAC2B20B02400B418EF /* SwiftLintPlugin */; + productRef = B6F997CB2B8F380A00476735 /* SwiftLintPlugin */; }; - B6080BAF2B20B02800B418EF /* PBXTargetDependency */ = { + B6F997CE2B8F380D00476735 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - productRef = B6080BAE2B20B02800B418EF /* SwiftLintPlugin */; + productRef = B6F997CD2B8F380D00476735 /* SwiftLintPlugin */; }; - B6080BB12B20B02B00B418EF /* PBXTargetDependency */ = { + B6F997D02B8F381100476735 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - productRef = B6080BB02B20B02B00B418EF /* SwiftLintPlugin */; + productRef = B6F997CF2B8F381100476735 /* SwiftLintPlugin */; }; - B6080BB32B20B03400B418EF /* PBXTargetDependency */ = { + B6F997D22B8F381600476735 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - productRef = B6080BB22B20B03400B418EF /* SwiftLintPlugin */; + productRef = B6F997D12B8F381600476735 /* SwiftLintPlugin */; }; - B6080BB52B20B03800B418EF /* PBXTargetDependency */ = { + B6F997D42B8F381A00476735 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - productRef = B6080BB42B20B03800B418EF /* SwiftLintPlugin */; + productRef = B6F997D32B8F381A00476735 /* SwiftLintPlugin */; }; - B6080BB72B20B03B00B418EF /* PBXTargetDependency */ = { + B6F997D62B8F381D00476735 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - productRef = B6080BB62B20B03B00B418EF /* SwiftLintPlugin */; + productRef = B6F997D52B8F381D00476735 /* SwiftLintPlugin */; }; - B6080BB92B20B04A00B418EF /* PBXTargetDependency */ = { + B6F997D82B8F382900476735 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - productRef = B6080BB82B20B04A00B418EF /* SwiftLintPlugin */; + productRef = B6F997D72B8F382900476735 /* SwiftLintPlugin */; }; - B6080BBB2B20B04D00B418EF /* PBXTargetDependency */ = { + B6F997DA2B8F382E00476735 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - productRef = B6080BBA2B20B04D00B418EF /* SwiftLintPlugin */; + productRef = B6F997D92B8F382E00476735 /* SwiftLintPlugin */; }; - B6080BBD2B20B05000B418EF /* PBXTargetDependency */ = { + B6F997DC2B8F383100476735 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - productRef = B6080BBC2B20B05000B418EF /* SwiftLintPlugin */; + productRef = B6F997DB2B8F383100476735 /* SwiftLintPlugin */; }; - B6080BBF2B20B05300B418EF /* PBXTargetDependency */ = { + B6F997DE2B8F383400476735 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - productRef = B6080BBE2B20B05300B418EF /* SwiftLintPlugin */; + productRef = B6F997DD2B8F383400476735 /* SwiftLintPlugin */; }; - B6080BC12B20B05600B418EF /* PBXTargetDependency */ = { + B6F997E02B8F383700476735 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - productRef = B6080BC02B20B05600B418EF /* SwiftLintPlugin */; + productRef = B6F997DF2B8F383700476735 /* SwiftLintPlugin */; }; F143C2EA1E4A4CD400CFDE3A /* PBXTargetDependency */ = { isa = PBXTargetDependency; @@ -9936,7 +9921,15 @@ repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit"; requirement = { kind = exactVersion; - version = 111.0.2; + version = 112.0.0; + }; + }; + B6F997C22B8F374300476735 /* XCRemoteSwiftPackageReference "apple-toolbox" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/duckduckgo/apple-toolbox.git"; + requirement = { + kind = exactVersion; + version = 1.0.0; }; }; C14882EB27F211A000D59F0C /* XCRemoteSwiftPackageReference "SwiftSoup" */ = { @@ -10087,59 +10080,59 @@ package = 98A16C2928A11BDE00A6C003 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */; productName = Bookmarks; }; - B6080BAC2B20B02400B418EF /* SwiftLintPlugin */ = { + B6F997CB2B8F380A00476735 /* SwiftLintPlugin */ = { isa = XCSwiftPackageProductDependency; - package = 98A16C2928A11BDE00A6C003 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */; + package = B6F997C22B8F374300476735 /* XCRemoteSwiftPackageReference "apple-toolbox" */; productName = "plugin:SwiftLintPlugin"; }; - B6080BAE2B20B02800B418EF /* SwiftLintPlugin */ = { + B6F997CD2B8F380D00476735 /* SwiftLintPlugin */ = { isa = XCSwiftPackageProductDependency; - package = 98A16C2928A11BDE00A6C003 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */; + package = B6F997C22B8F374300476735 /* XCRemoteSwiftPackageReference "apple-toolbox" */; productName = "plugin:SwiftLintPlugin"; }; - B6080BB02B20B02B00B418EF /* SwiftLintPlugin */ = { + B6F997CF2B8F381100476735 /* SwiftLintPlugin */ = { isa = XCSwiftPackageProductDependency; - package = 98A16C2928A11BDE00A6C003 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */; + package = B6F997C22B8F374300476735 /* XCRemoteSwiftPackageReference "apple-toolbox" */; productName = "plugin:SwiftLintPlugin"; }; - B6080BB22B20B03400B418EF /* SwiftLintPlugin */ = { + B6F997D12B8F381600476735 /* SwiftLintPlugin */ = { isa = XCSwiftPackageProductDependency; - package = 98A16C2928A11BDE00A6C003 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */; + package = B6F997C22B8F374300476735 /* XCRemoteSwiftPackageReference "apple-toolbox" */; productName = "plugin:SwiftLintPlugin"; }; - B6080BB42B20B03800B418EF /* SwiftLintPlugin */ = { + B6F997D32B8F381A00476735 /* SwiftLintPlugin */ = { isa = XCSwiftPackageProductDependency; - package = 98A16C2928A11BDE00A6C003 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */; + package = B6F997C22B8F374300476735 /* XCRemoteSwiftPackageReference "apple-toolbox" */; productName = "plugin:SwiftLintPlugin"; }; - B6080BB62B20B03B00B418EF /* SwiftLintPlugin */ = { + B6F997D52B8F381D00476735 /* SwiftLintPlugin */ = { isa = XCSwiftPackageProductDependency; - package = 98A16C2928A11BDE00A6C003 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */; + package = B6F997C22B8F374300476735 /* XCRemoteSwiftPackageReference "apple-toolbox" */; productName = "plugin:SwiftLintPlugin"; }; - B6080BB82B20B04A00B418EF /* SwiftLintPlugin */ = { + B6F997D72B8F382900476735 /* SwiftLintPlugin */ = { isa = XCSwiftPackageProductDependency; - package = 98A16C2928A11BDE00A6C003 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */; + package = B6F997C22B8F374300476735 /* XCRemoteSwiftPackageReference "apple-toolbox" */; productName = "plugin:SwiftLintPlugin"; }; - B6080BBA2B20B04D00B418EF /* SwiftLintPlugin */ = { + B6F997D92B8F382E00476735 /* SwiftLintPlugin */ = { isa = XCSwiftPackageProductDependency; - package = 98A16C2928A11BDE00A6C003 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */; + package = B6F997C22B8F374300476735 /* XCRemoteSwiftPackageReference "apple-toolbox" */; productName = "plugin:SwiftLintPlugin"; }; - B6080BBC2B20B05000B418EF /* SwiftLintPlugin */ = { + B6F997DB2B8F383100476735 /* SwiftLintPlugin */ = { isa = XCSwiftPackageProductDependency; - package = 98A16C2928A11BDE00A6C003 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */; + package = B6F997C22B8F374300476735 /* XCRemoteSwiftPackageReference "apple-toolbox" */; productName = "plugin:SwiftLintPlugin"; }; - B6080BBE2B20B05300B418EF /* SwiftLintPlugin */ = { + B6F997DD2B8F383400476735 /* SwiftLintPlugin */ = { isa = XCSwiftPackageProductDependency; - package = 98A16C2928A11BDE00A6C003 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */; + package = B6F997C22B8F374300476735 /* XCRemoteSwiftPackageReference "apple-toolbox" */; productName = "plugin:SwiftLintPlugin"; }; - B6080BC02B20B05600B418EF /* SwiftLintPlugin */ = { + B6F997DF2B8F383700476735 /* SwiftLintPlugin */ = { isa = XCSwiftPackageProductDependency; - package = 98A16C2928A11BDE00A6C003 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */; + package = B6F997C22B8F374300476735 /* XCRemoteSwiftPackageReference "apple-toolbox" */; productName = "plugin:SwiftLintPlugin"; }; C14882EC27F211A000D59F0C /* SwiftSoup */ = { diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 1eeff22c57..e3003e9abe 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,5 +1,14 @@ { "pins" : [ + { + "identity" : "apple-toolbox", + "kind" : "remoteSourceControl", + "location" : "https://github.com/duckduckgo/apple-toolbox.git", + "state" : { + "revision" : "e3dc4faf70ca09718a2d20d5c47b449389e8c153", + "version" : "1.0.0" + } + }, { "identity" : "bloom_cpp", "kind" : "remoteSourceControl", @@ -14,8 +23,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/DuckDuckGo/BrowserServicesKit", "state" : { - "revision" : "04c35220aa94bd005171086acccadd677400e7d5", - "version" : "111.0.2" + "revision" : "c0921ae979b5bcb5817026f9d34be180f0d7f5cc", + "version" : "112.0.0" } }, { @@ -156,7 +165,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/LocalPackages/DuckUI/Package.swift b/LocalPackages/DuckUI/Package.swift index 0ac99830a6..79df959eeb 100644 --- a/LocalPackages/DuckUI/Package.swift +++ b/LocalPackages/DuckUI/Package.swift @@ -31,7 +31,7 @@ let package = Package( targets: ["DuckUI"]) ], dependencies: [ - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "111.0.2"), + .package(url: "https://github.com/duckduckgo/apple-toolbox.git", exact: "1.0.0"), ], targets: [ .target( @@ -40,7 +40,7 @@ let package = Package( swiftSettings: [ .define("DEBUG", .when(configuration: .debug)) ], - plugins: [.plugin(name: "SwiftLintPlugin", package: "BrowserServicesKit")] + plugins: [.plugin(name: "SwiftLintPlugin", package: "apple-toolbox")] ) ] ) diff --git a/LocalPackages/SyncUI/Package.swift b/LocalPackages/SyncUI/Package.swift index 4769fb0741..51c9b26b91 100644 --- a/LocalPackages/SyncUI/Package.swift +++ b/LocalPackages/SyncUI/Package.swift @@ -33,8 +33,8 @@ let package = Package( ], dependencies: [ .package(path: "../DuckUI"), - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "111.0.2"), - .package(url: "https://github.com/duckduckgo/DesignResourcesKit", exact: "2.0.0") + .package(url: "https://github.com/duckduckgo/DesignResourcesKit", exact: "2.0.0"), + .package(url: "https://github.com/duckduckgo/apple-toolbox.git", exact: "1.0.0"), ], targets: [ .target( @@ -46,7 +46,7 @@ let package = Package( swiftSettings: [ .define("DEBUG", .when(configuration: .debug)) ], - plugins: [.plugin(name: "SwiftLintPlugin", package: "BrowserServicesKit")] + plugins: [.plugin(name: "SwiftLintPlugin", package: "apple-toolbox")] ) ] ) diff --git a/LocalPackages/Waitlist/Package.swift b/LocalPackages/Waitlist/Package.swift index 0e1585dd42..f3a3951ba5 100644 --- a/LocalPackages/Waitlist/Package.swift +++ b/LocalPackages/Waitlist/Package.swift @@ -15,8 +15,8 @@ let package = Package( targets: ["Waitlist", "WaitlistMocks"]) ], dependencies: [ - .package(url: "https://github.com/duckduckgo/BrowserServicesKit", exact: "111.0.2"), - .package(url: "https://github.com/duckduckgo/DesignResourcesKit", exact: "2.0.0") + .package(url: "https://github.com/duckduckgo/DesignResourcesKit", exact: "2.0.0"), + .package(url: "https://github.com/duckduckgo/apple-toolbox.git", exact: "1.0.0"), ], targets: [ .target( @@ -25,7 +25,7 @@ let package = Package( swiftSettings: [ .define("DEBUG", .when(configuration: .debug)) ], - plugins: [.plugin(name: "SwiftLintPlugin", package: "BrowserServicesKit")] + plugins: [.plugin(name: "SwiftLintPlugin", package: "apple-toolbox")] ), .target( name: "WaitlistMocks", @@ -33,12 +33,12 @@ let package = Package( swiftSettings: [ .define("DEBUG", .when(configuration: .debug)) ], - plugins: [.plugin(name: "SwiftLintPlugin", package: "BrowserServicesKit")] + plugins: [.plugin(name: "SwiftLintPlugin", package: "apple-toolbox")] ), .testTarget( name: "WaitlistTests", dependencies: ["Waitlist", "WaitlistMocks"], - plugins: [.plugin(name: "SwiftLintPlugin", package: "BrowserServicesKit")] + plugins: [.plugin(name: "SwiftLintPlugin", package: "apple-toolbox")] ) ] )