Skip to content

Commit 0974ae9

Browse files
keankean
committed
Install Gravatar using SPM
1 parent 0eb5f47 commit 0974ae9

File tree

5 files changed

+52
-30
lines changed

5 files changed

+52
-30
lines changed

‎Podfile‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,6 @@ def aztec
2929
pod 'WordPress-Editor-iOS', '~> 1.19.11'
3030
end
3131

32-
def gravatar
33-
# pod 'Gravatar', path: '../Gravatar-SDK-iOS'
34-
# pod 'GravatarUI', path: '../Gravatar-SDK-iOS'
35-
# pod 'Gravatar', git: 'https://github.com/Automattic/Gravatar-SDK-iOS', commit: ''
36-
# pod 'GravatarUI', git: 'https://github.com/Automattic/Gravatar-SDK-iOS', commit: ''
37-
pod 'Gravatar', '2.0.0'
38-
pod 'GravatarUI', '2.0.0'
39-
end
40-
4132
abstract_target 'Apps' do
4233
project 'WordPress/WordPress.xcodeproj'
4334

@@ -60,8 +51,6 @@ abstract_target 'Apps' do
6051
## Automattic libraries
6152
## ====================
6253
##
63-
gravatar
64-
6554
aztec
6655

6756
## WordPress App iOS

