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

Update WordPressKit and WordPressAuthentificator setup #23392

Merged
merged 15 commits into from
Jul 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
113 changes: 2 additions & 111 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,6 @@ inhibit_all_warnings!
use_frameworks!
workspace 'WordPress.xcworkspace'

## Pods shared between all the targets
## ===================================
##
def wordpress_shared
pod 'WordPressShared', '~> 2.3', '>= 2.3.1'
# pod 'WordPressShared', git: 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', branch: ''
# pod 'WordPressShared', git: 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', commit: ''
# pod 'WordPressShared', path: '../WordPress-iOS-Shared'
end

def aztec
## When using a tagged version, feel free to comment out the WordPress-Aztec-iOS line below.
## When using a commit number (during development) you should provide the same commit number for both pods.
Expand All @@ -39,14 +29,6 @@ def aztec
pod 'WordPress-Editor-iOS', '~> 1.19.11'
end

def wordpress_ui
pod 'WordPressUI', '~> 1.16'
# pod 'WordPressUI', git: 'https://github.com/wordpress-mobile/WordPressUI-iOS', tag: ''
# pod 'WordPressUI', git: 'https://github.com/wordpress-mobile/WordPressUI-iOS', branch: ''
# pod 'WordPressUI', git: 'https://github.com/wordpress-mobile/WordPressUI-iOS', commit: ''
# pod 'WordPressUI', path: '../WordPressUI-iOS'
end

def gravatar
# pod 'Gravatar', path: '../Gravatar-SDK-iOS'
# pod 'GravatarUI', path: '../Gravatar-SDK-iOS'
Expand All @@ -56,29 +38,9 @@ def gravatar
pod 'GravatarUI', '2.0.0'
end

def shared_with_all_pods
wordpress_shared
end

def shared_test_pods
pod 'Expecta', '1.0.6'
pod 'Specta', '1.0.7'
gutenberg_pod
end

def shared_with_extension_pods
# The PrivacyInfo in this library is incorrectly copied to the app bundle's root directory.
# That conflicts with the our own app's PrivacyInfo. We can update this library once the
# issue is resolved.
# See https://github.com/weichsel/ZIPFoundation/pull/314
end

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

shared_with_all_pods
shared_with_extension_pods

## Gutenberg (React Native)
## =====================
##
Expand All @@ -99,7 +61,6 @@ abstract_target 'Apps' do
## Automattic libraries
## ====================
##
wordpress_shared
gravatar

# Production
Expand All @@ -109,7 +70,6 @@ abstract_target 'Apps' do
# pod 'MediaEditor', path: '../MediaEditor-iOS'

aztec
wordpress_ui

## WordPress App iOS
## =================
Expand All @@ -118,7 +78,7 @@ abstract_target 'Apps' do
target 'WordPressTest' do
inherit! :search_paths

shared_test_pods
gutenberg_pod
end
end

Expand All @@ -134,21 +94,13 @@ end
target 'WordPressShareExtension' do
project 'WordPress/WordPress.xcodeproj'

shared_with_extension_pods

aztec
shared_with_all_pods
wordpress_ui
end

target 'JetpackShareExtension' do
project 'WordPress/WordPress.xcodeproj'

shared_with_extension_pods

aztec
shared_with_all_pods
wordpress_ui
end

## DraftAction Extension
Expand All @@ -157,74 +109,13 @@ end
target 'WordPressDraftActionExtension' do
project 'WordPress/WordPress.xcodeproj'

shared_with_extension_pods

aztec
shared_with_all_pods
wordpress_ui
end

target 'JetpackDraftActionExtension' do
project 'WordPress/WordPress.xcodeproj'

shared_with_extension_pods

aztec
shared_with_all_pods
wordpress_ui
end

## Widgets
## ============
##

target 'JetpackStatsWidgets' do
project 'WordPress/WordPress.xcodeproj'

shared_with_all_pods
wordpress_ui
end

