Set up SwiftLint as a standalone build plugin

.buildkite/commands/build-for-testing.sh

@@ -11,11 +11,7 @@ echo "--- :beer: Installing Homebrew Dependencies"
 brew tap FelixHerrmann/tap
 brew install swift-package-list
 
-echo "--- :rubygems: Setting up Gems"
-install_gems
-
-echo "--- :cocoapods: Setting up Pods"
-install_cocoapods
+"$(dirname "${BASH_SOURCE[0]}")/shared-set-up.sh"
 
 echo "--- :writing_hand: Copy Files"
 mkdir -pv ~/.configure/wordpress-ios/secrets
@@ -24,9 +20,6 @@ cp -v fastlane/env/project.env-example ~/.configure/wordpress-ios/secrets/projec
 echo "--- :closed_lock_with_key: Installing Secrets"
 bundle exec fastlane run configure_apply
 
-echo "--- :swift: Setting up Swift Packages"
-install_swiftpm_dependencies
-
 echo "--- :hammer_and_wrench: Building"
 bundle exec fastlane build_${APP}_for_testing
 

.buildkite/commands/prototype-build-jetpack.sh

@@ -8,17 +8,10 @@ brew upgrade sentry-cli
 brew tap FelixHerrmann/tap
 brew install swift-package-list
 
-echo "--- :rubygems: Setting up Gems"
-install_gems
-
-echo "--- :cocoapods: Setting up Pods"
-install_cocoapods
+"$(dirname "${BASH_SOURCE[0]}")/shared-set-up.sh"
 
 echo "--- :closed_lock_with_key: Installing Secrets"
 bundle exec fastlane run configure_apply
 
-echo "--- :swift: Setting up Swift Packages"
-install_swiftpm_dependencies
-
 echo "--- :hammer_and_wrench: Building"
 bundle exec fastlane build_and_upload_jetpack_prototype_build

.buildkite/commands/prototype-build-wordpress.sh

@@ -7,18 +7,10 @@ brew upgrade sentry-cli
 brew tap FelixHerrmann/tap
 brew install swift-package-list
 
-
-echo "--- :rubygems: Setting up Gems"
-install_gems
-
-echo "--- :cocoapods: Setting up Pods"
-install_cocoapods
+"$(dirname "${BASH_SOURCE[0]}")/shared-set-up.sh"
 
 echo "--- :closed_lock_with_key: Installing Secrets"
 bundle exec fastlane run configure_apply
 
-echo "--- :swift: Setting up Swift Packages"
-install_swiftpm_dependencies
-
 echo "--- :hammer_and_wrench: Building"
 bundle exec fastlane build_and_upload_wordpress_prototype_build

.buildkite/commands/release-build-jetpack.sh

@@ -10,14 +10,7 @@ brew install swift-package-list
 brew install imagemagick
 brew install ghostscript
 
-echo "--- :rubygems: Setting up Gems"
-install_gems
-
-echo "--- :cocoapods: Setting up Pods"
-install_cocoapods
-
-echo "--- :swift: Setting up Swift Packages"
-install_swiftpm_dependencies
+"$(dirname "${BASH_SOURCE[0]}")/shared-set-up.sh"
 
 echo "--- :closed_lock_with_key: Installing Secrets"
 bundle exec fastlane run configure_apply

.buildkite/commands/release-build-wordpress.sh

@@ -13,9 +13,6 @@ brew install ghostscript
 echo "--- :rubygems: Setting up Gems"
 install_gems
 
-echo "--- :cocoapods: Setting up Pods"
-install_cocoapods
-
 echo "--- :swift: Setting up Swift Packages"
 install_swiftpm_dependencies
 

.buildkite/commands/run-ui-tests.sh

@@ -18,12 +18,10 @@ echo "--- 📦 Downloading Build Artifacts"
 download_artifact build-products-jetpack.tar
 tar -xf build-products-jetpack.tar
 
+# Only the gems are needed here, given we run the tests on a pre-built binary
 echo "--- :rubygems: Setting up Gems"
 install_gems
 
