From 6defa8d85999fbad89c7b276a2a0b8ed2b8f4278 Mon Sep 17 00:00:00 2001 From: Alexey Martemyanov Date: Wed, 6 Dec 2023 20:21:16 +0600 Subject: [PATCH] bump bsk; add targets to lint --- DuckDuckGo.xcodeproj/project.pbxproj | 111 ++++++++++++++++-- .../xcshareddata/swiftpm/Package.resolved | 6 +- 2 files changed, 105 insertions(+), 12 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index a058beb66d..dc629c71f4 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -7989,6 +7989,7 @@ buildRules = ( ); dependencies = ( + B6080B9F2B20AF7B00B418EF /* PBXTargetDependency */, ); name = NetworkProtectionSystemExtension; packageProductDependencies = ( @@ -8014,6 +8015,7 @@ buildRules = ( ); dependencies = ( + B6080BA32B20AF8300B418EF /* PBXTargetDependency */, 7BEC18312AD5DA3300D30536 /* PBXTargetDependency */, ); name = DuckDuckGoVPN; @@ -8042,6 +8044,7 @@ buildRules = ( ); dependencies = ( + B6080BA52B20AF8800B418EF /* PBXTargetDependency */, ); name = DuckDuckGoVPNAppStore; packageProductDependencies = ( @@ -8066,6 +8069,7 @@ buildRules = ( ); dependencies = ( + B6080BA12B20AF7F00B418EF /* PBXTargetDependency */, 4B4BEC4A2A11B627001D9AC5 /* PBXTargetDependency */, ); name = DuckDuckGoNotifications; @@ -8086,6 +8090,7 @@ buildRules = ( ); dependencies = ( + B6080B9D2B20AF7700B418EF /* PBXTargetDependency */, 4B4D60532A0B29CB00BCD287 /* PBXTargetDependency */, ); name = NetworkProtectionAppExtension; @@ -8161,6 +8166,7 @@ buildRules = ( ); dependencies = ( + B6080B9B2B20AF6400B418EF /* PBXTargetDependency */, 7B4CE8E026F02108009134B1 /* PBXTargetDependency */, ); name = "UI Tests"; @@ -8179,6 +8185,7 @@ buildRules = ( ); dependencies = ( + B6080BA72B20AF8B00B418EF /* PBXTargetDependency */, 7B20D5C82ADFEC730053C42A /* PBXTargetDependency */, ); name = DuckDuckGoDBPTests; @@ -8196,11 +8203,12 @@ 9D9AE8B62AAA39A70026E7DC /* Sources */, 9D9AE8C62AAA39A70026E7DC /* Frameworks */, 9D9AE8C92AAA39A70026E7DC /* Resources */, - 7BB34F502AD98394005691AE /* ShellScript */, + 7BB34F502AD98394005691AE /* Copy Swift Package resources */, ); buildRules = ( ); dependencies = ( + B6080BA92B20AF8F00B418EF /* PBXTargetDependency */, ); name = DuckDuckGoDBPBackgroundAgent; packageProductDependencies = ( @@ -8223,6 +8231,7 @@ buildRules = ( ); dependencies = ( + B6080BAB2B20AF9200B418EF /* PBXTargetDependency */, ); name = DuckDuckGoDBPBackgroundAgentAppStore; packageProductDependencies = ( @@ -8249,7 +8258,7 @@ buildRules = ( ); dependencies = ( - B69D060A2A4B19470032D14D /* PBXTargetDependency */, + B692D0DF2B209FB7003F2548 /* PBXTargetDependency */, 4B5F14FC2A15291D0060320F /* PBXTargetDependency */, 31C6E9AD2B0C07BA0086DC30 /* PBXTargetDependency */, ); @@ -8909,6 +8918,7 @@ }; 7B31FD922AD126C40086AA24 /* Embed System Network Extension */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -8944,7 +8954,7 @@ shellPath = /bin/sh; shellScript = "if [[ -z \"${SYSEX_BUNDLE_ID}\" ]]; then\n echo \"Required build settings are not defined, please check xcconfig files\"\n exit 1\nfi\n\n\necho \"ditto ${BUILT_PRODUCTS_DIR}/${SYSEX_BUNDLE_ID}.systemextension $BUILT_PRODUCTS_DIR/${CONTENTS_FOLDER_PATH}/Library/SystemExtensions/${SYSEX_BUNDLE_ID}.systemextension\"\n\nditto \"${BUILT_PRODUCTS_DIR}/${SYSEX_BUNDLE_ID}.systemextension\" \"$BUILT_PRODUCTS_DIR/${CONTENTS_FOLDER_PATH}/Library/SystemExtensions/${SYSEX_BUNDLE_ID}.systemextension\" || exit 1\n"; }; - 7BB34F502AD98394005691AE /* ShellScript */ = { + 7BB34F502AD98394005691AE /* Copy Swift Package resources */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; buildActionMask = 2147483647; @@ -8954,6 +8964,7 @@ ); inputPaths = ( ); + name = "Copy Swift Package resources"; outputFileListPaths = ( ); outputPaths = ( @@ -8979,7 +8990,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "FRAMEWORKS_DIR=\"${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}\"\nDYLIB_TARGET_PATH=\"${FRAMEWORKS_DIR}/libswift_Concurrency.dylib\"\n\nif [ ! -e \"${DYLIB_TARGET_PATH}\" ]; then\n\n DYLIB_PATH=$(find \"${TOOLCHAIN_DIR}/usr/lib\" -path \"*/${HOST_PLATFORM}/libswift_Concurrency.dylib\")\n echo \"copy ${DYLIB_PATH} to ${DYLIB_TARGET_PATH}\"\n\n mkdir -p \"${FRAMEWORKS_DIR}\"\n cp \"${DYLIB_PATH}\" \"${DYLIB_TARGET_PATH}\" || exit 1\n\nelse\n echo \"${DYLIB_TARGET_PATH} exists\"\nfi\n"; + shellScript = "FRAMEWORKS_DIR=\"${BUILT_PRODUCTS_DIR}/${FRAMEWORKS_FOLDER_PATH}\"\nDYLIB_TARGET_PATH=\"${FRAMEWORKS_DIR}/libswift_Concurrency.dylib\"\n\nif [ ! -e \"${DYLIB_TARGET_PATH}\" ]; then\n\n DYLIB_PATH=$(find \"${TOOLCHAIN_DIR}/usr/lib\" -path \"*/${HOST_PLATFORM}/libswift_Concurrency.dylib\")\n echo \"copy ${DYLIB_PATH} to ${DYLIB_TARGET_PATH}\"\n\n mkdir -p \"${FRAMEWORKS_DIR}\"\n cp \"${DYLIB_PATH}\" \"${DYLIB_TARGET_PATH}\" || exit 1\n\nelse\n echo \"${DYLIB_TARGET_PATH} exists 👌\"\nfi\n"; }; B6F2C8722A7A4C7D000498CF /* Make /Applications symlink, remove app on Clean build */ = { isa = PBXShellScriptBuildPhase; @@ -8998,7 +9009,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "if [[ \"${CONFIGURATION}\" != \"Debug\" ]]; then\n # run only for Debug builds\n exit 0\nfi\n\n# if Xcode created real Applications directory inside BUILT_PRODUCTS_DIR \nif [[ ! -L ${BUILT_PRODUCTS_DIR}/Applications ]]; then\n # we only get here on clean build, remove an existing app in /Applications/DEBUG on clean build\n echo \"rm -rf /${INSTALL_PATH}/${PRODUCT_NAME}.app\"\n rm -rf \"/${INSTALL_PATH}/${PRODUCT_NAME}.app\"\n\n # create /Applications/DEBUG dir\n echo \"mkdir -p /${INSTALL_PATH}\"\n mkdir -p \"/${INSTALL_PATH}\"\n\n # move the app bundle to /Applications/DEBUG\n echo \"mv ${DSTROOT}/${INSTALL_PATH}/${PRODUCT_NAME}.app /${INSTALL_PATH}/${PRODUCT_NAME}.app\"\n mv \"${DSTROOT}/${INSTALL_PATH}/${PRODUCT_NAME}.app\" \"/${INSTALL_PATH}/${PRODUCT_NAME}.app\"\n\n # rm ${BUILT_PRODUCTS_DIR}/Applications directory created by Xcode\n echo \"rm -rf ${BUILT_PRODUCTS_DIR}/Applications\" \n rm -rf \"${BUILT_PRODUCTS_DIR}/Applications\"\n # create ${BUILT_PRODUCTS_DIR}/Applications symlink to /Applications\n echo \"ln -s /Applications ${BUILT_PRODUCTS_DIR}/Applications\"\n ln -s /Applications \"${BUILT_PRODUCTS_DIR}/Applications\"\nfi\n"; + shellScript = "if [[ \"${CONFIGURATION}\" != \"Debug\" ]]; then\n # run only for Debug builds\n exit 0\nfi\n\n# if Xcode created real Applications directory inside BUILT_PRODUCTS_DIR \nif [[ ! -L ${BUILT_PRODUCTS_DIR}/Applications ]]; then\n # we only get here on clean build, remove an existing app in /Applications/DEBUG on clean build\n echo \"rm -rf /${INSTALL_PATH}/${PRODUCT_NAME}.app\"\n rm -rf \"/${INSTALL_PATH}/${PRODUCT_NAME}.app\"\n\n # create /Applications/DEBUG dir\n echo \"mkdir -p /${INSTALL_PATH}\"\n mkdir -p \"/${INSTALL_PATH}\"\n\n # move the app bundle to /Applications/DEBUG\n echo \"mv ${DSTROOT}/${INSTALL_PATH}/${PRODUCT_NAME}.app /${INSTALL_PATH}/${PRODUCT_NAME}.app\"\n mv \"${DSTROOT}/${INSTALL_PATH}/${PRODUCT_NAME}.app\" \"/${INSTALL_PATH}/${PRODUCT_NAME}.app\"\n\n # rm ${BUILT_PRODUCTS_DIR}/Applications directory created by Xcode\n echo \"rm -rf ${BUILT_PRODUCTS_DIR}/Applications\" \n rm -rf \"${BUILT_PRODUCTS_DIR}/Applications\"\n # create ${BUILT_PRODUCTS_DIR}/Applications symlink to /Applications\n echo \"ln -s /Applications ${BUILT_PRODUCTS_DIR}/Applications\"\n ln -s /Applications \"${BUILT_PRODUCTS_DIR}/Applications\"\nelse\n echo \"/Applications symlink 👌\"\nfi\n"; }; CBCCF59E299667B700C02DFE /* Assert Xcode version */ = { isa = PBXShellScriptBuildPhase; @@ -11849,9 +11860,45 @@ target = AA585D7D248FD31100E9A3E2 /* DuckDuckGo Privacy Browser */; targetProxy = AA585D91248FD31400E9A3E2 /* PBXContainerItemProxy */; }; - B69D060A2A4B19470032D14D /* PBXTargetDependency */ = { + B6080B9B2B20AF6400B418EF /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + productRef = B6080B9A2B20AF6400B418EF /* SwiftLintPlugin */; + }; + B6080B9D2B20AF7700B418EF /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + productRef = B6080B9C2B20AF7700B418EF /* SwiftLintPlugin */; + }; + B6080B9F2B20AF7B00B418EF /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + productRef = B6080B9E2B20AF7B00B418EF /* SwiftLintPlugin */; + }; + B6080BA12B20AF7F00B418EF /* PBXTargetDependency */ = { isa = PBXTargetDependency; - productRef = B69D06092A4B19470032D14D /* SwiftLintPlugin */; + productRef = B6080BA02B20AF7F00B418EF /* SwiftLintPlugin */; + }; + B6080BA32B20AF8300B418EF /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + productRef = B6080BA22B20AF8300B418EF /* SwiftLintPlugin */; + }; + B6080BA52B20AF8800B418EF /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + productRef = B6080BA42B20AF8800B418EF /* SwiftLintPlugin */; + }; + B6080BA72B20AF8B00B418EF /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + productRef = B6080BA62B20AF8B00B418EF /* SwiftLintPlugin */; + }; + B6080BA92B20AF8F00B418EF /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + productRef = B6080BA82B20AF8F00B418EF /* SwiftLintPlugin */; + }; + B6080BAB2B20AF9200B418EF /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + productRef = B6080BAA2B20AF9200B418EF /* SwiftLintPlugin */; + }; + B692D0DF2B209FB7003F2548 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + productRef = B692D0DE2B209FB7003F2548 /* SwiftLintPlugin */; }; B69D06142A4C0AC50032D14D /* PBXTargetDependency */ = { isa = PBXTargetDependency; @@ -12726,7 +12773,7 @@ repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit"; requirement = { kind = revision; - revision = c79353fa3c7c3745edb1e4f2c4372385099874b7; + revision = 93b4daf47cddbbe5eb3e072931ed99b8e28ae39c; }; }; AA06B6B52672AF8100F541C5 /* XCRemoteSwiftPackageReference "Sparkle" */ = { @@ -13181,8 +13228,54 @@ package = AA06B6B52672AF8100F541C5 /* XCRemoteSwiftPackageReference "Sparkle" */; productName = Sparkle; }; - B69D06092A4B19470032D14D /* SwiftLintPlugin */ = { + B6080B9A2B20AF6400B418EF /* SwiftLintPlugin */ = { + isa = XCSwiftPackageProductDependency; + package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */; + productName = "plugin:SwiftLintPlugin"; + }; + B6080B9C2B20AF7700B418EF /* SwiftLintPlugin */ = { isa = XCSwiftPackageProductDependency; + package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */; + productName = "plugin:SwiftLintPlugin"; + }; + B6080B9E2B20AF7B00B418EF /* SwiftLintPlugin */ = { + isa = XCSwiftPackageProductDependency; + package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */; + productName = "plugin:SwiftLintPlugin"; + }; + B6080BA02B20AF7F00B418EF /* SwiftLintPlugin */ = { + isa = XCSwiftPackageProductDependency; + package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */; + productName = "plugin:SwiftLintPlugin"; + }; + B6080BA22B20AF8300B418EF /* SwiftLintPlugin */ = { + isa = XCSwiftPackageProductDependency; + package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */; + productName = "plugin:SwiftLintPlugin"; + }; + B6080BA42B20AF8800B418EF /* SwiftLintPlugin */ = { + isa = XCSwiftPackageProductDependency; + package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */; + productName = "plugin:SwiftLintPlugin"; + }; + B6080BA62B20AF8B00B418EF /* SwiftLintPlugin */ = { + isa = XCSwiftPackageProductDependency; + package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */; + productName = "plugin:SwiftLintPlugin"; + }; + B6080BA82B20AF8F00B418EF /* SwiftLintPlugin */ = { + isa = XCSwiftPackageProductDependency; + package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */; + productName = "plugin:SwiftLintPlugin"; + }; + B6080BAA2B20AF9200B418EF /* SwiftLintPlugin */ = { + isa = XCSwiftPackageProductDependency; + package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */; + productName = "plugin:SwiftLintPlugin"; + }; + B692D0DE2B209FB7003F2548 /* SwiftLintPlugin */ = { + isa = XCSwiftPackageProductDependency; + package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */; productName = "plugin:SwiftLintPlugin"; }; B69D06132A4C0AC50032D14D /* SwiftLintPlugin */ = { diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index ad691525b6..f988e37bd9 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -14,7 +14,7 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/duckduckgo/BrowserServicesKit", "state" : { - "revision" : "c79353fa3c7c3745edb1e4f2c4372385099874b7" + "revision" : "93b4daf47cddbbe5eb3e072931ed99b8e28ae39c" } }, { @@ -76,8 +76,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/duckduckgo/privacy-dashboard", "state" : { - "revision" : "daa9708223b4b4318fb6448ca44801dfabcddc6f", - "version" : "3.0.0" + "revision" : "38336a574e13090764ba09a6b877d15ee514e371", + "version" : "3.1.1" } }, {