Skip to content

Commit

Permalink
bump bsk
Browse files Browse the repository at this point in the history
  • Loading branch information
@mallexxx
mallexxx committed Dec 6, 2023
1 parent f9ff5ef commit fbfe587
Show file tree
Hide file tree
Showing 2 changed files with 106 additions and 13 deletions.
117 changes: 105 additions & 12 deletions DuckDuckGo.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7989,6 +7989,7 @@
buildRules = (
);
dependencies = (
B6080B9F2B20AF7B00B418EF /* PBXTargetDependency */,
);
name = NetworkProtectionSystemExtension;
packageProductDependencies = (
Expand All @@ -8014,6 +8015,7 @@
buildRules = (
);
dependencies = (
B6080BA32B20AF8300B418EF /* PBXTargetDependency */,
7BEC18312AD5DA3300D30536 /* PBXTargetDependency */,
);
name = DuckDuckGoVPN;
Expand Down Expand Up @@ -8042,6 +8044,7 @@
buildRules = (
);
dependencies = (
B6080BA52B20AF8800B418EF /* PBXTargetDependency */,
);
name = DuckDuckGoVPNAppStore;
packageProductDependencies = (
Expand All @@ -8066,6 +8069,7 @@
buildRules = (
);
dependencies = (
B6080BA12B20AF7F00B418EF /* PBXTargetDependency */,
4B4BEC4A2A11B627001D9AC5 /* PBXTargetDependency */,
);
name = DuckDuckGoNotifications;
Expand All @@ -8086,6 +8090,7 @@
buildRules = (
);
dependencies = (
B6080B9D2B20AF7700B418EF /* PBXTargetDependency */,
4B4D60532A0B29CB00BCD287 /* PBXTargetDependency */,
);
name = NetworkProtectionAppExtension;
Expand Down Expand Up @@ -8161,6 +8166,7 @@
buildRules = (
);
dependencies = (
B6080B9B2B20AF6400B418EF /* PBXTargetDependency */,
7B4CE8E026F02108009134B1 /* PBXTargetDependency */,
);
name = "UI Tests";
Expand All @@ -8179,6 +8185,7 @@
buildRules = (
);
dependencies = (
B6080BA72B20AF8B00B418EF /* PBXTargetDependency */,
7B20D5C82ADFEC730053C42A /* PBXTargetDependency */,
);
name = DuckDuckGoDBPTests;
Expand All @@ -8196,11 +8203,12 @@
9D9AE8B62AAA39A70026E7DC /* Sources */,
9D9AE8C62AAA39A70026E7DC /* Frameworks */,
9D9AE8C92AAA39A70026E7DC /* Resources */,
7BB34F502AD98394005691AE /* ShellScript */,
7BB34F502AD98394005691AE /* Copy Swift Package resources */,
);
buildRules = (
);
dependencies = (
B6080BA92B20AF8F00B418EF /* PBXTargetDependency */,
);
name = DuckDuckGoDBPBackgroundAgent;
packageProductDependencies = (
Expand All @@ -8223,6 +8231,7 @@
buildRules = (
);
dependencies = (
B6080BAB2B20AF9200B418EF /* PBXTargetDependency */,
);
name = DuckDuckGoDBPBackgroundAgentAppStore;
packageProductDependencies = (
Expand All @@ -8249,7 +8258,7 @@
buildRules = (
);
dependencies = (
B69D060A2A4B19470032D14D /* PBXTargetDependency */,
B692D0DF2B209FB7003F2548 /* PBXTargetDependency */,
4B5F14FC2A15291D0060320F /* PBXTargetDependency */,
31C6E9AD2B0C07BA0086DC30 /* PBXTargetDependency */,
);
Expand Down Expand Up @@ -8831,7 +8840,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# We had issues where the Swift Package resources were not being added to the Agent Apps,\n# so we're manually coping them here.\n# It seems to be a known issue: https://forums.swift.org/t/swift-packages-resource-bundle-not-present-in-xcarchive-when-framework-using-said-package-is-archived/50084/2\ncp -RL \"${BUILT_PRODUCTS_DIR}\"/NetworkProtectionMac_NetworkProtectionUI.bundle \"${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/\"\n";
shellScript = "# We had issues where the Swift Package resources were not being added to the Agent Apps,\n# so we're manually coping them here.\n# It seems to be a known issue: https://forums.swift.org/t/swift-packages-resource-bundle-not-present-in-xcarchive-when-framework-using-said-package-is-archived/50084/2\n#cp -RL \"${BUILT_PRODUCTS_DIR}\"/NetworkProtectionMac_NetworkProtectionUI.bundle \"${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/\"\n";
};
4B2D067D2A13341200DE1F49 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
Expand Down Expand Up @@ -8909,6 +8918,7 @@
};
7B31FD922AD126C40086AA24 /* Embed System Network Extension */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
Expand All @@ -8923,7 +8933,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
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";
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\n#ditto \"${BUILT_PRODUCTS_DIR}/${SYSEX_BUNDLE_ID}.systemextension\" \"$BUILT_PRODUCTS_DIR/${CONTENTS_FOLDER_PATH}/Library/SystemExtensions/${SYSEX_BUNDLE_ID}.systemextension\" || exit 1\n";
};
7B31FD942AD126FA0086AA24 /* Embed System Network Extension */ = {
isa = PBXShellScriptBuildPhase;
Expand All @@ -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;
Expand All @@ -8954,13 +8964,14 @@
);
inputPaths = (
);
name = "Copy Swift Package resources";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "# We had issues where the Swift Package resources were not being added to the Agent Apps,\n# so we're manually coping them here.\n# It seems to be a known issue: https://forums.swift.org/t/swift-packages-resource-bundle-not-present-in-xcarchive-when-framework-using-said-package-is-archived/50084/2\ncp -RL \"${BUILT_PRODUCTS_DIR}\"/ContentScopeScripts_ContentScopeScripts.bundle \"${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/\"\ncp -RL \"${BUILT_PRODUCTS_DIR}\"/DataBrokerProtection_DataBrokerProtection.bundle \"${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/\"\n";
shellScript = "# We had issues where the Swift Package resources were not being added to the Agent Apps,\n# so we're manually coping them here.\n# It seems to be a known issue: https://forums.swift.org/t/swift-packages-resource-bundle-not-present-in-xcarchive-when-framework-using-said-package-is-archived/50084/2\n#cp -RL \"${BUILT_PRODUCTS_DIR}\"/ContentScopeScripts_ContentScopeScripts.bundle \"${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/\"\n#cp -RL \"${BUILT_PRODUCTS_DIR}\"/DataBrokerProtection_DataBrokerProtection.bundle \"${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/\"\n";
};
B6BD8F0A2A260E5900B6A41F /* embed libswift_Concurrency.dylib */ = {
isa = PBXShellScriptBuildPhase;
Expand All @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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 = 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 = B69D06092A4B19470032D14D /* SwiftLintPlugin */;
productRef = B692D0DE2B209FB7003F2548 /* SwiftLintPlugin */;
};
B69D06142A4C0AC50032D14D /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
Expand Down Expand Up @@ -12726,7 +12773,7 @@
repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
requirement = {
kind = revision;
revision = c79353fa3c7c3745edb1e4f2c4372385099874b7;
revision = 93b4daf47cddbbe5eb3e072931ed99b8e28ae39c;
};
};
AA06B6B52672AF8100F541C5 /* XCRemoteSwiftPackageReference "Sparkle" */ = {
Expand Down Expand Up @@ -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 */ = {
Expand Down
2 changes: 1 addition & 1 deletion DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/duckduckgo/BrowserServicesKit",
"state" : {
"revision" : "c79353fa3c7c3745edb1e4f2c4372385099874b7"
"revision" : "d4b58af0b5c2a08a8cce713b4048f5a664480d55"
}
},
{
Expand Down

0 comments on commit fbfe587

Please sign in to comment.