-echo "--- :swift: Setting up Swift Packages"
-install_swiftpm_dependencies
-
 echo "--- 🔬 Testing"
 xcrun simctl list >> /dev/null
 rake mocks &

.buildkite/commands/run-unit-tests.sh

@@ -8,12 +8,10 @@ echo "--- 📦 Downloading Build Artifacts"
 download_artifact build-products-wordpress.tar
 tar -xf build-products-wordpress.tar
 
+# Only the gems are needed here, given we run the tests on a pre-built binary
 echo "--- :rubygems: Setting up Gems"
 install_gems
 
-echo "--- :swift: Setting up Swift Packages"
-install_swiftpm_dependencies
-
 echo "--- 🔬 Testing"
 set +e
 bundle exec fastlane test_without_building name:WordPressUnitTests

.buildkite/commands/shared-set-up.sh

@@ -0,0 +1,12 @@
+#!/bin/bash -eu
+
+echo "--- :rubygems: Setting up Gems"
+install_gems
+
+echo "--- :swift: Setting up Swift Packages"
+install_swiftpm_dependencies
+
+echo "--- :xcode: Fetch XCFrameworks"
+pushd WordPress
+make dependencies
+popd

.buildkite/release-pipelines/complete-code-freeze.yml

@@ -17,12 +17,3 @@ steps:
       manual:
         # If those jobs fail, one should always prefer re-triggering a new build from ReleaseV2 rather than retrying the individual job from Buildkite
         allowed: false
-
-  - label: Log Outdated Pods
-    depends_on: complete_code_freeze
-    plugins: [$CI_TOOLKIT_PLUGIN]
-    command: .buildkite/commands/log-outdated-pods.sh "$RELEASE_VERSION"
-    retry:
-      manual:
-        # If those jobs fail, one should always prefer re-triggering a new build from ReleaseV2 rather than retrying the individual job from Buildkite
-        allowed: false

.buildkite/shared-pipeline-vars

@@ -5,7 +5,7 @@
 
 # The ~> modifier is not currently used, but we check for it just in case
 XCODE_VERSION=$(sed -E 's/^~> ?//' .xcode-version)
-CI_TOOLKIT_PLUGIN_VERSION="3.7.1"
+CI_TOOLKIT_PLUGIN_VERSION="3.8.0"
 
 export IMAGE_ID="xcode-$XCODE_VERSION-macos-14.7.1-v1"
 export CI_TOOLKIT_PLUGIN="automattic/a8c-ci-toolkit#$CI_TOOLKIT_PLUGIN_VERSION"

.gitignore

@@ -36,7 +36,6 @@ $RECYCLE.BIN/
 
 # Project
 /Entitlements.plist
-Pods/
 WordPress.xcworkspace/*.mode1v3
 WordPress.xcworkspace/*.mode2v3
 WordPress.xcworkspace/*.pbxuser

.rubocop.yml

@@ -1,7 +1,6 @@
 AllCops:
   Exclude:
     - DerivedData/**/*
-    - Pods/**/*
     - vendor/**/*
     - WordPressAuthenticator/**/*
     - WordPressKit/**/*
@@ -26,12 +25,6 @@ Layout/LineLength:
 Layout/EmptyLines:
   Exclude: *xfiles
 
-Style/MutableConstant:
-  Exclude:
-    # CocoaPods mutates some input values.
-    # It's simpler to relax this rule than to address each individually by passing mutable copies.
-    - Gutenberg/cocoapods_helpers.rb
-
 Style/AsciiComments:
   Exclude: *xfiles
 

.swiftlint.yml

@@ -1,24 +1,121 @@
-swiftlint_version: 0.54.0
-
-parent_config: https://raw.githubusercontent.com/Automattic/swiftlint-config/0f8ab6388bd8d15a04391825ab125f80cfb90704/.swiftlint.yml
-remote_timeout: 10.0
+swiftlint_version: 0.58.2
 
 excluded:
   - Modules/.build