‎Podfile.lock‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ PODS:
1010
- AppCenter/Distribute (5.0.4):
1111
- AppCenter/Core
1212
- FSInteractiveMap (0.1.0)
13-
- Gravatar (2.0.0)
14-
- GravatarUI (2.0.0):
15-
- Gravatar (= 2.0.0)
1613
- Gutenberg (1.120.1)
1714
- SwiftLint (0.54.0)
1815
- WordPress-Aztec-iOS (1.19.11)
@@ -23,8 +20,6 @@ DEPENDENCIES:
2320
- AppCenter (~> 5.0)
2421
- AppCenter/Distribute (~> 5.0)
2522
- FSInteractiveMap (from `https://github.com/wordpress-mobile/FSInteractiveMap.git`, tag `0.2.0`)
26-
- Gravatar (= 2.0.0)
27-
- GravatarUI (= 2.0.0)
2823
- Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.120.1.podspec`)
2924
- SwiftLint (= 0.54.0)
3025
- WordPress-Editor-iOS (~> 1.19.11)
@@ -35,8 +30,6 @@ SPEC REPOS:
3530
- WordPress-Editor-iOS
3631
trunk:
3732
- AppCenter
38-
- Gravatar
39-
- GravatarUI
4033
- SwiftLint
4134

4235
EXTERNAL SOURCES:
@@ -54,13 +47,11 @@ CHECKOUT OPTIONS:
5447
SPEC CHECKSUMS:
5548
AppCenter: 85c92db0759d2792a65eb61d6842d2e86611a49a
5649
FSInteractiveMap: a396f610f48b76cb540baa87139d056429abda86
57-
Gravatar: 54fc63ea6298e9afca7329007815be25868f1dfe
58-
GravatarUI: bb5e03cda2da61e54aa1c20d4dde32b7153fa8b4
5950
Gutenberg: 0699e7dd207afb591ccd5e81252a92e6e7781391
6051
SwiftLint: c1de071d9d08c8aba837545f6254315bc900e211
6152
WordPress-Aztec-iOS: 3732c6d865a5c9f35788377bdeda8a80ea10d0a1
6253
WordPress-Editor-iOS: 453345420ced3d3ef20f0051b3df46ff10281e0c
6354

64-
PODFILE CHECKSUM: bea840133d26465e2a9bed7bce2663da40746848
55+
PODFILE CHECKSUM: 3bda7c5b90ba3f24024e44710eb54cc00a48e81b
6556

6657
COCOAPODS: 1.15.2

‎WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎WordPress/Classes/ViewRelated/Me/Views/Header/MeHeaderView.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#import "MeHeaderView.h"
22
#import "Blog.h"
33
#import "WordPress-Swift.h"
4-
#import "Gravatar-Swift.h"
54

65
@import WordPressShared;
6+
@import Gravatar;
77

88
const CGFloat MeHeaderViewHeight = 154;
99
const CGFloat MeHeaderViewGravatarSize = 64.0;

‎WordPress/WordPress.xcodeproj/project.pbxproj‎

Lines changed: 41 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,10 @@
448448
0C0AE75A2A8FAD6A007D9D6C /* MediaPickerMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C0AE7582A8FAD6A007D9D6C /* MediaPickerMenu.swift */; };
449449
0C0D3B0D2A4C79DE0050A00D /* BlazeCampaignsStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C0D3B0C2A4C79DE0050A00D /* BlazeCampaignsStream.swift */; };
450450
0C0D3B0E2A4C79DE0050A00D /* BlazeCampaignsStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C0D3B0C2A4C79DE0050A00D /* BlazeCampaignsStream.swift */; };
451+
0C0DB38C2C3486F700F21218 /* Gravatar in Frameworks */ = {isa = PBXBuildFile; productRef = 0C0DB38B2C3486F700F21218 /* Gravatar */; };
452+
0C0DB38E2C3486F700F21218 /* GravatarUI in Frameworks */ = {isa = PBXBuildFile; productRef = 0C0DB38D2C3486F700F21218 /* GravatarUI */; };
453+
0C0DB3902C34870600F21218 /* Gravatar in Frameworks */ = {isa = PBXBuildFile; productRef = 0C0DB38F2C34870600F21218 /* Gravatar */; };
454+
0C0DB3922C34870600F21218 /* GravatarUI in Frameworks */ = {isa = PBXBuildFile; productRef = 0C0DB3912C34870600F21218 /* GravatarUI */; };
451455
0C0DF85B2C2DB5EC00011B7D /* WordPressUI in Frameworks */ = {isa = PBXBuildFile; productRef = 0C0DF85A2C2DB5EC00011B7D /* WordPressUI */; };
452456
0C0DF85D2C2DB60100011B7D /* WordPressUI in Frameworks */ = {isa = PBXBuildFile; productRef = 0C0DF85C2C2DB60100011B7D /* WordPressUI */; };
453457
0C0DF85F2C2DB61300011B7D /* WordPressUI in Frameworks */ = {isa = PBXBuildFile; productRef = 0C0DF85E2C2DB61300011B7D /* WordPressUI */; };
@@ -11861,6 +11865,7 @@
1186111865
4A0CB2852C238B7800A006B0 /* CocoaLumberjackSwift in Frameworks */,
1186211866
4A3AB6512C22F6E8006E0FA8 /* SVProgressHUD in Frameworks */,
1186311867
4A3E8C4D2C238471003628B3 /* Gifu in Frameworks */,
11868+
0C0DB3902C34870600F21218 /* Gravatar in Frameworks */,
1186411869
4AEB35C22C22E90300D5AE8C /* AutomatticEncryptedLogs in Frameworks */,
1186511870
E1A386CA14DB05F700954CF8 /* CoreMedia.framework in Frameworks */,
1186611871
E1A386C814DB05C300954CF8 /* AVFoundation.framework in Frameworks */,
@@ -11878,6 +11883,7 @@
1187811883
FD3D6D2C1349F5D30061136A /* ImageIO.framework in Frameworks */,
1187911884
B5AA54D51A8E7510003BDD12 /* WebKit.framework in Frameworks */,
1188011885
93F2E5401E9E5A180050D489 /* libsqlite3.tbd in Frameworks */,
11886+
0C0DB3922C34870600F21218 /* GravatarUI in Frameworks */,
1188111887
0C0DF8802C2DDD5100011B7D /* WordPressShared in Frameworks */,
1188211888
4A2A359E2C23635D00F47E9C /* Gridicons in Frameworks */,
1188311889
1DF7A0CD2B9F66970003CBA3 /* SwiftSoup in Frameworks */,
@@ -12083,6 +12089,7 @@
1208312089
FABB26222602FC2C00C8785C /* CoreSpotlight.framework in Frameworks */,
1208412090
FABB26232602FC2C00C8785C /* QuickLook.framework in Frameworks */,
1208512091
3F9F232D2B0B281400B56061 /* JetpackStatsWidgetsCore in Frameworks */,
12092+
0C0DB38E2C3486F700F21218 /* GravatarUI in Frameworks */,
1208612093
FABB26242602FC2C00C8785C /* CoreText.framework in Frameworks */,
1208712094
FABB26252602FC2C00C8785C /* UserNotifications.framework in Frameworks */,
1208812095
FABB26262602FC2C00C8785C /* Photos.framework in Frameworks */,
@@ -12110,6 +12117,7 @@
1211012117
FABB26322602FC2C00C8785C /* Security.framework in Frameworks */,
1211112118
FABB26332602FC2C00C8785C /* MapKit.framework in Frameworks */,
1211212119
4A972D002C239C50006AE0F0 /* AlamofireImage in Frameworks */,
12120+
0C0DB38C2C3486F700F21218 /* Gravatar in Frameworks */,
1211312121
4A972D082C239C79006AE0F0 /* Gifu in Frameworks */,
1211412122
FABB26342602FC2C00C8785C /* CoreLocation.framework in Frameworks */,
1211512123
FABB26352602FC2C00C8785C /* WordPressFlux in Frameworks */,
@@ -22986,6 +22994,8 @@
2298622994
0C0DF87D2C2DDD4900011B7D /* WordPressUI */,
2298722995
0C0DF87F2C2DDD5100011B7D /* WordPressShared */,
2298822996
0CC390392C2EE6B30037C201 /* MediaEditor */,
22997+
0C0DB38F2C34870600F21218 /* Gravatar */,
22998+
0C0DB3912C34870600F21218 /* GravatarUI */,
2298922999
);
2299023000
productName = WordPress;
2299123001
productReference = 1D6058910D05DD3D006BFB54 /* WordPress.app */;
@@ -23410,6 +23420,8 @@
2341023420
0C86B1A02C2DB2A7001AB70C /* WordPressUI */,
2341123421
0C0DF8632C2DBF1500011B7D /* WordPressShared */,
2341223422
0C3060232C2EE6340096D0F6 /* MediaEditor */,
23423+
0C0DB38B2C3486F700F21218 /* Gravatar */,
23424+
0C0DB38D2C3486F700F21218 /* GravatarUI */,
2341323425
);
2341423426
productName = WordPress;
2341523427
productReference = FABB26522602FC2C00C8785C /* Jetpack.app */;
@@ -23665,6 +23677,7 @@
2366523677
0C86B19F2C2DB2A7001AB70C /* XCRemoteSwiftPackageReference "WordPressUI-iOS" */,
2366623678
0C0DF8622C2DBF1500011B7D /* XCRemoteSwiftPackageReference "WordPress-iOS-Shared" */,
2366723679
0C3060222C2EE6340096D0F6 /* XCRemoteSwiftPackageReference "MediaEditor-iOS" */,
23680+
0C0DB38A2C3486F700F21218 /* XCRemoteSwiftPackageReference "Gravatar-SDK-iOS" */,
2366823681
);
2366923682
productRefGroup = 19C28FACFE9D520D11CA2CBB /* Products */;
2367023683
projectDirPath = "";
@@ -25054,8 +25067,6 @@
2505425067
inputPaths = (
2505525068
"${PODS_ROOT}/Target Support Files/Pods-Apps-WordPress/Pods-Apps-WordPress-frameworks.sh",
2505625069
"${BUILT_PRODUCTS_DIR}/FSInteractiveMap/FSInteractiveMap.framework",
25057-
"${BUILT_PRODUCTS_DIR}/Gravatar/Gravatar.framework",
25058-
"${BUILT_PRODUCTS_DIR}/GravatarUI/GravatarUI.framework",
2505925070
"${BUILT_PRODUCTS_DIR}/WordPress-Aztec-iOS/Aztec.framework",
2506025071
"${BUILT_PRODUCTS_DIR}/WordPress-Editor-iOS/WordPressEditor.framework",
2506125072
"${PODS_XCFRAMEWORKS_BUILD_DIR}/Gutenberg/Gutenberg.framework/Gutenberg",
@@ -25064,8 +25075,6 @@
2506425075
name = "[CP] Embed Pods Frameworks";
2506525076
outputPaths = (
2506625077
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FSInteractiveMap.framework",
25067-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Gravatar.framework",
25068-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GravatarUI.framework",
2506925078
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Aztec.framework",
2507025079
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WordPressEditor.framework",
2507125080
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Gutenberg.framework",
@@ -25371,8 +25380,6 @@
2537125380
inputPaths = (
2537225381
"${PODS_ROOT}/Target Support Files/Pods-Apps-Jetpack/Pods-Apps-Jetpack-frameworks.sh",
2537325382
"${BUILT_PRODUCTS_DIR}/FSInteractiveMap/FSInteractiveMap.framework",
25374-
"${BUILT_PRODUCTS_DIR}/Gravatar/Gravatar.framework",
25375-
"${BUILT_PRODUCTS_DIR}/GravatarUI/GravatarUI.framework",
2537625383
"${BUILT_PRODUCTS_DIR}/WordPress-Aztec-iOS/Aztec.framework",
2537725384
"${BUILT_PRODUCTS_DIR}/WordPress-Editor-iOS/WordPressEditor.framework",
2537825385
"${PODS_XCFRAMEWORKS_BUILD_DIR}/Gutenberg/Gutenberg.framework/Gutenberg",
@@ -25381,8 +25388,6 @@
2538125388
name = "[CP] Embed Pods Frameworks";
2538225389
outputPaths = (
2538325390
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FSInteractiveMap.framework",
25384-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Gravatar.framework",
25385-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GravatarUI.framework",
2538625391
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Aztec.framework",
2538725392
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WordPressEditor.framework",
2538825393
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Gutenberg.framework",
@@ -36303,6 +36308,14 @@
3630336308
/* End XCConfigurationList section */
3630436309

3630536310
/* Begin XCRemoteSwiftPackageReference section */
36311+
0C0DB38A2C3486F700F21218 /* XCRemoteSwiftPackageReference "Gravatar-SDK-iOS" */ = {
36312+
isa = XCRemoteSwiftPackageReference;
36313+
repositoryURL = "https://github.com/Automattic/Gravatar-SDK-iOS";
36314+
requirement = {
36315+
kind = upToNextMajorVersion;
36316+
minimumVersion = 2.1.0;
36317+
};
36318+
};
3630636319
0C0DF8622C2DBF1500011B7D /* XCRemoteSwiftPackageReference "WordPress-iOS-Shared" */ = {
3630736320
isa = XCRemoteSwiftPackageReference;
3630836321
repositoryURL = "https://github.com/wordpress-mobile/WordPress-iOS-Shared";
@@ -36578,6 +36591,26 @@
3657836591
isa = XCSwiftPackageProductDependency;
3657936592
productName = DesignSystem;
3658036593
};
36594+
0C0DB38B2C3486F700F21218 /* Gravatar */ = {
36595+
isa = XCSwiftPackageProductDependency;
36596+
package = 0C0DB38A2C3486F700F21218 /* XCRemoteSwiftPackageReference "Gravatar-SDK-iOS" */;
36597+
productName = Gravatar;
36598+
};
36599+
0C0DB38D2C3486F700F21218 /* GravatarUI */ = {
36600+
isa = XCSwiftPackageProductDependency;
36601+
package = 0C0DB38A2C3486F700F21218 /* XCRemoteSwiftPackageReference "Gravatar-SDK-iOS" */;
36602+
productName = GravatarUI;
36603+
};
36604+
0C0DB38F2C34870600F21218 /* Gravatar */ = {
36605+
isa = XCSwiftPackageProductDependency;
36606+
package = 0C0DB38A2C3486F700F21218 /* XCRemoteSwiftPackageReference "Gravatar-SDK-iOS" */;
36607+
productName = Gravatar;
36608+
};
36609+
0C0DB3912C34870600F21218 /* GravatarUI */ = {
36610+
isa = XCSwiftPackageProductDependency;
36611+
package = 0C0DB38A2C3486F700F21218 /* XCRemoteSwiftPackageReference "Gravatar-SDK-iOS" */;
36612+
productName = GravatarUI;
36613+
};
3658136614
0C0DF85A2C2DB5EC00011B7D /* WordPressUI */ = {
3658236615
isa = XCSwiftPackageProductDependency;
3658336616
package = 0C86B19F2C2DB2A7001AB70C /* XCRemoteSwiftPackageReference "WordPressUI-iOS" */;

0 commit comments

Comments
 (0)