Skip to content

Move more pods to SPM #23395

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Jul 5, 2024
Merged

Move more pods to SPM #23395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e4c598b
Install MediaEditor using SPM
kean Jun 28, 2024
0eb5f47
Link Aztec dynamically
kean Jun 28, 2024
0974ae9
Install Gravatar using SPM
kean Jul 2, 2024
9ffd18c
Install FSInteractiveMap using CocoaPods
kean Jul 2, 2024
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
53 changes: 0 additions & 53 deletions Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,6 @@ def aztec
pod 'WordPress-Editor-iOS', '~> 1.19.11'
end

def gravatar
# pod 'Gravatar', path: '../Gravatar-SDK-iOS'
# pod 'GravatarUI', path: '../Gravatar-SDK-iOS'
# pod 'Gravatar', git: 'https://github.com/Automattic/Gravatar-SDK-iOS', commit: ''
# pod 'GravatarUI', git: 'https://github.com/Automattic/Gravatar-SDK-iOS', commit: ''
pod 'Gravatar', '2.0.0'
pod 'GravatarUI', '2.0.0'
end

abstract_target 'Apps' do
project 'WordPress/WordPress.xcodeproj'

Expand All @@ -55,20 +46,9 @@ abstract_target 'Apps' do
pod 'AppCenter', app_center_version, configurations: app_center_configurations
pod 'AppCenter/Distribute', app_center_version, configurations: app_center_configurations

pod 'FSInteractiveMap', git: 'https://github.com/wordpress-mobile/FSInteractiveMap.git', tag: '0.2.0'
pod 'CropViewController', '2.5.3'

## Automattic libraries
## ====================
##
gravatar

# Production

pod 'MediaEditor', '~> 1.2', '>= 1.2.2'
# pod 'MediaEditor', git: 'https://github.com/wordpress-mobile/MediaEditor-iOS.git', commit: ''
# pod 'MediaEditor', path: '../MediaEditor-iOS'

aztec

## WordPress App iOS
Expand Down Expand Up @@ -132,39 +112,6 @@ abstract_target 'Tools' do
pod 'SwiftLint', swiftlint_version
end

# Static Frameworks:
# ============
#
# Make all pods that are not shared across multiple targets into static frameworks by overriding the static_framework? function to return true
# Linking the shared frameworks statically would lead to duplicate symbols
# A future version of CocoaPods may make this easier to do. See https://github.com/CocoaPods/CocoaPods/issues/7428
shared_targets = %w[WordPressFlux]
dyanmic_framework_pods = %w[WordPressFlux]
# Statically linking Sentry results in a conflict with `NSDictionary.objectAtKeyPath`, but dynamically
# linking it resolves this.
dyanmic_framework_pods += %w[Sentry SentryPrivate]
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The only thing it was affecting – likely unintentionally – is Aztec that was linked statically six targets: apps, and share and draft extensions, increasing the app size. It's not included as a dynamic framework, reducing the app size.

Note: Aztec is also linked statically in Gutenberg, but that's fine and doesn't cause any linker issues.

pre_install do |installer|
static = []
dynamic = []
installer.pod_targets.each do |pod|
use_dynamic_frameworks = false
use_dynamic_frameworks = true if dyanmic_framework_pods.include? pod.name

# If this pod is a dependency of one of our shared targets, it must be linked dynamically
use_dynamic_frameworks = true if pod.target_definitions.any? { |t| shared_targets.include? t.name }

if use_dynamic_frameworks
dynamic << pod
pod.instance_variable_set(:@build_type, Pod::BuildType.dynamic_framework)
else
static << pod
pod.instance_variable_set(:@build_type, Pod::BuildType.static_framework)
end
end
puts "Installing #{static.count} pods as static frameworks"
puts "Installing #{dynamic.count} pods as dynamic frameworks"
end

post_install do |installer|
gutenberg_post_install(installer: installer)

Expand Down
31 changes: 1 addition & 30 deletions Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,7 @@ PODS:
- AppCenter/Core
- AppCenter/Distribute (5.0.4):
- AppCenter/Core
- CropViewController (2.5.3)
- FSInteractiveMap (0.1.0)
- Gravatar (2.0.0)
- GravatarUI (2.0.0):
- Gravatar (= 2.0.0)
- Gutenberg (1.120.1)
- MediaEditor (1.2.2):
- CropViewController (~> 2.5.3)
- SwiftLint (0.54.0)
- WordPress-Aztec-iOS (1.19.11)
- WordPress-Editor-iOS (1.19.11):
Expand All @@ -25,12 +18,7 @@ PODS:
DEPENDENCIES:
- AppCenter (~> 5.0)
- AppCenter/Distribute (~> 5.0)
- CropViewController (= 2.5.3)
- FSInteractiveMap (from `https://github.com/wordpress-mobile/FSInteractiveMap.git`, tag `0.2.0`)
- Gravatar (= 2.0.0)
- GravatarUI (= 2.0.0)
- Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.120.1.podspec`)
- MediaEditor (>= 1.2.2, ~> 1.2)
- SwiftLint (= 0.54.0)
- WordPress-Editor-iOS (~> 1.19.11)

Expand All @@ -40,36 +28,19 @@ SPEC REPOS:
- WordPress-Editor-iOS
trunk:
- AppCenter
- CropViewController
- Gravatar
- GravatarUI
- MediaEditor
- SwiftLint

EXTERNAL SOURCES:
FSInteractiveMap:
:git: https://github.com/wordpress-mobile/FSInteractiveMap.git
:tag: 0.2.0
Gutenberg:
:podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.120.1.podspec

CHECKOUT OPTIONS:
FSInteractiveMap:
:git: https://github.com/wordpress-mobile/FSInteractiveMap.git
:tag: 0.2.0

SPEC CHECKSUMS:
AppCenter: 85c92db0759d2792a65eb61d6842d2e86611a49a
CropViewController: a5c143548a0fabcd6cc25f2d26e40460cfb8c78c
FSInteractiveMap: a396f610f48b76cb540baa87139d056429abda86
Gravatar: 54fc63ea6298e9afca7329007815be25868f1dfe
GravatarUI: bb5e03cda2da61e54aa1c20d4dde32b7153fa8b4
Gutenberg: 0699e7dd207afb591ccd5e81252a92e6e7781391
MediaEditor: d08314cfcbfac74361071a306b4bc3a39b3356ae
SwiftLint: c1de071d9d08c8aba837545f6254315bc900e211
WordPress-Aztec-iOS: 3732c6d865a5c9f35788377bdeda8a80ea10d0a1
WordPress-Editor-iOS: 453345420ced3d3ef20f0051b3df46ff10281e0c

PODFILE CHECKSUM: 3f613d671323ac233553cfced32e6931b915bdc8
PODFILE CHECKSUM: 12f9ac933ee5c704604bf92375b97c4b6c04a8f3

COCOAPODS: 1.15.2
36 changes: 36 additions & 0 deletions WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion WordPress/Classes/ViewRelated/Me/Views/Header/MeHeaderView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#import "MeHeaderView.h"
#import "Blog.h"
#import "WordPress-Swift.h"
#import "Gravatar-Swift.h"

@import WordPressShared;
@import Gravatar;

const CGFloat MeHeaderViewHeight = 154;
const CGFloat MeHeaderViewGravatarSize = 64.0;
Expand Down
Loading