Skip to content

Commit e4c598b

Browse files
keankean
committed
Install MediaEditor using SPM
1 parent 68cf81b commit e4c598b

File tree

4 files changed

+44
-37
lines changed

4 files changed

+44
-37
lines changed

‎Podfile‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,19 +56,12 @@ abstract_target 'Apps' do
5656
pod 'AppCenter/Distribute', app_center_version, configurations: app_center_configurations
5757

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

6160
## Automattic libraries
6261
## ====================
6362
##
6463
gravatar
6564

66-
# Production
67-
68-
pod 'MediaEditor', '~> 1.2', '>= 1.2.2'
69-
# pod 'MediaEditor', git: 'https://github.com/wordpress-mobile/MediaEditor-iOS.git', commit: ''
70-
# pod 'MediaEditor', path: '../MediaEditor-iOS'
71-
7265
aztec
7366

7467
## WordPress App iOS

‎Podfile.lock‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,11 @@ PODS:
99
- AppCenter/Core
1010
- AppCenter/Distribute (5.0.4):
1111
- AppCenter/Core
12-
- CropViewController (2.5.3)
1312
- FSInteractiveMap (0.1.0)
1413
- Gravatar (2.0.0)
1514
- GravatarUI (2.0.0):
1615
- Gravatar (= 2.0.0)
1716
- Gutenberg (1.120.1)
18-
- MediaEditor (1.2.2):
19-
- CropViewController (~> 2.5.3)
2017
- SwiftLint (0.54.0)
2118
- WordPress-Aztec-iOS (1.19.11)
2219
- WordPress-Editor-iOS (1.19.11):
@@ -25,12 +22,10 @@ PODS:
2522
DEPENDENCIES:
2623
- AppCenter (~> 5.0)
2724
- AppCenter/Distribute (~> 5.0)
28-
- CropViewController (= 2.5.3)
2925
- FSInteractiveMap (from `https://github.com/wordpress-mobile/FSInteractiveMap.git`, tag `0.2.0`)
3026
- Gravatar (= 2.0.0)
3127
- GravatarUI (= 2.0.0)
3228
- Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.120.1.podspec`)
33-
- MediaEditor (>= 1.2.2, ~> 1.2)
3429
- SwiftLint (= 0.54.0)
3530
- WordPress-Editor-iOS (~> 1.19.11)
3631

@@ -40,10 +35,8 @@ SPEC REPOS:
4035
- WordPress-Editor-iOS
4136
trunk:
4237
- AppCenter
43-
- CropViewController
4438
- Gravatar
4539
- GravatarUI
46-
- MediaEditor
4740
- SwiftLint
4841

4942
EXTERNAL SOURCES:
@@ -60,16 +53,14 @@ CHECKOUT OPTIONS:
6053

6154
SPEC CHECKSUMS:
6255
AppCenter: 85c92db0759d2792a65eb61d6842d2e86611a49a
63-
CropViewController: a5c143548a0fabcd6cc25f2d26e40460cfb8c78c
6456
FSInteractiveMap: a396f610f48b76cb540baa87139d056429abda86
6557
Gravatar: 54fc63ea6298e9afca7329007815be25868f1dfe
6658
GravatarUI: bb5e03cda2da61e54aa1c20d4dde32b7153fa8b4
6759
Gutenberg: 0699e7dd207afb591ccd5e81252a92e6e7781391
68-
MediaEditor: d08314cfcbfac74361071a306b4bc3a39b3356ae
6960
SwiftLint: c1de071d9d08c8aba837545f6254315bc900e211
7061
WordPress-Aztec-iOS: 3732c6d865a5c9f35788377bdeda8a80ea10d0a1
7162
WordPress-Editor-iOS: 453345420ced3d3ef20f0051b3df46ff10281e0c
7263

73-
PODFILE CHECKSUM: 3f613d671323ac233553cfced32e6931b915bdc8
64+
PODFILE CHECKSUM: d26534cea122909b5ab54180ec284f286a3d3645
7465

7566
COCOAPODS: 1.15.2

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

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

‎WordPress/WordPress.xcodeproj/project.pbxproj‎

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -500,6 +500,7 @@
500500
0C2C83FB2A6EABF300A3ACD9 /* StatsPeriodCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C2C83F92A6EABF300A3ACD9 /* StatsPeriodCache.swift */; };
501501
0C2C83FD2A6EBD3F00A3ACD9 /* StatsInsightsCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C2C83FC2A6EBD3F00A3ACD9 /* StatsInsightsCache.swift */; };
502502
0C2C83FE2A6EBD3F00A3ACD9 /* StatsInsightsCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C2C83FC2A6EBD3F00A3ACD9 /* StatsInsightsCache.swift */; };
503+
0C3060242C2EE6340096D0F6 /* MediaEditor in Frameworks */ = {isa = PBXBuildFile; productRef = 0C3060232C2EE6340096D0F6 /* MediaEditor */; };
503504
0C308FFE2B1234E70071C551 /* SiteMediaFilterButtonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C308FFD2B1234E70071C551 /* SiteMediaFilterButtonView.swift */; };
504505
0C308FFF2B1234E70071C551 /* SiteMediaFilterButtonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C308FFD2B1234E70071C551 /* SiteMediaFilterButtonView.swift */; };
505506
0C3090222B12A5C90071C551 /* UIButton+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C3090212B12A5C90071C551 /* UIButton+Extensions.swift */; };
@@ -605,6 +606,7 @@
605606
0CB54F582AEC320700582080 /* WordPressAppDelegate+PostCoordinatorDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CB54F562AEC320700582080 /* WordPressAppDelegate+PostCoordinatorDelegate.swift */; };
606607
0CC21C6C2B95220E003BDB4A /* PostCoordinator+Notices.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CC21C6B2B95220E003BDB4A /* PostCoordinator+Notices.swift */; };
607608
0CC21C6D2B95220E003BDB4A /* PostCoordinator+Notices.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CC21C6B2B95220E003BDB4A /* PostCoordinator+Notices.swift */; };
609+
0CC3903A2C2EE6B30037C201 /* MediaEditor in Frameworks */ = {isa = PBXBuildFile; productRef = 0CC390392C2EE6B30037C201 /* MediaEditor */; };
608610
0CD223DF2AA8ADFD002BD761 /* DashboardQuickActionsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CD223DE2AA8ADFD002BD761 /* DashboardQuickActionsViewModel.swift */; };
609611
0CD223E02AA8ADFD002BD761 /* DashboardQuickActionsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CD223DE2AA8ADFD002BD761 /* DashboardQuickActionsViewModel.swift */; };
610612
0CD382832A4B699E00612173 /* DashboardBlazeCardCellViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CD382822A4B699E00612173 /* DashboardBlazeCardCellViewModel.swift */; };
@@ -11879,6 +11881,7 @@
1187911881
0C0DF8802C2DDD5100011B7D /* WordPressShared in Frameworks */,
1188011882
4A2A359E2C23635D00F47E9C /* Gridicons in Frameworks */,
1188111883
1DF7A0CD2B9F66970003CBA3 /* SwiftSoup in Frameworks */,
11884+
0CC3903A2C2EE6B30037C201 /* MediaEditor in Frameworks */,
1188211885
17A8858D2757B97F0071FCA3 /* AutomatticAbout in Frameworks */,
1188311886
FF4DEAD8244B56E300ACA032 /* CoreServices.framework in Frameworks */,
1188411887
A1C54EBE8C34FFD5015F8FC9 /* Pods_Apps_WordPress.framework in Frameworks */,
@@ -12092,6 +12095,7 @@
1209212095
0CD9FB872AFA71B9009D9C7A /* DGCharts in Frameworks */,
1209312096
FABB262C2602FC2C00C8785C /* UIKit.framework in Frameworks */,
1209412097
4A972D3A2C23A3B0006AE0F0 /* ZendeskSupportSDK in Frameworks */,
12098+
0C3060242C2EE6340096D0F6 /* MediaEditor in Frameworks */,
1209512099
4A972D3C2C23A3D2006AE0F0 /* Reachability in Frameworks */,
1209612100
0C0DF8642C2DBF1500011B7D /* WordPressShared in Frameworks */,
1209712101
FABB262D2602FC2C00C8785C /* QuartzCore.framework in Frameworks */,
@@ -22981,6 +22985,7 @@
2298122985
4A0CB2842C238B7800A006B0 /* CocoaLumberjackSwift */,
2298222986
0C0DF87D2C2DDD4900011B7D /* WordPressUI */,
2298322987
0C0DF87F2C2DDD5100011B7D /* WordPressShared */,
22988+
0CC390392C2EE6B30037C201 /* MediaEditor */,
2298422989
);
2298522990
productName = WordPress;
2298622991
productReference = 1D6058910D05DD3D006BFB54 /* WordPress.app */;
@@ -23408,6 +23413,7 @@
2340823413
4A972D3D2C23A3ED006AE0F0 /* Starscream */,
2340923414
0C86B1A02C2DB2A7001AB70C /* WordPressUI */,
2341023415
0C0DF8632C2DBF1500011B7D /* WordPressShared */,
23416+
0C3060232C2EE6340096D0F6 /* MediaEditor */,
2341123417
);
2341223418
productName = WordPress;
2341323419
productReference = FABB26522602FC2C00C8785C /* Jetpack.app */;
@@ -23662,6 +23668,7 @@
2366223668
4A0CB27B2C23883B00A006B0 /* XCRemoteSwiftPackageReference "CocoaLumberjack" */,
2366323669
0C86B19F2C2DB2A7001AB70C /* XCRemoteSwiftPackageReference "WordPressUI-iOS" */,
2366423670
0C0DF8622C2DBF1500011B7D /* XCRemoteSwiftPackageReference "WordPress-iOS-Shared" */,
23671+
0C3060222C2EE6340096D0F6 /* XCRemoteSwiftPackageReference "MediaEditor-iOS" */,
2366523672
);
2366623673
productRefGroup = 19C28FACFE9D520D11CA2CBB /* Products */;
2366723674
projectDirPath = "";
@@ -25222,24 +25229,14 @@
2522225229
);
2522325230
inputPaths = (
2522425231
"${PODS_ROOT}/Target Support Files/Pods-Apps-WordPress/Pods-Apps-WordPress-resources.sh",
25225-
"${PODS_CONFIGURATION_BUILD_DIR}/CropViewController/TOCropViewControllerBundle.bundle",
2522625232
"${PODS_CONFIGURATION_BUILD_DIR}/GravatarUI/GravatarUI.bundle",
25227-
"${BUILT_PRODUCTS_DIR}/MediaEditor/MediaEditor.framework/MediaEditorDrawing.storyboardc",
25228-
"${BUILT_PRODUCTS_DIR}/MediaEditor/MediaEditor.framework/MediaEditorFilters.storyboardc",
25229-
"${BUILT_PRODUCTS_DIR}/MediaEditor/MediaEditor.framework/MediaEditorHub.storyboardc",
25230-
"${PODS_CONFIGURATION_BUILD_DIR}/MediaEditor/MediaEditor.bundle",
2523125233
"${PODS_CONFIGURATION_BUILD_DIR}/WordPress-Aztec-iOS/WordPress-Aztec-iOS.bundle",
2523225234
"${PODS_ROOT}/WordPress-Editor-iOS/WordPressEditor/WordPressEditor/Assets/aztec.png",
2523325235
"${PODS_CONFIGURATION_BUILD_DIR}/AppCenter/AppCenterDistributeResources.bundle",
2523425236
);
2523525237
name = "[CP] Copy Pods Resources";
2523625238
outputPaths = (
25237-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
2523825239
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GravatarUI.bundle",
25239-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MediaEditorDrawing.storyboardc",
25240-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MediaEditorFilters.storyboardc",
25241-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MediaEditorHub.storyboardc",
25242-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MediaEditor.bundle",
2524325240
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WordPress-Aztec-iOS.bundle",
2524425241
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/aztec.png",
2524525242
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AppCenterDistributeResources.bundle",
@@ -25473,24 +25470,14 @@
2547325470
);
2547425471
inputPaths = (
2547525472
"${PODS_ROOT}/Target Support Files/Pods-Apps-Jetpack/Pods-Apps-Jetpack-resources.sh",
25476-
"${PODS_CONFIGURATION_BUILD_DIR}/CropViewController/TOCropViewControllerBundle.bundle",
2547725473
"${PODS_CONFIGURATION_BUILD_DIR}/GravatarUI/GravatarUI.bundle",
25478-
"${BUILT_PRODUCTS_DIR}/MediaEditor/MediaEditor.framework/MediaEditorDrawing.storyboardc",
25479-
"${BUILT_PRODUCTS_DIR}/MediaEditor/MediaEditor.framework/MediaEditorFilters.storyboardc",
25480-
"${BUILT_PRODUCTS_DIR}/MediaEditor/MediaEditor.framework/MediaEditorHub.storyboardc",
25481-
"${PODS_CONFIGURATION_BUILD_DIR}/MediaEditor/MediaEditor.bundle",
2548225474
"${PODS_CONFIGURATION_BUILD_DIR}/WordPress-Aztec-iOS/WordPress-Aztec-iOS.bundle",
2548325475
"${PODS_ROOT}/WordPress-Editor-iOS/WordPressEditor/WordPressEditor/Assets/aztec.png",
2548425476
"${PODS_CONFIGURATION_BUILD_DIR}/AppCenter/AppCenterDistributeResources.bundle",
2548525477
);
2548625478
name = "[CP] Copy Pods Resources";
2548725479
outputPaths = (
25488-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
2548925480
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GravatarUI.bundle",
25490-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MediaEditorDrawing.storyboardc",
25491-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MediaEditorFilters.storyboardc",
25492-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MediaEditorHub.storyboardc",
25493-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MediaEditor.bundle",
2549425481
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WordPress-Aztec-iOS.bundle",
2549525482
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/aztec.png",
2549625483
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AppCenterDistributeResources.bundle",
@@ -36400,6 +36387,14 @@
3640036387
kind = branch;
3640136388
};
3640236389
};
36390+
0C3060222C2EE6340096D0F6 /* XCRemoteSwiftPackageReference "MediaEditor-iOS" */ = {
36391+
isa = XCRemoteSwiftPackageReference;
36392+
repositoryURL = "https://github.com/wordpress-mobile/MediaEditor-iOS";
36393+
requirement = {
36394+
branch = "task/spm-support";
36395+
kind = branch;
36396+
};
36397+
};
3640336398
0C86B19F2C2DB2A7001AB70C /* XCRemoteSwiftPackageReference "WordPressUI-iOS" */ = {
3640436399
isa = XCRemoteSwiftPackageReference;
3640536400
repositoryURL = "https://github.com/wordpress-mobile/WordPressUI-iOS";
@@ -36784,6 +36779,11 @@
3678436779
package = 0C86B19F2C2DB2A7001AB70C /* XCRemoteSwiftPackageReference "WordPressUI-iOS" */;
3678536780
productName = WordPressUI;
3678636781
};
36782+
0C3060232C2EE6340096D0F6 /* MediaEditor */ = {
36783+
isa = XCSwiftPackageProductDependency;
36784+
package = 0C3060222C2EE6340096D0F6 /* XCRemoteSwiftPackageReference "MediaEditor-iOS" */;
36785+
productName = MediaEditor;
36786+
};
3678736787
0C86B1A02C2DB2A7001AB70C /* WordPressUI */ = {
3678836788
isa = XCSwiftPackageProductDependency;
3678936789
package = 0C86B19F2C2DB2A7001AB70C /* XCRemoteSwiftPackageReference "WordPressUI-iOS" */;
@@ -36794,6 +36794,11 @@
3679436794
package = 0C86B19F2C2DB2A7001AB70C /* XCRemoteSwiftPackageReference "WordPressUI-iOS" */;
3679536795
productName = WordPressUI;
3679636796
};
36797+
0CC390392C2EE6B30037C201 /* MediaEditor */ = {
36798+
isa = XCSwiftPackageProductDependency;
36799+
package = 0C3060222C2EE6340096D0F6 /* XCRemoteSwiftPackageReference "MediaEditor-iOS" */;
36800+
productName = MediaEditor;
36801+
};
3679736802
0CD9FB862AFA71B9009D9C7A /* DGCharts */ = {
3679836803
isa = XCSwiftPackageProductDependency;
3679936804
package = 0CD9FB852AFA71B9009D9C7A /* XCRemoteSwiftPackageReference "Charts" */;

0 commit comments

Comments
 (0)