Skip to content

Commit 1cf0af0

Browse files
authored
Update WordPressKit and WordPressAuthentificator setup (#23392)
* Install WordPressUI using SPM * Remove WordPressShared from Podfile * Add WordPressShared using SPM * Fix WordPress compilation * Fix WordPressKit being embeded in the wrong targets * Disable some warnings in WordPressKit * Remove redundant manual linker flags * Fix WordPressKit tests * Fix WordPressAuthentificator tests * Remove Specta and Expecta from Podfile * Fix WordPressAuthentificator tests by temporary disabling LoginFacadeTests * Update WordPressAuthenticator so that it could be compliled as an ObjC module again * Rewrite LoginFacadeTests * Fix WordPressTests * Add missing executable_path/../../Frameworks in the share extensions
1 parent 9d965d0 commit 1cf0af0

File tree

155 files changed

+818
-1543
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+818
-1543
lines changed

Podfile

Lines changed: 2 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,6 @@ inhibit_all_warnings!
1919
use_frameworks!
2020
workspace 'WordPress.xcworkspace'
2121

22-
## Pods shared between all the targets
23-
## ===================================
24-
##
25-
def wordpress_shared
26-
pod 'WordPressShared', '~> 2.3', '>= 2.3.1'
27-
# pod 'WordPressShared', git: 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', branch: ''
28-
# pod 'WordPressShared', git: 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', commit: ''
29-
# pod 'WordPressShared', path: '../WordPress-iOS-Shared'
30-
end
31-
3222
def aztec
3323
## When using a tagged version, feel free to comment out the WordPress-Aztec-iOS line below.
3424
## When using a commit number (during development) you should provide the same commit number for both pods.
@@ -39,14 +29,6 @@ def aztec
3929
pod 'WordPress-Editor-iOS', '~> 1.19.11'
4030
end
4131

42-
def wordpress_ui
43-
pod 'WordPressUI', '~> 1.16'
44-
# pod 'WordPressUI', git: 'https://github.com/wordpress-mobile/WordPressUI-iOS', tag: ''
45-
# pod 'WordPressUI', git: 'https://github.com/wordpress-mobile/WordPressUI-iOS', branch: ''
46-
# pod 'WordPressUI', git: 'https://github.com/wordpress-mobile/WordPressUI-iOS', commit: ''
47-
# pod 'WordPressUI', path: '../WordPressUI-iOS'
48-
end
49-
5032
def gravatar
5133
# pod 'Gravatar', path: '../Gravatar-SDK-iOS'
5234
# pod 'GravatarUI', path: '../Gravatar-SDK-iOS'
@@ -56,29 +38,9 @@ def gravatar
5638
pod 'GravatarUI', '2.0.0'
5739
end
5840

59-
def shared_with_all_pods
60-
wordpress_shared
61-
end
62-
63-
def shared_test_pods
64-
pod 'Expecta', '1.0.6'
65-
pod 'Specta', '1.0.7'
66-
gutenberg_pod
67-
end
68-
69-
def shared_with_extension_pods
70-
# The PrivacyInfo in this library is incorrectly copied to the app bundle's root directory.
71-
# That conflicts with the our own app's PrivacyInfo. We can update this library once the
72-
# issue is resolved.
73-
# See https://github.com/weichsel/ZIPFoundation/pull/314
74-
end
75-
7641
abstract_target 'Apps' do
7742
project 'WordPress/WordPress.xcodeproj'
7843

79-
shared_with_all_pods
80-
shared_with_extension_pods
81-
8244
## Gutenberg (React Native)
8345
## =====================
8446
##
@@ -99,7 +61,6 @@ abstract_target 'Apps' do
9961
## Automattic libraries
10062
## ====================
10163
##
102-
wordpress_shared
10364
gravatar
10465

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

11172
aztec
112-
wordpress_ui
11373

11474
## WordPress App iOS
11575
## =================
@@ -118,7 +78,7 @@ abstract_target 'Apps' do
11878
target 'WordPressTest' do
11979
inherit! :search_paths
12080

121-
shared_test_pods
81+
gutenberg_pod
12282
end
12383
end
12484

@@ -134,21 +94,13 @@ end
13494
target 'WordPressShareExtension' do
13595
project 'WordPress/WordPress.xcodeproj'
13696

137-
shared_with_extension_pods
138-
13997
aztec
140-
shared_with_all_pods
141-
wordpress_ui
14298
end
14399

144100
target 'JetpackShareExtension' do
145101
project 'WordPress/WordPress.xcodeproj'
146102

147-
shared_with_extension_pods
148-
149103
aztec
150-
shared_with_all_pods
151-
wordpress_ui
152104
end
153105

154106
## DraftAction Extension
@@ -157,74 +109,13 @@ end
157109
target 'WordPressDraftActionExtension' do
158110
project 'WordPress/WordPress.xcodeproj'
159111

160-
shared_with_extension_pods
161-
162112
aztec
163-
shared_with_all_pods
164-
wordpress_ui
165113
end
166114

167115
target 'JetpackDraftActionExtension' do
168116
project 'WordPress/WordPress.xcodeproj'
169117

170-
shared_with_extension_pods
171-
172118
aztec
173-
shared_with_all_pods
174-
wordpress_ui
175-
end
176-
177-
## Widgets
178-
## ============
179-
##
180-
181-
target 'JetpackStatsWidgets' do
182-
project 'WordPress/WordPress.xcodeproj'
183-
184-
shared_with_all_pods
185-
wordpress_ui
186-
end
187-
188-
## Intents
189-
## ============
190-
##
191-
192-
target 'JetpackIntents' do
193-
project 'WordPress/WordPress.xcodeproj'
194-
195-
shared_with_all_pods
196-
wordpress_ui
197-
end
198-
199-
## Notification Service Extension
200-
## ==============================
201-
##
202-
target 'WordPressNotificationServiceExtension' do
203-
project 'WordPress/WordPress.xcodeproj'
204-
205-
wordpress_shared
206-
wordpress_ui
207-
end
208-
209-
target 'JetpackNotificationServiceExtension' do
210-
project 'WordPress/WordPress.xcodeproj'
211-
212-
wordpress_shared
213-
wordpress_ui
214-
end
215-
216-
## Screenshot Generation
217-
## ===================
218-
##
219-
target 'WordPressScreenshotGeneration' do
220-
project 'WordPress/WordPress.xcodeproj'
221-
end
222-
223-
## UI Tests
224-
## ===================
225-
##
226-
target 'WordPressUITests' do
227-
project 'WordPress/WordPress.xcodeproj'
228119
end
229120

230121
## Tools
@@ -248,7 +139,7 @@ end
248139
# Linking the shared frameworks statically would lead to duplicate symbols
249140
# A future version of CocoaPods may make this easier to do. See https://github.com/CocoaPods/CocoaPods/issues/7428
250141
shared_targets = %w[WordPressFlux]
251-
dyanmic_framework_pods = %w[WordPressFlux WordPressShared WordPressUI]
142+
dyanmic_framework_pods = %w[WordPressFlux]
252143
# Statically linking Sentry results in a conflict with `NSDictionary.objectAtKeyPath`, but dynamically
253144
# linking it resolves this.
254145
dyanmic_framework_pods += %w[Sentry SentryPrivate]

Podfile.lock

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,52 +10,40 @@ PODS:
1010
- AppCenter/Distribute (5.0.4):
1111
- AppCenter/Core
1212
- CropViewController (2.5.3)
13-
- Expecta (1.0.6)
1413
- FSInteractiveMap (0.1.0)
1514
- Gravatar (2.0.0)
1615
- GravatarUI (2.0.0):
1716
- Gravatar (= 2.0.0)
1817
- Gutenberg (1.120.1)
1918
- MediaEditor (1.2.2):
2019
- CropViewController (~> 2.5.3)
21-
- Specta (1.0.7)
2220
- SwiftLint (0.54.0)
2321
- WordPress-Aztec-iOS (1.19.11)
2422
- WordPress-Editor-iOS (1.19.11):
2523
- WordPress-Aztec-iOS (= 1.19.11)
26-
- WordPressShared (2.4.0)
27-
- WordPressUI (1.16.0)
2824

2925
DEPENDENCIES:
3026
- AppCenter (~> 5.0)
3127
- AppCenter/Distribute (~> 5.0)
3228
- CropViewController (= 2.5.3)
33-
- Expecta (= 1.0.6)
3429
- FSInteractiveMap (from `https://github.com/wordpress-mobile/FSInteractiveMap.git`, tag `0.2.0`)
3530
- Gravatar (= 2.0.0)
3631
- GravatarUI (= 2.0.0)
3732
- Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.120.1.podspec`)
3833
- MediaEditor (>= 1.2.2, ~> 1.2)
39-
- Specta (= 1.0.7)
4034
- SwiftLint (= 0.54.0)
4135
- WordPress-Editor-iOS (~> 1.19.11)
42-
- WordPressShared (>= 2.3.1, ~> 2.3)
43-
- WordPressUI (~> 1.16)
4436

4537
SPEC REPOS:
4638
https://github.com/wordpress-mobile/cocoapods-specs.git:
4739
- WordPress-Aztec-iOS
4840
- WordPress-Editor-iOS
49-
- WordPressShared
50-
- WordPressUI
5141
trunk:
5242
- AppCenter
5343
- CropViewController
54-
- Expecta
5544
- Gravatar
5645
- GravatarUI
5746
- MediaEditor
58-
- Specta
5947
- SwiftLint
6048

6149
EXTERNAL SOURCES:
@@ -73,19 +61,15 @@ CHECKOUT OPTIONS:
7361
SPEC CHECKSUMS:
7462
AppCenter: 85c92db0759d2792a65eb61d6842d2e86611a49a
7563
CropViewController: a5c143548a0fabcd6cc25f2d26e40460cfb8c78c
76-
Expecta: 3b6bd90a64b9a1dcb0b70aa0e10a7f8f631667d5
7764
FSInteractiveMap: a396f610f48b76cb540baa87139d056429abda86
7865
Gravatar: 54fc63ea6298e9afca7329007815be25868f1dfe
7966
GravatarUI: bb5e03cda2da61e54aa1c20d4dde32b7153fa8b4
8067
Gutenberg: 0699e7dd207afb591ccd5e81252a92e6e7781391
8168
MediaEditor: d08314cfcbfac74361071a306b4bc3a39b3356ae
82-
Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66
8369
SwiftLint: c1de071d9d08c8aba837545f6254315bc900e211
8470
WordPress-Aztec-iOS: 3732c6d865a5c9f35788377bdeda8a80ea10d0a1
8571
WordPress-Editor-iOS: 453345420ced3d3ef20f0051b3df46ff10281e0c
86-
WordPressShared: 0160364ed24f4d67fed4e85003fefa837faad84f
87-
WordPressUI: f883fdd2508a0bc525c19805b2bbae980b581271
8872

89-
PODFILE CHECKSUM: 2c4301332e4759f1e2cf52493c97c0c95207b1a0
73+
PODFILE CHECKSUM: 3f613d671323ac233553cfced32e6931b915bdc8
9074

9175
COCOAPODS: 1.15.2

Scripts/BuildPhases/Authenticator/CopyResources-input.xcfilelist

Lines changed: 0 additions & 4 deletions
This file was deleted.

Scripts/BuildPhases/Authenticator/CopyResources-output.xcfilelist

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)