Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove CocoaPods #23951

Closed
wants to merge 27 commits into from
Closed
Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
d04c009
Run `pod deintegrate` and remove CocoaPods automation
mokagio Jan 6, 2025
73242bf
Add `Makefile` automation to download Gutenberg framework
mokagio Jan 6, 2025
f1dca71
Remove dead reference to `Pods.framework` in project
mokagio Jan 6, 2025
0eb4bf5
Remove dead reference to pods from workspace
mokagio Jan 6, 2025
1035589
Remove SwiftLint-via-CocoaPods from `Rakefile`
mokagio Jan 6, 2025
9f32176
Remove unnecessary `$(inherited)` flag from a couple of targets
mokagio Jan 7, 2025
4af7363
Remove CocoaPods instruction from the README
mokagio Jan 7, 2025
4383c67
Remove SwiftLint instructions from the `README`
mokagio Jan 7, 2025
1d47e96
Add a version of Aztec fetched via SwiftPM
mokagio Jan 7, 2025
2fbd32d
Add Gutenberg XCFrameworks via drag-n-drop from local paths
mokagio Jan 7, 2025
4a29aea
Disable `CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER`
mokagio Jan 7, 2025
fbb0997
Disable `CLANG_WARN_STRICT_PROTOTYPES`
mokagio Jan 7, 2025
785c6cc
Update search path for Gutenberg React Native bundle in script
mokagio Jan 7, 2025
450f968
Remove some leftover bits of CocoaPods set up for automation
mokagio Jan 7, 2025
250711e
Remove leftover `COCOAPODS` precompiler flag
mokagio Jan 7, 2025
8720c7e
Remove a couple of CocoaPods-specific code branches
mokagio Jan 7, 2025
3111efa
Temporarily switch to CI toolkit branch compatible with no CocoaPods
mokagio Jan 7, 2025
80df5af
Fetch XCFrameworks in CI
mokagio Jan 7, 2025
cacf57e
Update Gutenberg checkout logic in localization lint for CP-less setup
mokagio Jan 7, 2025
f3bb122
Update source map upload for CP-less Gutenberg setup
mokagio Jan 7, 2025
13473f9
Ensure `Frameworks` folder exist, otherwise tar will fail
mokagio Jan 7, 2025
8e6ff0f
Remove "Log Outdated Pods" step from code freeze
mokagio Jan 7, 2025
cd6946d
Remove Pods from lists in `.gitignore` and RuboCop
mokagio Jan 7, 2025
56dfbce
Remove imports of Pods xcconfigs
mokagio Jan 7, 2025
89884bd
No longer look in Pods folder to extract localizations
mokagio Jan 7, 2025
b636e16
Link Gutenberg XCFramework in Jetpack target too!
mokagio Jan 7, 2025
c61cb2d
Add instruction in README to run `make dependencies`
mokagio Jan 7, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions .buildkite/commands/build-for-testing.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
25 changes: 0 additions & 25 deletions .buildkite/commands/log-outdated-pods.sh

This file was deleted.

9 changes: 1 addition & 8 deletions .buildkite/commands/prototype-build-jetpack.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 1 addition & 9 deletions .buildkite/commands/prototype-build-wordpress.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 1 addition & 8 deletions .buildkite/commands/release-build-jetpack.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions .buildkite/commands/release-build-wordpress.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
49 changes: 0 additions & 49 deletions .buildkite/commands/run-pod-tests.sh

This file was deleted.

4 changes: 1 addition & 3 deletions .buildkite/commands/run-ui-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 &
Expand Down
4 changes: 1 addition & 3 deletions .buildkite/commands/run-unit-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 12 additions & 0 deletions .buildkite/commands/shared-set-up.sh
Original file line number Diff line number Diff line change
@@ -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
9 changes: 0 additions & 9 deletions .buildkite/release-pipelines/complete-code-freeze.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .buildkite/shared-pipeline-vars
Original file line number Diff line number Diff line change
Expand Up @@ -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="mokagio/bypass-cp-localization-lint"

export IMAGE_ID="xcode-$XCODE_VERSION-macos-14.7.1-v1"
export CI_TOOLKIT_PLUGIN="automattic/a8c-ci-toolkit#$CI_TOOLKIT_PLUGIN_VERSION"
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ $RECYCLE.BIN/