## Intents
## ============
##

target 'JetpackIntents' do
project 'WordPress/WordPress.xcodeproj'

shared_with_all_pods
wordpress_ui
end

## Notification Service Extension
## ==============================
##
target 'WordPressNotificationServiceExtension' do
project 'WordPress/WordPress.xcodeproj'

wordpress_shared
wordpress_ui
end

target 'JetpackNotificationServiceExtension' do
project 'WordPress/WordPress.xcodeproj'

wordpress_shared
wordpress_ui
end

## Screenshot Generation
## ===================
##
target 'WordPressScreenshotGeneration' do
project 'WordPress/WordPress.xcodeproj'
end

## UI Tests
## ===================
##
target 'WordPressUITests' do
project 'WordPress/WordPress.xcodeproj'
end

## Tools
Expand All @@ -248,7 +139,7 @@ end
# 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 WordPressShared WordPressUI]
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]
Expand Down
18 changes: 1 addition & 17 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10,52 +10,40 @@ PODS:
- AppCenter/Distribute (5.0.4):
- AppCenter/Core
- CropViewController (2.5.3)
- Expecta (1.0.6)
- 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)
- Specta (1.0.7)
- SwiftLint (0.54.0)
- WordPress-Aztec-iOS (1.19.11)
- WordPress-Editor-iOS (1.19.11):
- WordPress-Aztec-iOS (= 1.19.11)
- WordPressShared (2.4.0)
- WordPressUI (1.16.0)

DEPENDENCIES:
- AppCenter (~> 5.0)
- AppCenter/Distribute (~> 5.0)
- CropViewController (= 2.5.3)
- Expecta (= 1.0.6)
- 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)
- Specta (= 1.0.7)
- SwiftLint (= 0.54.0)
- WordPress-Editor-iOS (~> 1.19.11)
- WordPressShared (>= 2.3.1, ~> 2.3)
- WordPressUI (~> 1.16)

SPEC REPOS:
https://github.com/wordpress-mobile/cocoapods-specs.git:
- WordPress-Aztec-iOS
- WordPress-Editor-iOS
- WordPressShared
- WordPressUI
trunk:
- AppCenter
- CropViewController
- Expecta
- Gravatar
- GravatarUI
- MediaEditor
- Specta
- SwiftLint

EXTERNAL SOURCES:
Expand All @@ -73,19 +61,15 @@ CHECKOUT OPTIONS:
SPEC CHECKSUMS:
AppCenter: 85c92db0759d2792a65eb61d6842d2e86611a49a
CropViewController: a5c143548a0fabcd6cc25f2d26e40460cfb8c78c
Expecta: 3b6bd90a64b9a1dcb0b70aa0e10a7f8f631667d5
FSInteractiveMap: a396f610f48b76cb540baa87139d056429abda86
Gravatar: 54fc63ea6298e9afca7329007815be25868f1dfe
GravatarUI: bb5e03cda2da61e54aa1c20d4dde32b7153fa8b4
Gutenberg: 0699e7dd207afb591ccd5e81252a92e6e7781391
MediaEditor: d08314cfcbfac74361071a306b4bc3a39b3356ae
Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66
SwiftLint: c1de071d9d08c8aba837545f6254315bc900e211
WordPress-Aztec-iOS: 3732c6d865a5c9f35788377bdeda8a80ea10d0a1
WordPress-Editor-iOS: 453345420ced3d3ef20f0051b3df46ff10281e0c
WordPressShared: 0160364ed24f4d67fed4e85003fefa837faad84f
WordPressUI: f883fdd2508a0bc525c19805b2bbae980b581271

PODFILE CHECKSUM: 2c4301332e4759f1e2cf52493c97c0c95207b1a0
PODFILE CHECKSUM: 3f613d671323ac233553cfced32e6931b915bdc8

COCOAPODS: 1.15.2

This file was deleted.

This file was deleted.

Loading