Skip to content

Commit d99906b

Browse files
keankean
committed
Install Gravatar using SPM
1 parent e4c598b commit d99906b

File tree

5 files changed

+52
-29
lines changed

5 files changed

+52
-29
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: d26534cea122909b5ab54180ec284f286a3d3645
55+
PODFILE CHECKSUM: 16e6c3f45218204a63bf806be73c61aa22b37a1d
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 & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
#import "MeHeaderView.h"
22
#import "Blog.h"
33
#import "WordPress-Swift.h"
4-
#import "Gravatar-Swift.h"
54

5+
@import Gravatar;
66
@import WordPressShared;
77

8-
const CGFloat MeHeaderViewHeight = 154;
98
const CGFloat MeHeaderViewGravatarSize = 64.0;
10-
const CGFloat MeHeaderViewLabelHeight = 20.0;
11-
const CGFloat MeHeaderViewVerticalMargin = 20.0;
129
const CGFloat MeHeaderViewVerticalSpacing = 10.0;
1310

1411
@interface MeHeaderView () <UIDropInteractionDelegate>

‎WordPress/WordPress.xcodeproj/project.pbxproj‎

Lines changed: 41 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,10 @@
517517
0C391E642A312DB20040EA91 /* BlazeCampaignViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C391E632A312DB20040EA91 /* BlazeCampaignViewModelTests.swift */; };
518518
0C3C50422BA3A024002A37B4 /* PostNoticePublishSuccessView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C3C50412BA3A024002A37B4 /* PostNoticePublishSuccessView.swift */; };
519519
0C3C50432BA3A024002A37B4 /* PostNoticePublishSuccessView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C3C50412BA3A024002A37B4 /* PostNoticePublishSuccessView.swift */; };
520+
0C3F75382C2F2769008F190C /* Gravatar in Frameworks */ = {isa = PBXBuildFile; productRef = 0C3F75372C2F2769008F190C /* Gravatar */; };
521+
0C3F753A2C2F2769008F190C /* GravatarUI in Frameworks */ = {isa = PBXBuildFile; productRef = 0C3F75392C2F2769008F190C /* GravatarUI */; };
522+
0C3F753C2C2F2780008F190C /* Gravatar in Frameworks */ = {isa = PBXBuildFile; productRef = 0C3F753B2C2F2780008F190C /* Gravatar */; };
523+
0C3F753E2C2F2780008F190C /* GravatarUI in Frameworks */ = {isa = PBXBuildFile; productRef = 0C3F753D2C2F2780008F190C /* GravatarUI */; };
520524
0C5751102B011468001074E5 /* RemoteConfigDebugView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C57510F2B011468001074E5 /* RemoteConfigDebugView.swift */; };
521525
0C5751112B011468001074E5 /* RemoteConfigDebugView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C57510F2B011468001074E5 /* RemoteConfigDebugView.swift */; };
522526
0C63266F2A3D1305000B8C57 /* GutenbergFilesAppMediaSourceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C63266E2A3D1305000B8C57 /* GutenbergFilesAppMediaSourceTests.swift */; };
@@ -11861,6 +11865,7 @@
1186111865
4A0CB2852C238B7800A006B0 /* CocoaLumberjackSwift in Frameworks */,
1186211866
4A3AB6512C22F6E8006E0FA8 /* SVProgressHUD in Frameworks */,
1186311867
4A3E8C4D2C238471003628B3 /* Gifu in Frameworks */,
11868+
0C3F753C2C2F2780008F190C /* 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+
0C3F753E2C2F2780008F190C /* 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+
0C3F753A2C2F2769008F190C /* 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+
0C3F75382C2F2769008F190C /* 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+
0C3F753B2C2F2780008F190C /* Gravatar */,
22998+
0C3F753D2C2F2780008F190C /* GravatarUI */,
2298922999
);
2299023000
productName = WordPress;
2299123001
productReference = 1D6058910D05DD3D006BFB54 /* WordPress.app */;
@@ -23414,6 +23424,8 @@
2341423424
0C86B1A02C2DB2A7001AB70C /* WordPressUI */,
2341523425
0C0DF8632C2DBF1500011B7D /* WordPressShared */,
2341623426
0C3060232C2EE6340096D0F6 /* MediaEditor */,
23427+
0C3F75372C2F2769008F190C /* Gravatar */,
23428+
0C3F75392C2F2769008F190C /* GravatarUI */,
2341723429
);
2341823430
productName = WordPress;
2341923431
productReference = FABB26522602FC2C00C8785C /* Jetpack.app */;
@@ -23669,6 +23681,7 @@
2366923681
0C86B19F2C2DB2A7001AB70C /* XCRemoteSwiftPackageReference "WordPressUI-iOS" */,
2367023682
0C0DF8622C2DBF1500011B7D /* XCRemoteSwiftPackageReference "WordPress-iOS-Shared" */,
2367123683
0C3060222C2EE6340096D0F6 /* XCRemoteSwiftPackageReference "MediaEditor-iOS" */,
23684+
0C3F75362C2F2769008F190C /* XCRemoteSwiftPackageReference "Gravatar-SDK-iOS" */,
2367223685
);
2367323686
productRefGroup = 19C28FACFE9D520D11CA2CBB /* Products */;
2367423687
projectDirPath = "";
@@ -25229,14 +25242,12 @@
2522925242
);
2523025243
inputPaths = (
2523125244
"${PODS_ROOT}/Target Support Files/Pods-Apps-WordPress/Pods-Apps-WordPress-resources.sh",
25232-
"${PODS_CONFIGURATION_BUILD_DIR}/GravatarUI/GravatarUI.bundle",
2523325245
"${PODS_CONFIGURATION_BUILD_DIR}/WordPress-Aztec-iOS/WordPress-Aztec-iOS.bundle",
2523425246
"${PODS_ROOT}/WordPress-Editor-iOS/WordPressEditor/WordPressEditor/Assets/aztec.png",
2523525247
"${PODS_CONFIGURATION_BUILD_DIR}/AppCenter/AppCenterDistributeResources.bundle",
2523625248
);
2523725249
name = "[CP] Copy Pods Resources";
2523825250
outputPaths = (
25239-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GravatarUI.bundle",
2524025251
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WordPress-Aztec-iOS.bundle",
2524125252
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/aztec.png",
2524225253
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AppCenterDistributeResources.bundle",
@@ -25470,14 +25481,12 @@
2547025481
);
2547125482
inputPaths = (
2547225483
"${PODS_ROOT}/Target Support Files/Pods-Apps-Jetpack/Pods-Apps-Jetpack-resources.sh",
25473-
"${PODS_CONFIGURATION_BUILD_DIR}/GravatarUI/GravatarUI.bundle",
2547425484
"${PODS_CONFIGURATION_BUILD_DIR}/WordPress-Aztec-iOS/WordPress-Aztec-iOS.bundle",
2547525485
"${PODS_ROOT}/WordPress-Editor-iOS/WordPressEditor/WordPressEditor/Assets/aztec.png",
2547625486
"${PODS_CONFIGURATION_BUILD_DIR}/AppCenter/AppCenterDistributeResources.bundle",
2547725487
);
2547825488
name = "[CP] Copy Pods Resources";
2547925489
outputPaths = (
25480-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GravatarUI.bundle",
2548125490
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WordPress-Aztec-iOS.bundle",
2548225491
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/aztec.png",
2548325492
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AppCenterDistributeResources.bundle",
@@ -36395,6 +36404,14 @@
3639536404
kind = branch;
3639636405
};
3639736406
};
36407+
0C3F75362C2F2769008F190C /* XCRemoteSwiftPackageReference "Gravatar-SDK-iOS" */ = {
36408+
isa = XCRemoteSwiftPackageReference;
36409+
repositoryURL = "https://github.com/Automattic/Gravatar-SDK-iOS";
36410+
requirement = {
36411+
kind = upToNextMajorVersion;
36412+
minimumVersion = 2.0.1;
36413+
};
36414+
};
3639836415
0C86B19F2C2DB2A7001AB70C /* XCRemoteSwiftPackageReference "WordPressUI-iOS" */ = {
3639936416
isa = XCRemoteSwiftPackageReference;
3640036417
repositoryURL = "https://github.com/wordpress-mobile/WordPressUI-iOS";
@@ -36784,6 +36801,26 @@
3678436801
package = 0C3060222C2EE6340096D0F6 /* XCRemoteSwiftPackageReference "MediaEditor-iOS" */;
3678536802
productName = MediaEditor;
3678636803
};
36804+
0C3F75372C2F2769008F190C /* Gravatar */ = {
36805+
isa = XCSwiftPackageProductDependency;
36806+
package = 0C3F75362C2F2769008F190C /* XCRemoteSwiftPackageReference "Gravatar-SDK-iOS" */;
36807+
productName = Gravatar;
36808+
};
36809+
0C3F75392C2F2769008F190C /* GravatarUI */ = {
36810+
isa = XCSwiftPackageProductDependency;
36811+
package = 0C3F75362C2F2769008F190C /* XCRemoteSwiftPackageReference "Gravatar-SDK-iOS" */;
36812+
productName = GravatarUI;
36813+
};
36814+
0C3F753B2C2F2780008F190C /* Gravatar */ = {
36815+
isa = XCSwiftPackageProductDependency;
36816+
package = 0C3F75362C2F2769008F190C /* XCRemoteSwiftPackageReference "Gravatar-SDK-iOS" */;
36817+
productName = Gravatar;
36818+
};
36819+
0C3F753D2C2F2780008F190C /* GravatarUI */ = {
36820+
isa = XCSwiftPackageProductDependency;
36821+
package = 0C3F75362C2F2769008F190C /* XCRemoteSwiftPackageReference "Gravatar-SDK-iOS" */;
36822+
productName = GravatarUI;
36823+
};
3678736824
0C86B1A02C2DB2A7001AB70C /* WordPressUI */ = {
3678836825
isa = XCSwiftPackageProductDependency;
3678936826
package = 0C86B19F2C2DB2A7001AB70C /* XCRemoteSwiftPackageReference "WordPressUI-iOS" */;

0 commit comments

Comments
 (0)