# Project
/Entitlements.plist
Pods/
WordPress.xcworkspace/*.mode1v3
WordPress.xcworkspace/*.mode2v3
WordPress.xcworkspace/*.pbxuser
Expand Down
7 changes: 0 additions & 7 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
AllCops:
Exclude:
- DerivedData/**/*
- Pods/**/*
- vendor/**/*
- WordPressAuthenticator/**/*
- WordPressKit/**/*
Expand All @@ -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

Expand Down
2 changes: 0 additions & 2 deletions Dangerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ rubocop.lint(files: [], force_exclusion: true, inline_comment: true, fail_on_inl

manifest_pr_checker.check_all_manifest_lock_updated

podfile_checker.check_podfile_does_not_have_branch_references

ios_release_checker.check_core_data_model_changed
ios_release_checker.check_release_notes_and_app_store_strings

Expand Down
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

source 'https://rubygems.org'

gem 'cocoapods', '~> 1.16'
gem 'danger-dangermattic', '~> 1.2'
gem 'dotenv'
# 2.223.1 includes a fix for an ASC-interfacing issue
Expand Down
52 changes: 0 additions & 52 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ GEM
tzinfo (~> 2.0, >= 2.0.5)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
artifactory (3.0.17)
ast (2.4.2)
atomos (0.1.3)
Expand Down Expand Up @@ -53,43 +50,6 @@ GEM
cork
nap
open4 (~> 1.3)
cocoapods (1.16.2)
addressable (~> 2.8)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.16.2)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 2.1, < 3.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.6.0, < 2.0)
cocoapods-try (>= 1.1.0, < 2.0)
colored2 (~> 3.1)
escape (~> 0.0.4)
fourflusher (>= 2.3.0, < 3.0)
gh_inspector (~> 1.0)
molinillo (~> 0.8.0)
nap (~> 1.0)
ruby-macho (>= 2.3.0, < 3.0)
xcodeproj (>= 1.27.0, < 2.0)
cocoapods-core (1.16.2)
activesupport (>= 5.0, < 8)
addressable (~> 2.8)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
netrc (~> 0.11)
public_suffix (~> 4.0)
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.5)
cocoapods-downloader (2.1)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.1)
cocoapods-trunk (1.6.0)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
cocoapods-try (1.2.0)
colored (1.2)
colored2 (3.1.2)
commander (4.6.0)
Expand Down Expand Up @@ -130,9 +90,6 @@ GEM
dotenv (2.8.1)
drb (2.2.1)
emoji_regex (3.2.3)
escape (0.0.4)
ethon (0.16.0)
ffi (>= 1.15.0)
excon (0.112.0)
faraday (1.10.4)
faraday-em_http (~> 1.0)
Expand Down Expand Up @@ -229,9 +186,6 @@ GEM
xcodeproj (~> 1.22)
fastlane-sirp (1.0.0)
sysrandom (~> 1.0)
ffi (1.17.0)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
git (1.19.1)
addressable (~> 2.8)
Expand Down Expand Up @@ -293,13 +247,11 @@ GEM
mini_mime (1.1.5)
mini_portile2 (2.8.8)
minitest (5.25.4)
molinillo (0.8.0)
multi_json (1.15.0)
multipart-post (2.4.1)
nanaimo (0.4.0)
nap (1.1.0)
naturally (2.2.1)
netrc (0.11.0)
nkf (0.2.0)
nokogiri (1.17.2)
mini_portile2 (~> 2.8.2)
Expand Down Expand Up @@ -352,7 +304,6 @@ GEM
parser (>= 3.3.1.0)
rubocop-rake (0.6.0)
rubocop (~> 1.0)
ruby-macho (2.5.1)
ruby-progressbar (1.13.0)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
Expand All @@ -378,8 +329,6 @@ GEM
tty-screen (0.8.2)
tty-spinner (0.9.3)
tty-cursor (~> 0.7)
typhoeus (1.4.1)
ethon (>= 0.9.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
uber (0.1.0)
Expand All @@ -401,7 +350,6 @@ PLATFORMS
ruby

DEPENDENCIES
cocoapods (~> 1.16)
danger-dangermattic (~> 1.2)
dotenv
fastlane (~> 2.226)
Expand Down
Loading