From 5d5faad9d6e047cc44b77aaf6960d6eaa07fff19 Mon Sep 17 00:00:00 2001 From: Alexey Martemyanov Date: Thu, 11 Apr 2024 16:01:11 +0600 Subject: [PATCH 1/7] Replace SwiftLintPlugin with SwiftLintTool --- DuckDuckGo.xcodeproj/project.pbxproj | 232 ++++++++++-------- .../xcshareddata/swiftpm/Package.resolved | 15 +- LocalPackages/DuckUI/Package.swift | 4 +- LocalPackages/SyncUI/Package.swift | 4 +- LocalPackages/Waitlist/Package.swift | 10 +- SwiftLintToolBundleConfiguration.xcconfig | 29 +++ submodules/privacy-reference-tests | 2 +- 7 files changed, 171 insertions(+), 125 deletions(-) create mode 100644 SwiftLintToolBundleConfiguration.xcconfig diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index 5ce9c84e9f..febbd56a30 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -1112,6 +1112,13 @@ remoteGlobalIDString = 84E341911E2F7EFB00BDBA6F; remoteInfo = DuckDuckGo; }; + B6DFE6D72BC7E49800A9CE59 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 84E3418A1E2F7EFB00BDBA6F /* Project object */; + proxyType = 1; + remoteGlobalIDString = B6DFE6CE2BC7E47500A9CE59; + remoteInfo = SwiftLintToolBundle; + }; F143C2E91E4A4CD400CFDE3A /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 84E3418A1E2F7EFB00BDBA6F /* Project object */; @@ -2411,6 +2418,8 @@ B6BA95C428894A28004ABA20 /* BrowsingMenuViewController.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = BrowsingMenuViewController.storyboard; sourceTree = ""; }; B6BA95E728924730004ABA20 /* JSAlertController.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = JSAlertController.storyboard; sourceTree = ""; }; B6CB93E4286445AB0090FEB4 /* Base64DownloadSession.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Base64DownloadSession.swift; sourceTree = ""; }; + B6DFE6CF2BC7E47500A9CE59 /* .bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = .bundle; sourceTree = BUILT_PRODUCTS_DIR; }; + B6DFE6D92BC7E61B00A9CE59 /* SwiftLintToolBundleConfiguration.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = SwiftLintToolBundleConfiguration.xcconfig; sourceTree = ""; }; BD15DB842B959CFD00821457 /* BundleExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BundleExtension.swift; sourceTree = ""; }; BD862E022B30DA170073E2EE /* VPNFeedbackFormViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VPNFeedbackFormViewModel.swift; sourceTree = ""; }; BD862E042B30DB250073E2EE /* VPNFeedbackCategory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VPNFeedbackCategory.swift; sourceTree = ""; }; @@ -2864,6 +2873,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + B6DFE6CC2BC7E47500A9CE59 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; F143C2E01E4A4CD400CFDE3A /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -3874,6 +3890,7 @@ EE3B98EB2A963515002F63A0 /* WidgetsExtensionAlpha.entitlements */, 6FB030C7234331B400A10DB9 /* Configuration.xcconfig */, EEB8FDB92A990AEE00EBEDCF /* Configuration-Alpha.xcconfig */, + B6DFE6D92BC7E61B00A9CE59 /* SwiftLintToolBundleConfiguration.xcconfig */, 84E341941E2F7EFB00BDBA6F /* DuckDuckGo */, F143C2E51E4A4CD400CFDE3A /* Core */, 8390446D20BDCE10006461CD /* ShareExtension */, @@ -3910,6 +3927,7 @@ 85D33FCB25C97B6E002B91A6 /* IntegrationTests.xctest */, 9825F9D7293F2DE900F220F2 /* PerformanceTests.xctest */, 02025662298818B100E694E7 /* PacketTunnelProvider.appex */, + B6DFE6CF2BC7E47500A9CE59 /* .bundle */, ); name = Products; sourceTree = ""; @@ -5808,7 +5826,6 @@ buildRules = ( ); dependencies = ( - B6F997D42B8F381A00476735 /* PBXTargetDependency */, 4B470EE7299C6DFB0086EBDC /* PBXTargetDependency */, ); name = PacketTunnelProvider; @@ -5830,7 +5847,6 @@ buildRules = ( ); dependencies = ( - B6F997DC2B8F383100476735 /* PBXTargetDependency */, 025CCFE82582601C001CD5BB /* PBXTargetDependency */, ); name = FingerprintingUITests; @@ -5852,7 +5868,6 @@ buildRules = ( ); dependencies = ( - B6F997CE2B8F380D00476735 /* PBXTargetDependency */, ); name = ShareExtension; productName = ShareExtension; @@ -5867,6 +5882,7 @@ 0A991F5B239418D100AA1F64 /* Prevent Version Override */, 98B0CE69251C937D003FB601 /* Update Localizable.strings */, 84E3418E1E2F7EFB00BDBA6F /* Sources */, + B6409DC62BC7D9BF00D66F9E /* Run swiftlint */, 84E3418F1E2F7EFB00BDBA6F /* Frameworks */, 84E341901E2F7EFB00BDBA6F /* Resources */, F143C2F01E4A4CD400CFDE3A /* Embed Frameworks */, @@ -5878,7 +5894,7 @@ buildRules = ( ); dependencies = ( - D621BB1F2BA4E774007AC6A8 /* PBXTargetDependency */, + B6DFE6D82BC7E49800A9CE59 /* PBXTargetDependency */, F143C2EA1E4A4CD400CFDE3A /* PBXTargetDependency */, 8390447520BDCE10006461CD /* PBXTargetDependency */, 85482D932462DCD100EDEDD1 /* PBXTargetDependency */, @@ -5913,7 +5929,6 @@ buildRules = ( ); dependencies = ( - B6F997DA2B8F382E00476735 /* PBXTargetDependency */, 84E341A81E2F7EFB00BDBA6F /* PBXTargetDependency */, ); name = UnitTests; @@ -5940,7 +5955,6 @@ buildRules = ( ); dependencies = ( - B6F997D22B8F381600476735 /* PBXTargetDependency */, 85DF714924F7FE6100C89288 /* PBXTargetDependency */, ); name = WidgetsExtension; @@ -5962,7 +5976,6 @@ buildRules = ( ); dependencies = ( - B6F997D02B8F381100476735 /* PBXTargetDependency */, ); name = OpenAction; productName = OpenAction; @@ -5980,7 +5993,6 @@ buildRules = ( ); dependencies = ( - B6F997DE2B8F383400476735 /* PBXTargetDependency */, 85D33FD125C97B6E002B91A6 /* PBXTargetDependency */, ); name = IntegrationTests; @@ -6005,7 +6017,6 @@ buildRules = ( ); dependencies = ( - B6F997D82B8F382900476735 /* PBXTargetDependency */, 85F21DB3210F5E32002631A6 /* PBXTargetDependency */, ); name = AtbUITests; @@ -6027,7 +6038,6 @@ buildRules = ( ); dependencies = ( - B6F997E02B8F383700476735 /* PBXTargetDependency */, 9825F9CC293F2DE900F220F2 /* PBXTargetDependency */, ); name = PerformanceTests; @@ -6052,6 +6062,24 @@ productReference = 98A54A8122AFCB2C00E541F4 /* Instruments.instrdst */; productType = "com.apple.product-type.instruments-package"; }; + B6DFE6CE2BC7E47500A9CE59 /* SwiftLintToolBundle */ = { + isa = PBXNativeTarget; + buildConfigurationList = B6DFE6D02BC7E47500A9CE59 /* Build configuration list for PBXNativeTarget "SwiftLintToolBundle" */; + buildPhases = ( + B6DFE6CB2BC7E47500A9CE59 /* Sources */, + B6DFE6CC2BC7E47500A9CE59 /* Frameworks */, + B6DFE6CD2BC7E47500A9CE59 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + B6DFE6D62BC7E47F00A9CE59 /* PBXTargetDependency */, + ); + name = SwiftLintToolBundle; + productName = SwiftLintToolBundle; + productReference = B6DFE6CF2BC7E47500A9CE59 /* .bundle */; + productType = "com.apple.product-type.bundle"; + }; F143C2E31E4A4CD400CFDE3A /* Core */ = { isa = PBXNativeTarget; buildConfigurationList = F143C2ED1E4A4CD400CFDE3A /* Build configuration list for PBXNativeTarget "Core" */; @@ -6064,7 +6092,6 @@ buildRules = ( ); dependencies = ( - B6F997D62B8F381D00476735 /* PBXTargetDependency */, ); name = Core; packageProductDependencies = ( @@ -6152,6 +6179,9 @@ CreatedOnToolsVersion = 10.2; ProvisioningStyle = Automatic; }; + B6DFE6CE2BC7E47500A9CE59 = { + CreatedOnToolsVersion = 15.3; + }; F143C2E31E4A4CD400CFDE3A = { CreatedOnToolsVersion = 8.2.1; LastSwiftMigration = 1020; @@ -6227,6 +6257,7 @@ 025CCFE12582601C001CD5BB /* FingerprintingUITests */, 85D33FCA25C97B6E002B91A6 /* IntegrationTests */, 9825F9CB293F2DE900F220F2 /* PerformanceTests */, + B6DFE6CE2BC7E47500A9CE59 /* SwiftLintToolBundle */, ); }; /* End PBXProject section */ @@ -6445,6 +6476,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + B6DFE6CD2BC7E47500A9CE59 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; F143C2E21E4A4CD400CFDE3A /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -6542,6 +6580,25 @@ shellPath = /bin/sh; shellScript = "if [ $ENABLE_PREVIEWS == \"YES\" ]\nthen\n exit 0\nelse\n \"$SOURCE_ROOT/scripts/loc_update.sh\"\nfi\n"; }; + B6409DC62BC7D9BF00D66F9E /* Run swiftlint */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = "Run swiftlint"; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "if [ \"$CONFIGURATION\" = \"Release\" ] || [ \"$ENABLE_PREVIEWS\" = \"YES\" ]; then exit 0; fi\n\"${BUILT_PRODUCTS_DIR}/../${CONFIGURATION}/SwiftLintTool\"\n"; + }; CBCCF59B29940C3800C02DFE /* Assert Xcode version */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; @@ -7370,6 +7427,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + B6DFE6CB2BC7E47500A9CE59 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; F143C2DF1E4A4CD400CFDE3A /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -7539,49 +7603,14 @@ target = 84E341911E2F7EFB00BDBA6F /* DuckDuckGo */; targetProxy = 9825F9CD293F2DE900F220F2 /* PBXContainerItemProxy */; }; - B6F997CE2B8F380D00476735 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - productRef = B6F997CD2B8F380D00476735 /* SwiftLintPlugin */; - }; - B6F997D02B8F381100476735 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - productRef = B6F997CF2B8F381100476735 /* SwiftLintPlugin */; - }; - B6F997D22B8F381600476735 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - productRef = B6F997D12B8F381600476735 /* SwiftLintPlugin */; - }; - B6F997D42B8F381A00476735 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - productRef = B6F997D32B8F381A00476735 /* SwiftLintPlugin */; - }; - B6F997D62B8F381D00476735 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - productRef = B6F997D52B8F381D00476735 /* SwiftLintPlugin */; - }; - B6F997D82B8F382900476735 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - productRef = B6F997D72B8F382900476735 /* SwiftLintPlugin */; - }; - B6F997DA2B8F382E00476735 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - productRef = B6F997D92B8F382E00476735 /* SwiftLintPlugin */; - }; - B6F997DC2B8F383100476735 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - productRef = B6F997DB2B8F383100476735 /* SwiftLintPlugin */; - }; - B6F997DE2B8F383400476735 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - productRef = B6F997DD2B8F383400476735 /* SwiftLintPlugin */; - }; - B6F997E02B8F383700476735 /* PBXTargetDependency */ = { + B6DFE6D62BC7E47F00A9CE59 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - productRef = B6F997DF2B8F383700476735 /* SwiftLintPlugin */; + productRef = B6DFE6D52BC7E47F00A9CE59 /* SwiftLintTool */; }; - D621BB1F2BA4E774007AC6A8 /* PBXTargetDependency */ = { + B6DFE6D82BC7E49800A9CE59 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - productRef = D621BB1E2BA4E774007AC6A8 /* SwiftLintPlugin */; + target = B6DFE6CE2BC7E47500A9CE59 /* SwiftLintToolBundle */; + targetProxy = B6DFE6D72BC7E49800A9CE59 /* PBXContainerItemProxy */; }; F143C2EA1E4A4CD400CFDE3A /* PBXTargetDependency */ = { isa = PBXTargetDependency; @@ -9126,6 +9155,34 @@ }; name = Release; }; + B6DFE6D12BC7E47500A9CE59 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = B6DFE6D92BC7E61B00A9CE59 /* SwiftLintToolBundleConfiguration.xcconfig */; + buildSettings = { + }; + name = Debug; + }; + B6DFE6D22BC7E47500A9CE59 /* Alpha Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = B6DFE6D92BC7E61B00A9CE59 /* SwiftLintToolBundleConfiguration.xcconfig */; + buildSettings = { + }; + name = "Alpha Debug"; + }; + B6DFE6D32BC7E47500A9CE59 /* Alpha */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = B6DFE6D92BC7E61B00A9CE59 /* SwiftLintToolBundleConfiguration.xcconfig */; + buildSettings = { + }; + name = Alpha; + }; + B6DFE6D42BC7E47500A9CE59 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = B6DFE6D92BC7E61B00A9CE59 /* SwiftLintToolBundleConfiguration.xcconfig */; + buildSettings = { + }; + name = Release; + }; D664C7DE2B28A0FD00CBFA76 /* Alpha Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = EEB8FDB92A990AEE00EBEDCF /* Configuration-Alpha.xcconfig */; @@ -10131,6 +10188,17 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + B6DFE6D02BC7E47500A9CE59 /* Build configuration list for PBXNativeTarget "SwiftLintToolBundle" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + B6DFE6D12BC7E47500A9CE59 /* Debug */, + B6DFE6D22BC7E47500A9CE59 /* Alpha Debug */, + B6DFE6D32BC7E47500A9CE59 /* Alpha */, + B6DFE6D42BC7E47500A9CE59 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; F143C2ED1E4A4CD400CFDE3A /* Build configuration list for PBXNativeTarget "Core" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -10173,8 +10241,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit"; requirement = { - kind = exactVersion; - version = 133.1.0; + kind = revision; + revision = 94c7c307d4d51806d9b62db35c4f9dee9346c5ab; }; }; 9F8FE9472BAE50E50071E372 /* XCRemoteSwiftPackageReference "lottie-spm" */ = { @@ -10189,8 +10257,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/duckduckgo/apple-toolbox.git"; requirement = { - kind = exactVersion; - version = 2.0.0; + kind = revision; + revision = 3c4e94b43a587decdf5d0862c224161298b4bc27; }; }; C14882EB27F211A000D59F0C /* XCRemoteSwiftPackageReference "SwiftSoup" */ = { @@ -10374,55 +10442,10 @@ package = 9F8FE9472BAE50E50071E372 /* XCRemoteSwiftPackageReference "lottie-spm" */; productName = Lottie; }; - B6F997CD2B8F380D00476735 /* SwiftLintPlugin */ = { - isa = XCSwiftPackageProductDependency; - package = B6F997C22B8F374300476735 /* XCRemoteSwiftPackageReference "apple-toolbox" */; - productName = "plugin:SwiftLintPlugin"; - }; - B6F997CF2B8F381100476735 /* SwiftLintPlugin */ = { - isa = XCSwiftPackageProductDependency; - package = B6F997C22B8F374300476735 /* XCRemoteSwiftPackageReference "apple-toolbox" */; - productName = "plugin:SwiftLintPlugin"; - }; - B6F997D12B8F381600476735 /* SwiftLintPlugin */ = { - isa = XCSwiftPackageProductDependency; - package = B6F997C22B8F374300476735 /* XCRemoteSwiftPackageReference "apple-toolbox" */; - productName = "plugin:SwiftLintPlugin"; - }; - B6F997D32B8F381A00476735 /* SwiftLintPlugin */ = { - isa = XCSwiftPackageProductDependency; - package = B6F997C22B8F374300476735 /* XCRemoteSwiftPackageReference "apple-toolbox" */; - productName = "plugin:SwiftLintPlugin"; - }; - B6F997D52B8F381D00476735 /* SwiftLintPlugin */ = { - isa = XCSwiftPackageProductDependency; - package = B6F997C22B8F374300476735 /* XCRemoteSwiftPackageReference "apple-toolbox" */; - productName = "plugin:SwiftLintPlugin"; - }; - B6F997D72B8F382900476735 /* SwiftLintPlugin */ = { + B6DFE6D52BC7E47F00A9CE59 /* SwiftLintTool */ = { isa = XCSwiftPackageProductDependency; package = B6F997C22B8F374300476735 /* XCRemoteSwiftPackageReference "apple-toolbox" */; - productName = "plugin:SwiftLintPlugin"; - }; - B6F997D92B8F382E00476735 /* SwiftLintPlugin */ = { - isa = XCSwiftPackageProductDependency; - package = B6F997C22B8F374300476735 /* XCRemoteSwiftPackageReference "apple-toolbox" */; - productName = "plugin:SwiftLintPlugin"; - }; - B6F997DB2B8F383100476735 /* SwiftLintPlugin */ = { - isa = XCSwiftPackageProductDependency; - package = B6F997C22B8F374300476735 /* XCRemoteSwiftPackageReference "apple-toolbox" */; - productName = "plugin:SwiftLintPlugin"; - }; - B6F997DD2B8F383400476735 /* SwiftLintPlugin */ = { - isa = XCSwiftPackageProductDependency; - package = B6F997C22B8F374300476735 /* XCRemoteSwiftPackageReference "apple-toolbox" */; - productName = "plugin:SwiftLintPlugin"; - }; - B6F997DF2B8F383700476735 /* SwiftLintPlugin */ = { - isa = XCSwiftPackageProductDependency; - package = B6F997C22B8F374300476735 /* XCRemoteSwiftPackageReference "apple-toolbox" */; - productName = "plugin:SwiftLintPlugin"; + productName = SwiftLintTool; }; C14882EC27F211A000D59F0C /* SwiftSoup */ = { isa = XCSwiftPackageProductDependency; @@ -10449,11 +10472,6 @@ package = 854007E52B57FB020001BD98 /* XCRemoteSwiftPackageReference "ZIPFoundation" */; productName = ZIPFoundation; }; - D621BB1E2BA4E774007AC6A8 /* SwiftLintPlugin */ = { - isa = XCSwiftPackageProductDependency; - package = B6F997C22B8F374300476735 /* XCRemoteSwiftPackageReference "apple-toolbox" */; - productName = "plugin:SwiftLintPlugin"; - }; EE8E56892A56BCE400F11DCA /* NetworkProtection */ = { isa = XCSwiftPackageProductDependency; package = 98A16C2928A11BDE00A6C003 /* XCRemoteSwiftPackageReference "BrowserServicesKit" */; diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 35c1b9084d..2b6659c7d1 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -5,8 +5,7 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/duckduckgo/apple-toolbox.git", "state" : { - "revision" : "d51beaf1736013b530576ace13a16d6d1a63742c", - "version" : "2.0.0" + "revision" : "3c4e94b43a587decdf5d0862c224161298b4bc27" } }, { @@ -32,8 +31,7 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/DuckDuckGo/BrowserServicesKit", "state" : { - "revision" : "4699a5ff3d0669736e87f6da808884f245d80ede", - "version" : "133.1.0" + "revision" : "94c7c307d4d51806d9b62db35c4f9dee9346c5ab" } }, { @@ -198,6 +196,15 @@ "version" : "1.1.3" } }, + { + "identity" : "xcodeeditor", + "kind" : "remoteSourceControl", + "location" : "https://github.com/appsquickly/XcodeEditor.git", + "state" : { + "branch" : "master", + "revision" : "f3234db7fc40d8e917e169bc937ed03ca76ba885" + } + }, { "identity" : "zipfoundation", "kind" : "remoteSourceControl", diff --git a/LocalPackages/DuckUI/Package.swift b/LocalPackages/DuckUI/Package.swift index 693478114c..55e65316ee 100644 --- a/LocalPackages/DuckUI/Package.swift +++ b/LocalPackages/DuckUI/Package.swift @@ -31,7 +31,6 @@ let package = Package( targets: ["DuckUI"]) ], dependencies: [ - .package(url: "https://github.com/duckduckgo/apple-toolbox.git", exact: "2.0.0"), ], targets: [ .target( @@ -39,8 +38,7 @@ let package = Package( dependencies: [], swiftSettings: [ .define("DEBUG", .when(configuration: .debug)) - ], - plugins: [.plugin(name: "SwiftLintPlugin", package: "apple-toolbox")] + ] ) ] ) diff --git a/LocalPackages/SyncUI/Package.swift b/LocalPackages/SyncUI/Package.swift index ebbe099b43..fb7f2e8a5b 100644 --- a/LocalPackages/SyncUI/Package.swift +++ b/LocalPackages/SyncUI/Package.swift @@ -34,7 +34,6 @@ let package = Package( dependencies: [ .package(path: "../DuckUI"), .package(url: "https://github.com/duckduckgo/DesignResourcesKit", exact: "2.0.0"), - .package(url: "https://github.com/duckduckgo/apple-toolbox.git", exact: "2.0.0"), ], targets: [ .target( @@ -45,8 +44,7 @@ let package = Package( ], swiftSettings: [ .define("DEBUG", .when(configuration: .debug)) - ], - plugins: [.plugin(name: "SwiftLintPlugin", package: "apple-toolbox")] + ] ) ] ) diff --git a/LocalPackages/Waitlist/Package.swift b/LocalPackages/Waitlist/Package.swift index c8b231fae9..5cbe098876 100644 --- a/LocalPackages/Waitlist/Package.swift +++ b/LocalPackages/Waitlist/Package.swift @@ -16,7 +16,6 @@ let package = Package( ], dependencies: [ .package(url: "https://github.com/duckduckgo/DesignResourcesKit", exact: "2.0.0"), - .package(url: "https://github.com/duckduckgo/apple-toolbox.git", exact: "2.0.0"), ], targets: [ .target( @@ -26,21 +25,18 @@ let package = Package( ], swiftSettings: [ .define("DEBUG", .when(configuration: .debug)) - ], - plugins: [.plugin(name: "SwiftLintPlugin", package: "apple-toolbox")] + ] ), .target( name: "WaitlistMocks", dependencies: ["Waitlist"], swiftSettings: [ .define("DEBUG", .when(configuration: .debug)) - ], - plugins: [.plugin(name: "SwiftLintPlugin", package: "apple-toolbox")] + ] ), .testTarget( name: "WaitlistTests", - dependencies: ["Waitlist", "WaitlistMocks"], - plugins: [.plugin(name: "SwiftLintPlugin", package: "apple-toolbox")] + dependencies: ["Waitlist", "WaitlistMocks"] ) ] ) diff --git a/SwiftLintToolBundleConfiguration.xcconfig b/SwiftLintToolBundleConfiguration.xcconfig new file mode 100644 index 0000000000..1a8f484d63 --- /dev/null +++ b/SwiftLintToolBundleConfiguration.xcconfig @@ -0,0 +1,29 @@ +// +// SwiftLintToolBundleConfiguration.xcconfig +// DuckDuckGo +// +// Copyright © 2024 DuckDuckGo. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +// The SwiftLintToolBundle is an empty macOS target dedicated to compiling the SwiftLintTool +// project target dependency from the apple-toolbox Swift Package as a macOS CLI tool. +// When the SwiftLintTool is used as a direct iOS target dependency, Xcode tries to compile +// it as an iOS target. + +SDKROOT = macosx + +PROVISIONING_PROFILE_SPECIFIER = +PRODUCT_BUNDLE_IDENTIFIER = com.duckduckgo.swiftlinttool.bundle +GENERATE_INFOPLIST_FILE = YES diff --git a/submodules/privacy-reference-tests b/submodules/privacy-reference-tests index a603ff9af2..6b7ad1e7f1 160000 --- a/submodules/privacy-reference-tests +++ b/submodules/privacy-reference-tests @@ -1 +1 @@ -Subproject commit a603ff9af22ca3ff7ce2e7ffbfe18c447d9f23e8 +Subproject commit 6b7ad1e7f15270f9dfeb58a272199f4d57c3eb22 From 8fcf3532cbd845384cff72e21e42ac0eba5af497 Mon Sep 17 00:00:00 2001 From: Alexey Martemyanov Date: Thu, 11 Apr 2024 16:16:29 +0600 Subject: [PATCH 2/7] disable code signing for SwiftLintToolBundle --- SwiftLintToolBundleConfiguration.xcconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SwiftLintToolBundleConfiguration.xcconfig b/SwiftLintToolBundleConfiguration.xcconfig index 1a8f484d63..d093dea482 100644 --- a/SwiftLintToolBundleConfiguration.xcconfig +++ b/SwiftLintToolBundleConfiguration.xcconfig @@ -25,5 +25,7 @@ SDKROOT = macosx PROVISIONING_PROFILE_SPECIFIER = +CODE_SIGN_IDENTITY = +DEVELOPMENT_TEAM = PRODUCT_BUNDLE_IDENTIFIER = com.duckduckgo.swiftlinttool.bundle GENERATE_INFOPLIST_FILE = YES From 7e8799cfe1a95119dc2762e224a9bf033c256fe7 Mon Sep 17 00:00:00 2001 From: Alexey Martemyanov Date: Thu, 18 Apr 2024 15:50:54 +0600 Subject: [PATCH 3/7] BSK -> 136.0.0; apple-toolbix -> 3.1.1 --- DuckDuckGo.xcodeproj/project.pbxproj | 8 +++--- .../xcshareddata/swiftpm/Package.resolved | 27 +++++++------------ 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index febbd56a30..2f58738bb0 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -10241,8 +10241,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit"; requirement = { - kind = revision; - revision = 94c7c307d4d51806d9b62db35c4f9dee9346c5ab; + kind = exactVersion; + version = 136.0.0; }; }; 9F8FE9472BAE50E50071E372 /* XCRemoteSwiftPackageReference "lottie-spm" */ = { @@ -10257,8 +10257,8 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/duckduckgo/apple-toolbox.git"; requirement = { - kind = revision; - revision = 3c4e94b43a587decdf5d0862c224161298b4bc27; + kind = exactVersion; + version = 3.1.1; }; }; C14882EB27F211A000D59F0C /* XCRemoteSwiftPackageReference "SwiftSoup" */ = { diff --git a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 2b6659c7d1..55a6b55406 100644 --- a/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -5,7 +5,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/duckduckgo/apple-toolbox.git", "state" : { - "revision" : "3c4e94b43a587decdf5d0862c224161298b4bc27" + "revision" : "ab53ca41e9044a20eab7e53249526fadcf9acc9f", + "version" : "3.1.1" } }, { @@ -31,7 +32,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/DuckDuckGo/BrowserServicesKit", "state" : { - "revision" : "94c7c307d4d51806d9b62db35c4f9dee9346c5ab" + "revision" : "7eab61a08c9535b1a8e59c622fe57d33a310a2fc", + "version" : "136.0.0" } }, { @@ -48,8 +50,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/duckduckgo/content-scope-scripts", "state" : { - "revision" : "62d5dc3d02f6a8347dc5f0b52162a0107d38b74c", - "version" : "5.8.0" + "revision" : "1bb3bc5eb565735051f342a87b5405d4374876c7", + "version" : "5.12.0" } }, { @@ -120,8 +122,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/duckduckgo/privacy-dashboard", "state" : { - "revision" : "620921fea14569eb00745cb5a44890d5890d99ec", - "version" : "3.4.0" + "revision" : "14b13d0c3db38f471ce4ba1ecb502ee1986c84d7", + "version" : "3.5.0" } }, { @@ -183,8 +185,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/duckduckgo/TrackerRadarKit", "state" : { - "revision" : "a6b7ba151d9dc6684484f3785293875ec01cc1ff", - "version" : "1.2.2" + "revision" : "6c84fd19139414fc0edbf9673ade06e532a564f0", + "version" : "2.0.0" } }, { @@ -196,15 +198,6 @@ "version" : "1.1.3" } }, - { - "identity" : "xcodeeditor", - "kind" : "remoteSourceControl", - "location" : "https://github.com/appsquickly/XcodeEditor.git", - "state" : { - "branch" : "master", - "revision" : "f3234db7fc40d8e917e169bc937ed03ca76ba885" - } - }, { "identity" : "zipfoundation", "kind" : "remoteSourceControl", From 95c699ec6fc27e4a0e93ca23c38f2fed0c9dd62f Mon Sep 17 00:00:00 2001 From: Alexey Martemyanov Date: Thu, 18 Apr 2024 15:57:18 +0600 Subject: [PATCH 4/7] add PRODUCT_NAME = SwiftLintTool --- SwiftLintToolBundleConfiguration.xcconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/SwiftLintToolBundleConfiguration.xcconfig b/SwiftLintToolBundleConfiguration.xcconfig index d093dea482..f0bfc18d2d 100644 --- a/SwiftLintToolBundleConfiguration.xcconfig +++ b/SwiftLintToolBundleConfiguration.xcconfig @@ -27,5 +27,6 @@ SDKROOT = macosx PROVISIONING_PROFILE_SPECIFIER = CODE_SIGN_IDENTITY = DEVELOPMENT_TEAM = +PRODUCT_NAME = SwiftLintTool PRODUCT_BUNDLE_IDENTIFIER = com.duckduckgo.swiftlinttool.bundle GENERATE_INFOPLIST_FILE = YES From 803eeb435f2cde4274bb322c0cbde482581d3979 Mon Sep 17 00:00:00 2001 From: Alexey Martemyanov Date: Thu, 18 Apr 2024 15:58:39 +0600 Subject: [PATCH 5/7] update pbxproj --- DuckDuckGo.xcodeproj/project.pbxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index 3ca4fa6633..86b31242cd 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -2417,7 +2417,7 @@ B6BA95C428894A28004ABA20 /* BrowsingMenuViewController.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = BrowsingMenuViewController.storyboard; sourceTree = ""; }; B6BA95E728924730004ABA20 /* JSAlertController.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = JSAlertController.storyboard; sourceTree = ""; }; B6CB93E4286445AB0090FEB4 /* Base64DownloadSession.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Base64DownloadSession.swift; sourceTree = ""; }; - B6DFE6CF2BC7E47500A9CE59 /* .bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = .bundle; sourceTree = BUILT_PRODUCTS_DIR; }; + B6DFE6CF2BC7E47500A9CE59 /* .bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; name = .bundle; path = SwiftLintTool.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; B6DFE6D92BC7E61B00A9CE59 /* SwiftLintToolBundleConfiguration.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = SwiftLintToolBundleConfiguration.xcconfig; sourceTree = ""; }; BD15DB842B959CFD00821457 /* BundleExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BundleExtension.swift; sourceTree = ""; }; BD862E022B30DA170073E2EE /* VPNFeedbackFormViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VPNFeedbackFormViewModel.swift; sourceTree = ""; }; From 8ea3ed508b376ca95d0b30412f20d0a99af9e631 Mon Sep 17 00:00:00 2001 From: Alexey Martemyanov Date: Thu, 18 Apr 2024 16:07:43 +0600 Subject: [PATCH 6/7] fix SwiftLintTool.bundle name --- DuckDuckGo.xcodeproj/project.pbxproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj index 86b31242cd..4e5a02029b 100644 --- a/DuckDuckGo.xcodeproj/project.pbxproj +++ b/DuckDuckGo.xcodeproj/project.pbxproj @@ -2417,7 +2417,7 @@ B6BA95C428894A28004ABA20 /* BrowsingMenuViewController.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = BrowsingMenuViewController.storyboard; sourceTree = ""; }; B6BA95E728924730004ABA20 /* JSAlertController.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = JSAlertController.storyboard; sourceTree = ""; }; B6CB93E4286445AB0090FEB4 /* Base64DownloadSession.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Base64DownloadSession.swift; sourceTree = ""; }; - B6DFE6CF2BC7E47500A9CE59 /* .bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; name = .bundle; path = SwiftLintTool.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; + B6DFE6CF2BC7E47500A9CE59 /* SwiftLintTool.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SwiftLintTool.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; B6DFE6D92BC7E61B00A9CE59 /* SwiftLintToolBundleConfiguration.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = SwiftLintToolBundleConfiguration.xcconfig; sourceTree = ""; }; BD15DB842B959CFD00821457 /* BundleExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BundleExtension.swift; sourceTree = ""; }; BD862E022B30DA170073E2EE /* VPNFeedbackFormViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VPNFeedbackFormViewModel.swift; sourceTree = ""; }; @@ -3927,7 +3927,7 @@ 85D33FCB25C97B6E002B91A6 /* IntegrationTests.xctest */, 9825F9D7293F2DE900F220F2 /* PerformanceTests.xctest */, 02025662298818B100E694E7 /* PacketTunnelProvider.appex */, - B6DFE6CF2BC7E47500A9CE59 /* .bundle */, + B6DFE6CF2BC7E47500A9CE59 /* SwiftLintTool.bundle */, ); name = Products; sourceTree = ""; @@ -6078,7 +6078,7 @@ ); name = SwiftLintToolBundle; productName = SwiftLintToolBundle; - productReference = B6DFE6CF2BC7E47500A9CE59 /* .bundle */; + productReference = B6DFE6CF2BC7E47500A9CE59 /* SwiftLintTool.bundle */; productType = "com.apple.product-type.bundle"; }; F143C2E31E4A4CD400CFDE3A /* Core */ = { From 513b38e7025bb0f67b6c3082dfffeb7e88d99d96 Mon Sep 17 00:00:00 2001 From: Alexey Martemyanov Date: Thu, 18 Apr 2024 16:17:11 +0600 Subject: [PATCH 7/7] rollback submodules/privacy-reference-tests --- submodules/privacy-reference-tests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/privacy-reference-tests b/submodules/privacy-reference-tests index 6b7ad1e7f1..a603ff9af2 160000 --- a/submodules/privacy-reference-tests +++ b/submodules/privacy-reference-tests @@ -1 +1 @@ -Subproject commit 6b7ad1e7f15270f9dfeb58a272199f4d57c3eb22 +Subproject commit a603ff9af22ca3ff7ce2e7ffbfe18c447d9f23e8