+  - BuildTools/.build
+  - DerivedData
+  - WordPress/DerivedData
+  - fastlane
+  - Pods
+  - Scripts
+  # Automattic's CI caching setup may generate this in the project folder
+  - Users/builder/Library/Caches/CocoaPods/Pods
+  - vendor
+
+# Rules – Opt-in only, so we can progressively introduce new ones
+#
+only_rules:
+  # Colons should be next to the identifier when specifying a type.
+  - colon
+
+  # There should be no space before and one after any comma.
+  - comma
+
+  # if,for,while,do statements shouldn't wrap their conditionals in parentheses.
+  - control_statement
+
+  # Allow custom rules. See the end of the config for our custom rules
+  - custom_rules
 
-opt_in_rules:
   - discarded_notification_center_observer
+
   - duplicate_imports
+
+  # Arguments can be omitted when matching enums with associated types if they
+  # are not used.
+  - empty_enum_arguments
+
+  # Prefer `() -> ` over `Void -> `.
+  - empty_parameters
+
+  # MARK comment should be in valid format.
+  - mark
+
+  # Opening braces should be preceded by a single space and on the same line as
+  # the declaration.
+  - opening_brace
+
   - overridden_super_call
+
   - shorthand_optional_binding
+
+  # Files should have a single trailing newline.
+  - trailing_newline
+
+  # Lines should not have trailing semicolons.
+  - trailing_semicolon
+
+  # Lines should not have trailing whitespace.
+  - trailing_whitespace
+
   - vertical_whitespace
+
   - weak_delegate
 
-overridden_super_call:
+# Rules configuration
+#
+control_statement:
   severity: error
 
 discarded_notification_center_observer:
   severity: error
 
+overridden_super_call:
+  severity: error
+
+trailing_whitespace:
+  ignores_empty_lines: false
+  ignores_comments: false
+
 weak_delegate:
   severity: error
+
+# Custom rules
+#
+custom_rules:
+  natural_content_alignment:
+    name: "Natural Content Alignment"
+    regex: '\.contentHorizontalAlignment(\s*)=(\s*)(\.left|\.right)'
+    message: "Forcing content alignment left or right can affect the Right-to-Left layout. Use naturalContentHorizontalAlignment instead."
+    severity: warning
+
+  natural_text_alignment:
+    name: "Natural Text Alignment"
+    regex: '\.textAlignment(\s*)=(\s*).left'
+    message: "Forcing text alignment to left can affect the Right-to-Left layout. Consider setting it to `natural`"
+    severity: warning
+
+  inverse_text_alignment:
+    name: "Inverse Text Alignment"
+    regex: '\.textAlignment(\s*)=(\s*).right'
+    message: "When forcing text alignment to the right, be sure to handle the Right-to-Left layout case properly, and then silence this warning with this line `// swiftlint:disable:next inverse_text_alignment`"
+    severity: warning
+
+  localization_comment:
+    name: "Localization Comment"
+    regex: 'NSLocalizedString([^,]+,\s+comment:\s*"")'
+    message: "Localized strings should include a description giving context for how the string is used."
+    severity: warning
+
+  string_interpolation_in_localized_string:
+    name: "String Interpolation in Localized String"
+    regex: 'NSLocalizedString\("[^"]*\\\(\S*\)'
+    message: "Localized strings must not use interpolated variables. Instead, use `String(format:`"
+    severity: error
+
+  swiftui_localization:
+    name: "SwiftUI Localization"
+    regex: 'LocalizedStringKey'
+    message: "Using `LocalizedStringKey` is incompatible with our tooling and doesn't allow you to provide a hint/context comment for translators either. Please use `NSLocalizedString` instead, even with SwiftUI code."
+    severity: error
+    excluded: '.*Widgets/.*'

BuildTools/.gitignore

@@ -0,0 +1 @@
+.build

BuildTools/Empty.swift

@@ -0,0 +1,2 @@
+// Here only to satisfy SwiftPM requirement.
+// See https://github.com/nicklockwood/SwiftFormat#1-create-a-buildtools-folder-and-packageswift