Merge branch 'main' into release/1.69.0

.github/workflows/pr.yml

@@ -24,7 +24,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: SwiftLint
-        uses: docker://norionomura/swiftlint:0.53.0
+        uses: docker://norionomura/swiftlint:0.54.0
         with:
           args: swiftlint --reporter github-actions-logging --strict
 
@@ -133,6 +133,7 @@ jobs:
           -scheme "${{ matrix.scheme }}" \
           -derivedDataPath "DerivedData" \
           -configuration "CI" \
+          -skipPackagePluginValidation \
           ENABLE_TESTABILITY=true \
           ONLY_ACTIVE_ARCH=${{ matrix.active-arch }} \
           "-skip-testing:${{ matrix.integration-tests-target }}" \
@@ -146,6 +147,7 @@ jobs:
           -scheme "${{ matrix.scheme }}" \
           -derivedDataPath "DerivedData" \
           -configuration "CI" \
+          -skipPackagePluginValidation \
           ENABLE_TESTABILITY=true \
           ONLY_ACTIVE_ARCH=${{ matrix.active-arch }} \
           "-only-testing:${{ matrix.integration-tests-target }}" \
@@ -320,6 +322,7 @@ jobs:
           -scheme "${{ matrix.scheme }}" \
           -derivedDataPath "DerivedData" \
           -configuration "Release" \
+          -skipPackagePluginValidation \
           | tee release-xcodebuild.log \
           | xcbeautify
 

.swiftlint.yml

@@ -1,3 +1,5 @@
+allow_zero_lintable_files: true
+
 disabled_rules:
   - no_space_in_method_call
   - multiple_closures_with_trailing_closure
@@ -9,9 +11,12 @@ disabled_rules:
   - implicit_getter
   - function_parameter_count
   - trailing_comma
+  - nesting
+  - opening_brace
 
 opt_in_rules:
   - file_header
+  - explicit_init
 
 custom_rules:
   explicit_non_final_class:
@@ -41,15 +46,13 @@ file_length:
 type_body_length:
   warning: 500
   error: 500
-nesting:
-  type_level: 2
 large_tuple:
   warning: 4
   error: 5
 file_header:
   required_pattern: |
                     \/\/
-                    \/\/  .*?\.swift
+                    \/\/  SWIFTLINT_CURRENT_FILENAME
                     \/\/
                     \/\/  Copyright © \d{4} DuckDuckGo\. All rights reserved\.
                     \/\/
@@ -69,11 +72,8 @@ file_header:
 # General Config
 excluded:
   - DuckDuckGo/Common/Localizables/UserText.swift
-  - UnitTests
-  - IntegrationTests
   - LocalPackages/*/Package.swift
   - release
-  - UITests
   - vendor
   - DerivedData
   - .ruby-lsp

Configuration/Global.xcconfig

@@ -101,3 +101,10 @@ DDG_SLOW_COMPILE_CHECK_THRESHOLD[config=CI] = 250
 DDG_SLOW_COMPILE_CHECK = -Xfrontend -warn-long-expression-type-checking=$(DDG_SLOW_COMPILE_CHECK_THRESHOLD) -Xfrontend -warn-long-function-bodies=$(DDG_SLOW_COMPILE_CHECK_THRESHOLD)
 OTHER_SWIFT_FLAGS[config=Debug][arch=*][sdk=*] = $(inherited) $(DDG_SLOW_COMPILE_CHECK)
 OTHER_SWIFT_FLAGS[config=CI][arch=*][sdk=*] = $(inherited) $(DDG_SLOW_COMPILE_CHECK)
+
+// Automatically generate Color and Image asset accessor extensions
+ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES
+
+// Automatically generate localization string catalogs
+LOCALIZATION_PREFERS_STRING_CATALOGS = YES
+SWIFT_EMIT_LOC_STRINGS = YES

Configuration/UITests/SyncE2EUITests.xcconfig

@@ -0,0 +1,36 @@
+//  Copyright © 2022 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.
+//
+
+#include "../Common.xcconfig"
+
+CODE_SIGN_IDENTITY[config=CI][sdk=macosx*] =
+CODE_SIGN_STYLE[config=CI][sdk=macosx*] = Manual
+CODE_SIGNING_ALLOWED[config=CI][sdk=macosx*] = NO
+COPY_PHASE_STRIP = NO
+DEAD_CODE_STRIPPING = YES
+DEVELOPMENT_TEAM[config=CI][sdk=macosx*] =
+ENABLE_USER_SCRIPT_SANDBOXING = YES
+GCC_NO_COMMON_BLOCKS = YES
+GENERATE_INFOPLIST_FILE = YES
+LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks
+LOCALIZATION_PREFERS_STRING_CATALOGS = YES
+
+MACOSX_DEPLOYMENT_TARGET = 11.4
+
+PRODUCT_BUNDLE_IDENTIFIER = com.duckduckgo.SyncE2EUITests
+PRODUCT_NAME = $(TARGET_NAME)
+PROVISIONING_PROFILE_SPECIFIER[config=CI][sdk=macosx*] =
+SWIFT_EMIT_LOC_STRINGS = NO
+TEST_TARGET_NAME = DuckDuckGo Privacy Browser

Configuration/UITests/SyncE2EUITestsAppStore.xcconfig

@@ -0,0 +1,36 @@
+//  Copyright © 2022 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.
+//
+
+#include "../Common.xcconfig"
+
+CODE_SIGN_IDENTITY[config=CI][sdk=macosx*] =
+CODE_SIGN_STYLE[config=CI][sdk=macosx*] = Manual
+CODE_SIGNING_ALLOWED[config=CI][sdk=macosx*] = NO
+COPY_PHASE_STRIP = NO
+DEAD_CODE_STRIPPING = YES
+DEVELOPMENT_TEAM[config=CI][sdk=macosx*] =
+ENABLE_USER_SCRIPT_SANDBOXING = YES
+GCC_NO_COMMON_BLOCKS = YES
+GENERATE_INFOPLIST_FILE = YES
+LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/../Frameworks @loader_path/../Frameworks
+LOCALIZATION_PREFERS_STRING_CATALOGS = YES
+
+MACOSX_DEPLOYMENT_TARGET = 11.4
+
+PRODUCT_BUNDLE_IDENTIFIER = com.duckduckgo.SyncE2EUITestsAppStore
+PRODUCT_NAME = $(TARGET_NAME)
+PROVISIONING_PROFILE_SPECIFIER[config=CI][sdk=macosx*] =
+SWIFT_EMIT_LOC_STRINGS = NO
+TEST_TARGET_NAME = DuckDuckGo Privacy Browser App Store