Skip to content

Commit

Permalink
Convert SwiftLintPlugin to SwiftLintTool (#2601)
Browse files Browse the repository at this point in the history 
Task/Issue URL:
https://app.asana.com/0/1201037661562251/1206803066031565/f
apple-toolbox PR: duckduckgo/apple-toolbox#3
BSK PR: duckduckgo/BrowserServicesKit#774
iOS PR: duckduckgo/iOS#2710
  • Loading branch information
@mallexxx
mallexxx authored Apr 18, 2024
1 parent b102844 commit 73d3543
Show file tree
Hide file tree
Showing 11 changed files with 92 additions and 142 deletions.
153 changes: 59 additions & 94 deletions DuckDuckGo.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7057,10 +7057,10 @@
4B9292CD2667123700AD2C21 /* BookmarkManagementDetailViewController.swift */,
4B9292C72667123700AD2C21 /* BookmarkManagementSidebarViewController.swift */,
4B9292C82667123700AD2C21 /* BookmarkManagementSplitViewController.swift */,
4B9292C92667123700AD2C21 /* BookmarkTableRowView.swift */,
4B92928726670D1600AD2C21 /* BookmarkOutlineCellView.swift */,
4B92928526670D1600AD2C21 /* BookmarksOutlineView.swift */,
4B92928926670D1700AD2C21 /* BookmarkTableCellView.swift */,
4B9292C92667123700AD2C21 /* BookmarkTableRowView.swift */,
4B9292C62667123700AD2C21 /* BrowserTabSelectionDelegate.swift */,
4B92928626670D1600AD2C21 /* OutlineSeparatorViewCell.swift */,
4B0511B3262CAA5A00F6079C /* RoundedSelectionRowView.swift */,
Expand Down Expand Up @@ -8016,6 +8016,7 @@
CBCCF59F2996681700C02DFE /* Assert Xcode version */,
378E2798296F6D1D00FCADA2 /* Validate PRODUCT_NAME */,
3706FA79293F65D500E42796 /* Check Embedded Config URLs */,
B6E6BA192BA2D8BE008AA7E1 /* Run swiftlint */,
3706FA7A293F65D500E42796 /* Sources */,
3706FCA6293F65D500E42796 /* Frameworks */,
3706FCB1293F65D500E42796 /* Resources */,
Expand All @@ -8024,9 +8025,9 @@
buildRules = (
);
dependencies = (
B637D1BD2BC6AE6200C7DCA7 /* PBXTargetDependency */,
4BBA2D2B2B6AD01E00F6A470 /* PBXTargetDependency */,
4BBA2D292B6ACD4D00F6A470 /* PBXTargetDependency */,
B69D061C2A4C0BC10032D14D /* PBXTargetDependency */,
4B5F14FE2A1529230060320F /* PBXTargetDependency */,
);
name = "DuckDuckGo Privacy Browser App Store";
Expand Down Expand Up @@ -8101,7 +8102,6 @@
buildRules = (
);
dependencies = (
B69D061A2A4C0AD80032D14D /* PBXTargetDependency */,
B6EC37F429B5DA94001ACE79 /* PBXTargetDependency */,
37079A95294236FA0031BB3C /* PBXTargetDependency */,
);
Expand All @@ -8124,7 +8124,6 @@
buildRules = (
);
dependencies = (
B6F997C12B8F35F800476735 /* PBXTargetDependency */,
376113D62B29CD6800E794BB /* PBXTargetDependency */,
);
name = "SyncE2EUITests App Store";
Expand All @@ -8146,7 +8145,6 @@
);
dependencies = (
B6CAC23F2B8F0ECA006CD402 /* PBXTargetDependency */,
B69D06162A4C0ACD0032D14D /* PBXTargetDependency */,
B6EC37F229B5DA8F001ACE79 /* PBXTargetDependency */,
);
name = "Integration Tests";
Expand All @@ -8171,7 +8169,6 @@
buildRules = (
);
dependencies = (
B6080B9F2B20AF7B00B418EF /* PBXTargetDependency */,
);
name = NetworkProtectionSystemExtension;
packageProductDependencies = (
Expand Down Expand Up @@ -8199,7 +8196,6 @@
buildRules = (
);
dependencies = (
B6080BA32B20AF8300B418EF /* PBXTargetDependency */,
7BEC18312AD5DA3300D30536 /* PBXTargetDependency */,
);
name = DuckDuckGoVPN;
Expand Down Expand Up @@ -8234,7 +8230,6 @@
dependencies = (
7BDA36F82B7E082100AD5388 /* PBXTargetDependency */,
4BA7C4DF2B3F6F4900AFE511 /* PBXTargetDependency */,
B6080BA52B20AF8800B418EF /* PBXTargetDependency */,
);
name = DuckDuckGoVPNAppStore;
packageProductDependencies = (
Expand Down Expand Up @@ -8262,7 +8257,6 @@
buildRules = (
);
dependencies = (
B6080BA12B20AF7F00B418EF /* PBXTargetDependency */,
4B4BEC4A2A11B627001D9AC5 /* PBXTargetDependency */,
);
name = DuckDuckGoNotifications;
Expand All @@ -8285,7 +8279,6 @@
buildRules = (
);
dependencies = (
B6080B9D2B20AF7700B418EF /* PBXTargetDependency */,
4B4D60532A0B29CB00BCD287 /* PBXTargetDependency */,
);
name = NetworkProtectionAppExtension;
Expand All @@ -8312,7 +8305,6 @@
buildRules = (
);
dependencies = (
B6F997BF2B8F35F400476735 /* PBXTargetDependency */,
);
name = SyncE2EUITests;
packageProductDependencies = (
Expand All @@ -8333,7 +8325,6 @@
);
dependencies = (
EE02D41E2BB460B500DBE6B3 /* PBXTargetDependency */,
B6F997BD2B8F35EF00476735 /* PBXTargetDependency */,
);
name = "UI Tests";
packageProductDependencies = (
Expand Down Expand Up @@ -8379,7 +8370,6 @@
buildRules = (
);
dependencies = (
B6080BA92B20AF8F00B418EF /* PBXTargetDependency */,
);
name = DuckDuckGoDBPBackgroundAgent;
packageProductDependencies = (
Expand All @@ -8403,7 +8393,6 @@
buildRules = (
);
dependencies = (
B6080BAB2B20AF9200B418EF /* PBXTargetDependency */,
);
name = DuckDuckGoDBPBackgroundAgentAppStore;
packageProductDependencies = (
Expand All @@ -8421,6 +8410,7 @@
buildPhases = (
CBCCF59E299667B700C02DFE /* Assert Xcode version */,
3705272528992C8A000C06A2 /* Check Embedded Config URLs */,
B6409DC52BC7BD1F00D66F9E /* Run swiftlint */,
AA585D7A248FD31100E9A3E2 /* Sources */,
AA585D7B248FD31100E9A3E2 /* Frameworks */,
AA585D7C248FD31100E9A3E2 /* Resources */,
Expand All @@ -8430,8 +8420,8 @@
buildRules = (
);
dependencies = (
B637D1BB2BC6AE5600C7DCA7 /* PBXTargetDependency */,
7B4627742B9AF2C8004ACE0B /* PBXTargetDependency */,
B6F997BB2B8F353F00476735 /* PBXTargetDependency */,
4B5F14FC2A15291D0060320F /* PBXTargetDependency */,
31C6E9AD2B0C07BA0086DC30 /* PBXTargetDependency */,
);
Expand Down Expand Up @@ -8486,7 +8476,6 @@
dependencies = (
B6E6BA1D2BA2E049008AA7E1 /* PBXTargetDependency */,
B6CAC23D2B8F0EC6006CD402 /* PBXTargetDependency */,
B69D06142A4C0AC50032D14D /* PBXTargetDependency */,
);
name = "Unit Tests";
packageProductDependencies = (
Expand Down Expand Up @@ -9117,6 +9106,25 @@
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";
};
B6409DC52BC7BD1F00D66F9E /* Run swiftlint */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "Run swiftlint";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "if [ \"$CONFIGURATION\" != \"Debug\" ] || [ \"$ENABLE_PREVIEWS\" = \"YES\" ]; then exit 0; fi\n${BUILT_PRODUCTS_DIR}/SwiftLintTool\n";
};
B6AEB5532BA3029B00781A09 /* Cleanup entitlements */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
Expand Down Expand Up @@ -9155,6 +9163,25 @@
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";
};
B6E6BA192BA2D8BE008AA7E1 /* Run swiftlint */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
);
name = "Run swiftlint";
outputFileListPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "if [ \"$CONFIGURATION\" != \"Debug\" ] || [ \"$ENABLE_PREVIEWS\" = \"YES\" ]; then exit 0; fi\n${BUILT_PRODUCTS_DIR}/SwiftLintTool\n";
};
B6F2C8722A7A4C7D000498CF /* Make /Applications symlink, remove app on Clean build */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
Expand Down Expand Up @@ -11666,49 +11693,13 @@
target = 4B2537592A11BE7300610219 /* NetworkProtectionSystemExtension */;
targetProxy = 7BEC18302AD5DA3300D30536 /* PBXContainerItemProxy */;
};
B6080B9D2B20AF7700B418EF /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
productRef = B6F997BA2B8F353F00476735 /* SwiftLintPlugin */;
};
B6080B9F2B20AF7B00B418EF /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
productRef = B6F997BA2B8F353F00476735 /* SwiftLintPlugin */;
};
B6080BA12B20AF7F00B418EF /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
productRef = B6F997BA2B8F353F00476735 /* SwiftLintPlugin */;
};
B6080BA32B20AF8300B418EF /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
productRef = B6F997BA2B8F353F00476735 /* SwiftLintPlugin */;
};
B6080BA52B20AF8800B418EF /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
productRef = B6F997BA2B8F353F00476735 /* SwiftLintPlugin */;
};
B6080BA92B20AF8F00B418EF /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
productRef = B6F997BA2B8F353F00476735 /* SwiftLintPlugin */;
};
B6080BAB2B20AF9200B418EF /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
productRef = B6F997BA2B8F353F00476735 /* SwiftLintPlugin */;
};
B69D06142A4C0AC50032D14D /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
productRef = B6F997BA2B8F353F00476735 /* SwiftLintPlugin */;
};
B69D06162A4C0ACD0032D14D /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
productRef = B6F997BA2B8F353F00476735 /* SwiftLintPlugin */;
};
B69D061A2A4C0AD80032D14D /* PBXTargetDependency */ = {
B637D1BB2BC6AE5600C7DCA7 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
productRef = B6F997BA2B8F353F00476735 /* SwiftLintPlugin */;
productRef = B637D1BA2BC6AE5600C7DCA7 /* SwiftLintTool */;
};
B69D061C2A4C0BC10032D14D /* PBXTargetDependency */ = {
B637D1BD2BC6AE6200C7DCA7 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
productRef = B6F997BA2B8F353F00476735 /* SwiftLintPlugin */;
productRef = B637D1BC2BC6AE6200C7DCA7 /* SwiftLintTool */;
};
B6AEB5552BA3042300781A09 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
Expand Down Expand Up @@ -11740,22 +11731,6 @@
target = B6EC37E729B5DA2A001ACE79 /* tests-server */;
targetProxy = B6EC37F329B5DA94001ACE79 /* PBXContainerItemProxy */;
};
B6F997BB2B8F353F00476735 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
productRef = B6F997BA2B8F353F00476735 /* SwiftLintPlugin */;
};
B6F997BD2B8F35EF00476735 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
productRef = B6F997BC2B8F35EF00476735 /* SwiftLintPlugin */;
};
B6F997BF2B8F35F400476735 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
productRef = B6F997BE2B8F35F400476735 /* SwiftLintPlugin */;
};
B6F997C12B8F35F800476735 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
productRef = B6F997C02B8F35F800476735 /* SwiftLintPlugin */;
};
EE02D41E2BB460B500DBE6B3 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = B6EC37E729B5DA2A001ACE79 /* tests-server */;
Expand Down Expand Up @@ -12590,7 +12565,7 @@
repositoryURL = "https://github.com/duckduckgo/BrowserServicesKit";
requirement = {
kind = exactVersion;
version = 135.0.0;
version = 136.0.0;
};
};
9FF521422BAA8FF300B9819B /* XCRemoteSwiftPackageReference "lottie-spm" */ = {
Expand Down Expand Up @@ -12638,7 +12613,7 @@
repositoryURL = "https://github.com/duckduckgo/apple-toolbox.git";
requirement = {
kind = exactVersion;
version = 2.0.0;
version = 3.1.1;
};
};
F1D43AF12B98E47800BAB743 /* XCRemoteSwiftPackageReference "BareBonesBrowser" */ = {
Expand Down Expand Up @@ -13092,6 +13067,16 @@
package = AA06B6B52672AF8100F541C5 /* XCRemoteSwiftPackageReference "Sparkle" */;
productName = Sparkle;
};
B637D1BA2BC6AE5600C7DCA7 /* SwiftLintTool */ = {
isa = XCSwiftPackageProductDependency;
package = B6F997B92B8F352500476735 /* XCRemoteSwiftPackageReference "apple-toolbox" */;
productName = SwiftLintTool;
};
B637D1BC2BC6AE6200C7DCA7 /* SwiftLintTool */ = {
isa = XCSwiftPackageProductDependency;
package = B6F997B92B8F352500476735 /* XCRemoteSwiftPackageReference "apple-toolbox" */;
productName = SwiftLintTool;
};
B65CD8CA2B316DF100A595BB /* SnapshotTesting */ = {
isa = XCSwiftPackageProductDependency;
package = B65CD8C92B316DF100A595BB /* XCRemoteSwiftPackageReference "swift-snapshot-testing" */;
Expand Down Expand Up @@ -13162,26 +13147,6 @@
package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
productName = Configuration;
};
B6F997BA2B8F353F00476735 /* SwiftLintPlugin */ = {
isa = XCSwiftPackageProductDependency;
package = B6F997B92B8F352500476735 /* XCRemoteSwiftPackageReference "apple-toolbox" */;
productName = "plugin:SwiftLintPlugin";
};
B6F997BC2B8F35EF00476735 /* SwiftLintPlugin */ = {
isa = XCSwiftPackageProductDependency;
package = B6F997B92B8F352500476735 /* XCRemoteSwiftPackageReference "apple-toolbox" */;
productName = "plugin:SwiftLintPlugin";
};
B6F997BE2B8F35F400476735 /* SwiftLintPlugin */ = {
isa = XCSwiftPackageProductDependency;
package = B6F997B92B8F352500476735 /* XCRemoteSwiftPackageReference "apple-toolbox" */;
productName = "plugin:SwiftLintPlugin";
};
B6F997C02B8F35F800476735 /* SwiftLintPlugin */ = {
isa = XCSwiftPackageProductDependency;
package = B6F997B92B8F352500476735 /* XCRemoteSwiftPackageReference "apple-toolbox" */;
productName = "plugin:SwiftLintPlugin";
};
CBC83E3529B63D380008E19C /* Configuration */ = {
isa = XCSwiftPackageProductDependency;
package = 9807F643278CA16F00E1547B /* XCRemoteSwiftPackageReference "BrowserServicesKit" */;
Expand Down
19 changes: 14 additions & 5 deletions DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/duckduckgo/apple-toolbox.git",
"state" : {
"revision" : "d51beaf1736013b530576ace13a16d6d1a63742c",
"version" : "2.0.0"
"revision" : "ab53ca41e9044a20eab7e53249526fadcf9acc9f",
"version" : "3.1.1"
}
},
{
Expand All @@ -32,8 +32,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/duckduckgo/BrowserServicesKit",
"state" : {
"revision" : "5821f7094190dbb5bd4f75758c4560f72518056b",
"version" : "135.0.0"
"revision" : "7eab61a08c9535b1a8e59c622fe57d33a310a2fc",
"version" : "136.0.0"
}
},
{
Expand Down Expand Up @@ -117,6 +117,15 @@
"version" : "2.6.0"
}
},
{
"identity" : "swift-argument-parser",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-argument-parser",
"state" : {
"revision" : "46989693916f56d1186bd59ac15124caef896560",
"version" : "1.3.1"
}
},
{
"identity" : "swift-snapshot-testing",
"kind" : "remoteSourceControl",
Expand All @@ -129,7 +138,7 @@
{
"identity" : "swift-syntax",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-syntax.git",
"location" : "https://github.com/apple/swift-syntax",
"state" : {
"revision" : "64889f0c732f210a935a0ad7cda38f77f876262d",
"version" : "509.1.1"
Expand Down
Loading

0 comments on commit 73d3543

Please sign in to comment.