From e4c598bcf6846283481784e258b17614d018b5b5 Mon Sep 17 00:00:00 2001 From: kean Date: Fri, 28 Jun 2024 09:25:11 -0400 Subject: [PATCH 1/4] Install MediaEditor using SPM --- Podfile | 7 --- Podfile.lock | 11 +---- .../xcshareddata/swiftpm/Package.resolved | 18 ++++++++ WordPress/WordPress.xcodeproj/project.pbxproj | 45 ++++++++++--------- 4 files changed, 44 insertions(+), 37 deletions(-) diff --git a/Podfile b/Podfile index 7e40e32cb597..a9cfeb692b1a 100644 --- a/Podfile +++ b/Podfile @@ -56,19 +56,12 @@ abstract_target 'Apps' do pod 'AppCenter/Distribute', app_center_version, configurations: app_center_configurations pod 'FSInteractiveMap', git: 'https://github.com/wordpress-mobile/FSInteractiveMap.git', tag: '0.2.0' - pod 'CropViewController', '2.5.3' ## Automattic libraries ## ==================== ## gravatar - # Production - - pod 'MediaEditor', '~> 1.2', '>= 1.2.2' - # pod 'MediaEditor', git: 'https://github.com/wordpress-mobile/MediaEditor-iOS.git', commit: '' - # pod 'MediaEditor', path: '../MediaEditor-iOS' - aztec ## WordPress App iOS diff --git a/Podfile.lock b/Podfile.lock index 76eca9a927c8..0ef0528e1dd8 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -9,14 +9,11 @@ PODS: - AppCenter/Core - AppCenter/Distribute (5.0.4): - AppCenter/Core - - CropViewController (2.5.3) - 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) - SwiftLint (0.54.0) - WordPress-Aztec-iOS (1.19.11) - WordPress-Editor-iOS (1.19.11): @@ -25,12 +22,10 @@ PODS: DEPENDENCIES: - AppCenter (~> 5.0) - AppCenter/Distribute (~> 5.0) - - CropViewController (= 2.5.3) - 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) - SwiftLint (= 0.54.0) - WordPress-Editor-iOS (~> 1.19.11) @@ -40,10 +35,8 @@ SPEC REPOS: - WordPress-Editor-iOS trunk: - AppCenter - - CropViewController - Gravatar - GravatarUI - - MediaEditor - SwiftLint EXTERNAL SOURCES: @@ -60,16 +53,14 @@ CHECKOUT OPTIONS: SPEC CHECKSUMS: AppCenter: 85c92db0759d2792a65eb61d6842d2e86611a49a - CropViewController: a5c143548a0fabcd6cc25f2d26e40460cfb8c78c FSInteractiveMap: a396f610f48b76cb540baa87139d056429abda86 Gravatar: 54fc63ea6298e9afca7329007815be25868f1dfe GravatarUI: bb5e03cda2da61e54aa1c20d4dde32b7153fa8b4 Gutenberg: 0699e7dd207afb591ccd5e81252a92e6e7781391 - MediaEditor: d08314cfcbfac74361071a306b4bc3a39b3356ae SwiftLint: c1de071d9d08c8aba837545f6254315bc900e211 WordPress-Aztec-iOS: 3732c6d865a5c9f35788377bdeda8a80ea10d0a1 WordPress-Editor-iOS: 453345420ced3d3ef20f0051b3df46ff10281e0c -PODFILE CHECKSUM: 3f613d671323ac233553cfced32e6931b915bdc8 +PODFILE CHECKSUM: d26534cea122909b5ab54180ec284f286a3d3645 COCOAPODS: 1.15.2 diff --git a/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved b/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved index cda787a656b4..f7c614f08919 100644 --- a/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -163,6 +163,15 @@ "version": "4.4.0" } }, + { + "package": "MediaEditor", + "repositoryURL": "https://github.com/wordpress-mobile/MediaEditor-iOS", + "state": { + "branch": "task/spm-support", + "revision": "4f3fe298a95d1de81099f8c9e5612e0c59c9bf53", + "version": null + } + }, { "package": "ZendeskMessagingSDK", "repositoryURL": "https://github.com/zendesk/messaging_sdk_ios", @@ -388,6 +397,15 @@ "version": "0.3.0" } }, + { + "package": "TOCropViewController", + "repositoryURL": "https://github.com/TimOliver/TOCropViewController", + "state": { + "branch": null, + "revision": "a634cb7cdfd580006e79a6e74e64417fe9e9783b", + "version": "2.7.4" + } + }, { "package": "UIDeviceIdentifier", "repositoryURL": "https://github.com/squarefrog/UIDeviceIdentifier", diff --git a/WordPress/WordPress.xcodeproj/project.pbxproj b/WordPress/WordPress.xcodeproj/project.pbxproj index bb2c3a368820..ec8c09f6bc7e 100644 --- a/WordPress/WordPress.xcodeproj/project.pbxproj +++ b/WordPress/WordPress.xcodeproj/project.pbxproj @@ -500,6 +500,7 @@ 0C2C83FB2A6EABF300A3ACD9 /* StatsPeriodCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C2C83F92A6EABF300A3ACD9 /* StatsPeriodCache.swift */; }; 0C2C83FD2A6EBD3F00A3ACD9 /* StatsInsightsCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C2C83FC2A6EBD3F00A3ACD9 /* StatsInsightsCache.swift */; }; 0C2C83FE2A6EBD3F00A3ACD9 /* StatsInsightsCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C2C83FC2A6EBD3F00A3ACD9 /* StatsInsightsCache.swift */; }; + 0C3060242C2EE6340096D0F6 /* MediaEditor in Frameworks */ = {isa = PBXBuildFile; productRef = 0C3060232C2EE6340096D0F6 /* MediaEditor */; }; 0C308FFE2B1234E70071C551 /* SiteMediaFilterButtonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C308FFD2B1234E70071C551 /* SiteMediaFilterButtonView.swift */; }; 0C308FFF2B1234E70071C551 /* SiteMediaFilterButtonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C308FFD2B1234E70071C551 /* SiteMediaFilterButtonView.swift */; }; 0C3090222B12A5C90071C551 /* UIButton+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C3090212B12A5C90071C551 /* UIButton+Extensions.swift */; }; @@ -605,6 +606,7 @@ 0CB54F582AEC320700582080 /* WordPressAppDelegate+PostCoordinatorDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CB54F562AEC320700582080 /* WordPressAppDelegate+PostCoordinatorDelegate.swift */; }; 0CC21C6C2B95220E003BDB4A /* PostCoordinator+Notices.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CC21C6B2B95220E003BDB4A /* PostCoordinator+Notices.swift */; }; 0CC21C6D2B95220E003BDB4A /* PostCoordinator+Notices.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CC21C6B2B95220E003BDB4A /* PostCoordinator+Notices.swift */; }; + 0CC3903A2C2EE6B30037C201 /* MediaEditor in Frameworks */ = {isa = PBXBuildFile; productRef = 0CC390392C2EE6B30037C201 /* MediaEditor */; }; 0CD223DF2AA8ADFD002BD761 /* DashboardQuickActionsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CD223DE2AA8ADFD002BD761 /* DashboardQuickActionsViewModel.swift */; }; 0CD223E02AA8ADFD002BD761 /* DashboardQuickActionsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CD223DE2AA8ADFD002BD761 /* DashboardQuickActionsViewModel.swift */; }; 0CD382832A4B699E00612173 /* DashboardBlazeCardCellViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CD382822A4B699E00612173 /* DashboardBlazeCardCellViewModel.swift */; }; @@ -11879,6 +11881,7 @@ 0C0DF8802C2DDD5100011B7D /* WordPressShared in Frameworks */, 4A2A359E2C23635D00F47E9C /* Gridicons in Frameworks */, 1DF7A0CD2B9F66970003CBA3 /* SwiftSoup in Frameworks */, + 0CC3903A2C2EE6B30037C201 /* MediaEditor in Frameworks */, 17A8858D2757B97F0071FCA3 /* AutomatticAbout in Frameworks */, FF4DEAD8244B56E300ACA032 /* CoreServices.framework in Frameworks */, A1C54EBE8C34FFD5015F8FC9 /* Pods_Apps_WordPress.framework in Frameworks */, @@ -12092,6 +12095,7 @@ 0CD9FB872AFA71B9009D9C7A /* DGCharts in Frameworks */, FABB262C2602FC2C00C8785C /* UIKit.framework in Frameworks */, 4A972D3A2C23A3B0006AE0F0 /* ZendeskSupportSDK in Frameworks */, + 0C3060242C2EE6340096D0F6 /* MediaEditor in Frameworks */, 4A972D3C2C23A3D2006AE0F0 /* Reachability in Frameworks */, 0C0DF8642C2DBF1500011B7D /* WordPressShared in Frameworks */, FABB262D2602FC2C00C8785C /* QuartzCore.framework in Frameworks */, @@ -22981,6 +22985,7 @@ 4A0CB2842C238B7800A006B0 /* CocoaLumberjackSwift */, 0C0DF87D2C2DDD4900011B7D /* WordPressUI */, 0C0DF87F2C2DDD5100011B7D /* WordPressShared */, + 0CC390392C2EE6B30037C201 /* MediaEditor */, ); productName = WordPress; productReference = 1D6058910D05DD3D006BFB54 /* WordPress.app */; @@ -23408,6 +23413,7 @@ 4A972D3D2C23A3ED006AE0F0 /* Starscream */, 0C86B1A02C2DB2A7001AB70C /* WordPressUI */, 0C0DF8632C2DBF1500011B7D /* WordPressShared */, + 0C3060232C2EE6340096D0F6 /* MediaEditor */, ); productName = WordPress; productReference = FABB26522602FC2C00C8785C /* Jetpack.app */; @@ -23662,6 +23668,7 @@ 4A0CB27B2C23883B00A006B0 /* XCRemoteSwiftPackageReference "CocoaLumberjack" */, 0C86B19F2C2DB2A7001AB70C /* XCRemoteSwiftPackageReference "WordPressUI-iOS" */, 0C0DF8622C2DBF1500011B7D /* XCRemoteSwiftPackageReference "WordPress-iOS-Shared" */, + 0C3060222C2EE6340096D0F6 /* XCRemoteSwiftPackageReference "MediaEditor-iOS" */, ); productRefGroup = 19C28FACFE9D520D11CA2CBB /* Products */; projectDirPath = ""; @@ -25222,24 +25229,14 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Apps-WordPress/Pods-Apps-WordPress-resources.sh", - "${PODS_CONFIGURATION_BUILD_DIR}/CropViewController/TOCropViewControllerBundle.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/GravatarUI/GravatarUI.bundle", - "${BUILT_PRODUCTS_DIR}/MediaEditor/MediaEditor.framework/MediaEditorDrawing.storyboardc", - "${BUILT_PRODUCTS_DIR}/MediaEditor/MediaEditor.framework/MediaEditorFilters.storyboardc", - "${BUILT_PRODUCTS_DIR}/MediaEditor/MediaEditor.framework/MediaEditorHub.storyboardc", - "${PODS_CONFIGURATION_BUILD_DIR}/MediaEditor/MediaEditor.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/WordPress-Aztec-iOS/WordPress-Aztec-iOS.bundle", "${PODS_ROOT}/WordPress-Editor-iOS/WordPressEditor/WordPressEditor/Assets/aztec.png", "${PODS_CONFIGURATION_BUILD_DIR}/AppCenter/AppCenterDistributeResources.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GravatarUI.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MediaEditorDrawing.storyboardc", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MediaEditorFilters.storyboardc", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MediaEditorHub.storyboardc", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MediaEditor.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WordPress-Aztec-iOS.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/aztec.png", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AppCenterDistributeResources.bundle", @@ -25473,24 +25470,14 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Apps-Jetpack/Pods-Apps-Jetpack-resources.sh", - "${PODS_CONFIGURATION_BUILD_DIR}/CropViewController/TOCropViewControllerBundle.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/GravatarUI/GravatarUI.bundle", - "${BUILT_PRODUCTS_DIR}/MediaEditor/MediaEditor.framework/MediaEditorDrawing.storyboardc", - "${BUILT_PRODUCTS_DIR}/MediaEditor/MediaEditor.framework/MediaEditorFilters.storyboardc", - "${BUILT_PRODUCTS_DIR}/MediaEditor/MediaEditor.framework/MediaEditorHub.storyboardc", - "${PODS_CONFIGURATION_BUILD_DIR}/MediaEditor/MediaEditor.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/WordPress-Aztec-iOS/WordPress-Aztec-iOS.bundle", "${PODS_ROOT}/WordPress-Editor-iOS/WordPressEditor/WordPressEditor/Assets/aztec.png", "${PODS_CONFIGURATION_BUILD_DIR}/AppCenter/AppCenterDistributeResources.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GravatarUI.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MediaEditorDrawing.storyboardc", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MediaEditorFilters.storyboardc", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MediaEditorHub.storyboardc", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MediaEditor.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WordPress-Aztec-iOS.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/aztec.png", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AppCenterDistributeResources.bundle", @@ -36400,6 +36387,14 @@ kind = branch; }; }; + 0C3060222C2EE6340096D0F6 /* XCRemoteSwiftPackageReference "MediaEditor-iOS" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/wordpress-mobile/MediaEditor-iOS"; + requirement = { + branch = "task/spm-support"; + kind = branch; + }; + }; 0C86B19F2C2DB2A7001AB70C /* XCRemoteSwiftPackageReference "WordPressUI-iOS" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/wordpress-mobile/WordPressUI-iOS"; @@ -36784,6 +36779,11 @@ package = 0C86B19F2C2DB2A7001AB70C /* XCRemoteSwiftPackageReference "WordPressUI-iOS" */; productName = WordPressUI; }; + 0C3060232C2EE6340096D0F6 /* MediaEditor */ = { + isa = XCSwiftPackageProductDependency; + package = 0C3060222C2EE6340096D0F6 /* XCRemoteSwiftPackageReference "MediaEditor-iOS" */; + productName = MediaEditor; + }; 0C86B1A02C2DB2A7001AB70C /* WordPressUI */ = { isa = XCSwiftPackageProductDependency; package = 0C86B19F2C2DB2A7001AB70C /* XCRemoteSwiftPackageReference "WordPressUI-iOS" */; @@ -36794,6 +36794,11 @@ package = 0C86B19F2C2DB2A7001AB70C /* XCRemoteSwiftPackageReference "WordPressUI-iOS" */; productName = WordPressUI; }; + 0CC390392C2EE6B30037C201 /* MediaEditor */ = { + isa = XCSwiftPackageProductDependency; + package = 0C3060222C2EE6340096D0F6 /* XCRemoteSwiftPackageReference "MediaEditor-iOS" */; + productName = MediaEditor; + }; 0CD9FB862AFA71B9009D9C7A /* DGCharts */ = { isa = XCSwiftPackageProductDependency; package = 0CD9FB852AFA71B9009D9C7A /* XCRemoteSwiftPackageReference "Charts" */; From 0eb5f47782b30ff935bf9b6edf6ae345bcbd81d8 Mon Sep 17 00:00:00 2001 From: kean Date: Fri, 28 Jun 2024 14:23:18 -0400 Subject: [PATCH 2/4] Link Aztec dynamically --- Podfile | 33 ----- Podfile.lock | 2 +- WordPress/WordPress.xcodeproj/project.pbxproj | 128 ++++-------------- 3 files changed, 27 insertions(+), 136 deletions(-) diff --git a/Podfile b/Podfile index a9cfeb692b1a..b6ee49f6dd0a 100644 --- a/Podfile +++ b/Podfile @@ -125,39 +125,6 @@ abstract_target 'Tools' do pod 'SwiftLint', swiftlint_version end -# Static Frameworks: -# ============ -# -# Make all pods that are not shared across multiple targets into static frameworks by overriding the static_framework? function to return true -# 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] -# Statically linking Sentry results in a conflict with `NSDictionary.objectAtKeyPath`, but dynamically -# linking it resolves this. -dyanmic_framework_pods += %w[Sentry SentryPrivate] -pre_install do |installer| - static = [] - dynamic = [] - installer.pod_targets.each do |pod| - use_dynamic_frameworks = false - use_dynamic_frameworks = true if dyanmic_framework_pods.include? pod.name - - # If this pod is a dependency of one of our shared targets, it must be linked dynamically - use_dynamic_frameworks = true if pod.target_definitions.any? { |t| shared_targets.include? t.name } - - if use_dynamic_frameworks - dynamic << pod - pod.instance_variable_set(:@build_type, Pod::BuildType.dynamic_framework) - else - static << pod - pod.instance_variable_set(:@build_type, Pod::BuildType.static_framework) - end - end - puts "Installing #{static.count} pods as static frameworks" - puts "Installing #{dynamic.count} pods as dynamic frameworks" -end - post_install do |installer| gutenberg_post_install(installer: installer) diff --git a/Podfile.lock b/Podfile.lock index 0ef0528e1dd8..b61d3d3cba31 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -61,6 +61,6 @@ SPEC CHECKSUMS: WordPress-Aztec-iOS: 3732c6d865a5c9f35788377bdeda8a80ea10d0a1 WordPress-Editor-iOS: 453345420ced3d3ef20f0051b3df46ff10281e0c -PODFILE CHECKSUM: d26534cea122909b5ab54180ec284f286a3d3645 +PODFILE CHECKSUM: bea840133d26465e2a9bed7bce2663da40746848 COCOAPODS: 1.15.2 diff --git a/WordPress/WordPress.xcodeproj/project.pbxproj b/WordPress/WordPress.xcodeproj/project.pbxproj index ec8c09f6bc7e..48e3f80818ec 100644 --- a/WordPress/WordPress.xcodeproj/project.pbxproj +++ b/WordPress/WordPress.xcodeproj/project.pbxproj @@ -13282,7 +13282,7 @@ path = Classes; sourceTree = ""; }; - 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { + 29B97314FDCFA39411CA2CEA = { isa = PBXGroup; children = ( 3F20FDF3276BF21000DA3CAD /* Packages */, @@ -23162,7 +23162,6 @@ 7457666E202B558C00F42E40 /* Sources */, 7457666F202B558C00F42E40 /* Frameworks */, 74576670202B558C00F42E40 /* Resources */, - 9D186898B0632AA1273C9DE2 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -23191,7 +23190,6 @@ 809620D128E540D700940A5D /* Sources */, 8096211428E540D700940A5D /* Frameworks */, 8096211628E540D700940A5D /* Resources */, - 4C304224F0F810A17D96A402 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -23220,7 +23218,6 @@ 8096213228E55C9400940A5D /* Sources */, 8096217528E55C9400940A5D /* Frameworks */, 8096217728E55C9400940A5D /* Resources */, - D880C306E1943EA76DA53078 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -23289,7 +23286,6 @@ 932225A31C7CE50300443B02 /* Sources */, 932225A41C7CE50300443B02 /* Frameworks */, 932225A51C7CE50300443B02 /* Resources */, - 83D79708413A3DA10638659F /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -23635,7 +23631,7 @@ bg, sk, ); - mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */; + mainGroup = 29B97314FDCFA39411CA2CEA; packageReferences = ( 3FF1442E266F3C2400138163 /* XCRemoteSwiftPackageReference "ScreenObject" */, 3FC2C33B26C4CF0A00C6D98F /* XCRemoteSwiftPackageReference "XCUITestHelpers" */, @@ -25057,11 +25053,21 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Apps-WordPress/Pods-Apps-WordPress-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/FSInteractiveMap/FSInteractiveMap.framework", + "${BUILT_PRODUCTS_DIR}/Gravatar/Gravatar.framework", + "${BUILT_PRODUCTS_DIR}/GravatarUI/GravatarUI.framework", + "${BUILT_PRODUCTS_DIR}/WordPress-Aztec-iOS/Aztec.framework", + "${BUILT_PRODUCTS_DIR}/WordPress-Editor-iOS/WordPressEditor.framework", "${PODS_XCFRAMEWORKS_BUILD_DIR}/Gutenberg/Gutenberg.framework/Gutenberg", "${PODS_XCFRAMEWORKS_BUILD_DIR}/Gutenberg/hermes.framework/hermes", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FSInteractiveMap.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Gravatar.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GravatarUI.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Aztec.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WordPressEditor.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Gutenberg.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework", ); @@ -25110,26 +25116,6 @@ shellScript = "$SRCROOT/../Scripts/BuildPhases/ConfigureSimulatorForUITesting.sh\n"; showEnvVarsInLog = 0; }; - 4C304224F0F810A17D96A402 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-JetpackShareExtension/Pods-JetpackShareExtension-resources.sh", - "${PODS_CONFIGURATION_BUILD_DIR}/WordPress-Aztec-iOS/WordPress-Aztec-iOS.bundle", - "${PODS_ROOT}/WordPress-Editor-iOS/WordPressEditor/WordPressEditor/Assets/aztec.png", - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WordPress-Aztec-iOS.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/aztec.png", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-JetpackShareExtension/Pods-JetpackShareExtension-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; 4F4D5C2BB6478A3E90ADC3C5 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -25202,26 +25188,6 @@ shellPath = /bin/sh; shellScript = "#!/bin/sh\n\n# This script adds the version number to the icon of internal releases.\n\nexport PATH=/opt/local/bin/:/opt/local/sbin:$PATH:/usr/local/bin:\nif [ \"${CONFIGURATION}\" != \"Release-Internal\" ]; then\nexit 0;\nfi\n\nsh ../Scripts/BuildPhases/AddVersionToIcons.sh\n"; }; - 83D79708413A3DA10638659F /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-WordPressShareExtension/Pods-WordPressShareExtension-resources.sh", - "${PODS_CONFIGURATION_BUILD_DIR}/WordPress-Aztec-iOS/WordPress-Aztec-iOS.bundle", - "${PODS_ROOT}/WordPress-Editor-iOS/WordPressEditor/WordPressEditor/Assets/aztec.png", - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WordPress-Aztec-iOS.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/aztec.png", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-WordPressShareExtension/Pods-WordPressShareExtension-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; 920B9A6DAD47189622A86A9C /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -25229,16 +25195,10 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Apps-WordPress/Pods-Apps-WordPress-resources.sh", - "${PODS_CONFIGURATION_BUILD_DIR}/GravatarUI/GravatarUI.bundle", - "${PODS_CONFIGURATION_BUILD_DIR}/WordPress-Aztec-iOS/WordPress-Aztec-iOS.bundle", - "${PODS_ROOT}/WordPress-Editor-iOS/WordPressEditor/WordPressEditor/Assets/aztec.png", "${PODS_CONFIGURATION_BUILD_DIR}/AppCenter/AppCenterDistributeResources.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GravatarUI.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WordPress-Aztec-iOS.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/aztec.png", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AppCenterDistributeResources.bundle", ); runOnlyForDeploymentPostprocessing = 0; @@ -25246,26 +25206,6 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Apps-WordPress/Pods-Apps-WordPress-resources.sh\"\n"; showEnvVarsInLog = 0; }; - 9D186898B0632AA1273C9DE2 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-WordPressDraftActionExtension/Pods-WordPressDraftActionExtension-resources.sh", - "${PODS_CONFIGURATION_BUILD_DIR}/WordPress-Aztec-iOS/WordPress-Aztec-iOS.bundle", - "${PODS_ROOT}/WordPress-Editor-iOS/WordPressEditor/WordPressEditor/Assets/aztec.png", - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WordPress-Aztec-iOS.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/aztec.png", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-WordPressDraftActionExtension/Pods-WordPressDraftActionExtension-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; A279580D198819F50031C6A3 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -25280,26 +25220,6 @@ shellScript = "# sh ../run-oclint.sh \nsh ../Scripts/run-oclint.sh"; showEnvVarsInLog = 0; }; - D880C306E1943EA76DA53078 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-JetpackDraftActionExtension/Pods-JetpackDraftActionExtension-resources.sh", - "${PODS_CONFIGURATION_BUILD_DIR}/WordPress-Aztec-iOS/WordPress-Aztec-iOS.bundle", - "${PODS_ROOT}/WordPress-Editor-iOS/WordPressEditor/WordPressEditor/Assets/aztec.png", - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WordPress-Aztec-iOS.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/aztec.png", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-JetpackDraftActionExtension/Pods-JetpackDraftActionExtension-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; E00F6488DE2D86BDC84FBB0B /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -25342,11 +25262,11 @@ files = ( ); inputPaths = ( - $SRCROOT/../Scripts/BuildPhases/CopyGutenbergJS.inputs.xcfilelist, + "$SRCROOT/../Scripts/BuildPhases/CopyGutenbergJS.inputs.xcfilelist", ); name = "Copy Gutenberg JS"; outputFileListPaths = ( - $SRCROOT/../Scripts/BuildPhases/CopyGutenbergJS.outputs.xcfilelist, + "$SRCROOT/../Scripts/BuildPhases/CopyGutenbergJS.outputs.xcfilelist", ); outputPaths = ( "", @@ -25450,11 +25370,21 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Apps-Jetpack/Pods-Apps-Jetpack-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/FSInteractiveMap/FSInteractiveMap.framework", + "${BUILT_PRODUCTS_DIR}/Gravatar/Gravatar.framework", + "${BUILT_PRODUCTS_DIR}/GravatarUI/GravatarUI.framework", + "${BUILT_PRODUCTS_DIR}/WordPress-Aztec-iOS/Aztec.framework", + "${BUILT_PRODUCTS_DIR}/WordPress-Editor-iOS/WordPressEditor.framework", "${PODS_XCFRAMEWORKS_BUILD_DIR}/Gutenberg/Gutenberg.framework/Gutenberg", "${PODS_XCFRAMEWORKS_BUILD_DIR}/Gutenberg/hermes.framework/hermes", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FSInteractiveMap.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Gravatar.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GravatarUI.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Aztec.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WordPressEditor.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Gutenberg.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework", ); @@ -25470,16 +25400,10 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Apps-Jetpack/Pods-Apps-Jetpack-resources.sh", - "${PODS_CONFIGURATION_BUILD_DIR}/GravatarUI/GravatarUI.bundle", - "${PODS_CONFIGURATION_BUILD_DIR}/WordPress-Aztec-iOS/WordPress-Aztec-iOS.bundle", - "${PODS_ROOT}/WordPress-Editor-iOS/WordPressEditor/WordPressEditor/Assets/aztec.png", "${PODS_CONFIGURATION_BUILD_DIR}/AppCenter/AppCenterDistributeResources.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GravatarUI.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WordPress-Aztec-iOS.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/aztec.png", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AppCenterDistributeResources.bundle", ); runOnlyForDeploymentPostprocessing = 0; @@ -25493,13 +25417,13 @@ files = ( ); inputFileListPaths = ( - $SRCROOT/../Scripts/BuildPhases/CopyGutenbergJS.inputs.xcfilelist, + "$SRCROOT/../Scripts/BuildPhases/CopyGutenbergJS.inputs.xcfilelist", ); inputPaths = ( ); name = "Copy Gutenberg JS"; outputFileListPaths = ( - $SRCROOT/../Scripts/BuildPhases/CopyGutenbergJS.outputs.xcfilelist, + "$SRCROOT/../Scripts/BuildPhases/CopyGutenbergJS.outputs.xcfilelist", ); outputPaths = ( ); From 0974ae93a7b43e369432df3bbb988ad4545f1fc9 Mon Sep 17 00:00:00 2001 From: kean Date: Tue, 2 Jul 2024 15:18:25 -0400 Subject: [PATCH 3/4] Install Gravatar using SPM --- Podfile | 11 ----- Podfile.lock | 11 +---- .../xcshareddata/swiftpm/Package.resolved | 9 ++++ .../Me/Views/Header/MeHeaderView.m | 2 +- WordPress/WordPress.xcodeproj/project.pbxproj | 49 ++++++++++++++++--- 5 files changed, 52 insertions(+), 30 deletions(-) diff --git a/Podfile b/Podfile index b6ee49f6dd0a..e3f0d3f25b69 100644 --- a/Podfile +++ b/Podfile @@ -29,15 +29,6 @@ def aztec pod 'WordPress-Editor-iOS', '~> 1.19.11' end -def gravatar - # pod 'Gravatar', path: '../Gravatar-SDK-iOS' - # pod 'GravatarUI', path: '../Gravatar-SDK-iOS' - # pod 'Gravatar', git: 'https://github.com/Automattic/Gravatar-SDK-iOS', commit: '' - # pod 'GravatarUI', git: 'https://github.com/Automattic/Gravatar-SDK-iOS', commit: '' - pod 'Gravatar', '2.0.0' - pod 'GravatarUI', '2.0.0' -end - abstract_target 'Apps' do project 'WordPress/WordPress.xcodeproj' @@ -60,8 +51,6 @@ abstract_target 'Apps' do ## Automattic libraries ## ==================== ## - gravatar - aztec ## WordPress App iOS diff --git a/Podfile.lock b/Podfile.lock index b61d3d3cba31..d4f337d347a5 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -10,9 +10,6 @@ PODS: - AppCenter/Distribute (5.0.4): - AppCenter/Core - FSInteractiveMap (0.1.0) - - Gravatar (2.0.0) - - GravatarUI (2.0.0): - - Gravatar (= 2.0.0) - Gutenberg (1.120.1) - SwiftLint (0.54.0) - WordPress-Aztec-iOS (1.19.11) @@ -23,8 +20,6 @@ DEPENDENCIES: - AppCenter (~> 5.0) - AppCenter/Distribute (~> 5.0) - 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`) - SwiftLint (= 0.54.0) - WordPress-Editor-iOS (~> 1.19.11) @@ -35,8 +30,6 @@ SPEC REPOS: - WordPress-Editor-iOS trunk: - AppCenter - - Gravatar - - GravatarUI - SwiftLint EXTERNAL SOURCES: @@ -54,13 +47,11 @@ CHECKOUT OPTIONS: SPEC CHECKSUMS: AppCenter: 85c92db0759d2792a65eb61d6842d2e86611a49a FSInteractiveMap: a396f610f48b76cb540baa87139d056429abda86 - Gravatar: 54fc63ea6298e9afca7329007815be25868f1dfe - GravatarUI: bb5e03cda2da61e54aa1c20d4dde32b7153fa8b4 Gutenberg: 0699e7dd207afb591ccd5e81252a92e6e7781391 SwiftLint: c1de071d9d08c8aba837545f6254315bc900e211 WordPress-Aztec-iOS: 3732c6d865a5c9f35788377bdeda8a80ea10d0a1 WordPress-Editor-iOS: 453345420ced3d3ef20f0051b3df46ff10281e0c -PODFILE CHECKSUM: bea840133d26465e2a9bed7bce2663da40746848 +PODFILE CHECKSUM: 3bda7c5b90ba3f24024e44710eb54cc00a48e81b COCOAPODS: 1.15.2 diff --git a/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved b/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved index f7c614f08919..f1d8d7a0a736 100644 --- a/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -136,6 +136,15 @@ "version": "3.4.1" } }, + { + "package": "Gravatar", + "repositoryURL": "https://github.com/Automattic/Gravatar-SDK-iOS", + "state": { + "branch": null, + "revision": "337a2b639ecafc5159eb0d2af49391a95ad1637a", + "version": "2.1.0" + } + }, { "package": "Gridicons", "repositoryURL": "https://github.com/Automattic/Gridicons-iOS", diff --git a/WordPress/Classes/ViewRelated/Me/Views/Header/MeHeaderView.m b/WordPress/Classes/ViewRelated/Me/Views/Header/MeHeaderView.m index f0ab776ef55f..152005cbc6e2 100644 --- a/WordPress/Classes/ViewRelated/Me/Views/Header/MeHeaderView.m +++ b/WordPress/Classes/ViewRelated/Me/Views/Header/MeHeaderView.m @@ -1,9 +1,9 @@ #import "MeHeaderView.h" #import "Blog.h" #import "WordPress-Swift.h" -#import "Gravatar-Swift.h" @import WordPressShared; +@import Gravatar; const CGFloat MeHeaderViewHeight = 154; const CGFloat MeHeaderViewGravatarSize = 64.0; diff --git a/WordPress/WordPress.xcodeproj/project.pbxproj b/WordPress/WordPress.xcodeproj/project.pbxproj index 48e3f80818ec..67b7676d0b02 100644 --- a/WordPress/WordPress.xcodeproj/project.pbxproj +++ b/WordPress/WordPress.xcodeproj/project.pbxproj @@ -448,6 +448,10 @@ 0C0AE75A2A8FAD6A007D9D6C /* MediaPickerMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C0AE7582A8FAD6A007D9D6C /* MediaPickerMenu.swift */; }; 0C0D3B0D2A4C79DE0050A00D /* BlazeCampaignsStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C0D3B0C2A4C79DE0050A00D /* BlazeCampaignsStream.swift */; }; 0C0D3B0E2A4C79DE0050A00D /* BlazeCampaignsStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C0D3B0C2A4C79DE0050A00D /* BlazeCampaignsStream.swift */; }; + 0C0DB38C2C3486F700F21218 /* Gravatar in Frameworks */ = {isa = PBXBuildFile; productRef = 0C0DB38B2C3486F700F21218 /* Gravatar */; }; + 0C0DB38E2C3486F700F21218 /* GravatarUI in Frameworks */ = {isa = PBXBuildFile; productRef = 0C0DB38D2C3486F700F21218 /* GravatarUI */; }; + 0C0DB3902C34870600F21218 /* Gravatar in Frameworks */ = {isa = PBXBuildFile; productRef = 0C0DB38F2C34870600F21218 /* Gravatar */; }; + 0C0DB3922C34870600F21218 /* GravatarUI in Frameworks */ = {isa = PBXBuildFile; productRef = 0C0DB3912C34870600F21218 /* GravatarUI */; }; 0C0DF85B2C2DB5EC00011B7D /* WordPressUI in Frameworks */ = {isa = PBXBuildFile; productRef = 0C0DF85A2C2DB5EC00011B7D /* WordPressUI */; }; 0C0DF85D2C2DB60100011B7D /* WordPressUI in Frameworks */ = {isa = PBXBuildFile; productRef = 0C0DF85C2C2DB60100011B7D /* WordPressUI */; }; 0C0DF85F2C2DB61300011B7D /* WordPressUI in Frameworks */ = {isa = PBXBuildFile; productRef = 0C0DF85E2C2DB61300011B7D /* WordPressUI */; }; @@ -11861,6 +11865,7 @@ 4A0CB2852C238B7800A006B0 /* CocoaLumberjackSwift in Frameworks */, 4A3AB6512C22F6E8006E0FA8 /* SVProgressHUD in Frameworks */, 4A3E8C4D2C238471003628B3 /* Gifu in Frameworks */, + 0C0DB3902C34870600F21218 /* Gravatar in Frameworks */, 4AEB35C22C22E90300D5AE8C /* AutomatticEncryptedLogs in Frameworks */, E1A386CA14DB05F700954CF8 /* CoreMedia.framework in Frameworks */, E1A386C814DB05C300954CF8 /* AVFoundation.framework in Frameworks */, @@ -11878,6 +11883,7 @@ FD3D6D2C1349F5D30061136A /* ImageIO.framework in Frameworks */, B5AA54D51A8E7510003BDD12 /* WebKit.framework in Frameworks */, 93F2E5401E9E5A180050D489 /* libsqlite3.tbd in Frameworks */, + 0C0DB3922C34870600F21218 /* GravatarUI in Frameworks */, 0C0DF8802C2DDD5100011B7D /* WordPressShared in Frameworks */, 4A2A359E2C23635D00F47E9C /* Gridicons in Frameworks */, 1DF7A0CD2B9F66970003CBA3 /* SwiftSoup in Frameworks */, @@ -12083,6 +12089,7 @@ FABB26222602FC2C00C8785C /* CoreSpotlight.framework in Frameworks */, FABB26232602FC2C00C8785C /* QuickLook.framework in Frameworks */, 3F9F232D2B0B281400B56061 /* JetpackStatsWidgetsCore in Frameworks */, + 0C0DB38E2C3486F700F21218 /* GravatarUI in Frameworks */, FABB26242602FC2C00C8785C /* CoreText.framework in Frameworks */, FABB26252602FC2C00C8785C /* UserNotifications.framework in Frameworks */, FABB26262602FC2C00C8785C /* Photos.framework in Frameworks */, @@ -12110,6 +12117,7 @@ FABB26322602FC2C00C8785C /* Security.framework in Frameworks */, FABB26332602FC2C00C8785C /* MapKit.framework in Frameworks */, 4A972D002C239C50006AE0F0 /* AlamofireImage in Frameworks */, + 0C0DB38C2C3486F700F21218 /* Gravatar in Frameworks */, 4A972D082C239C79006AE0F0 /* Gifu in Frameworks */, FABB26342602FC2C00C8785C /* CoreLocation.framework in Frameworks */, FABB26352602FC2C00C8785C /* WordPressFlux in Frameworks */, @@ -22986,6 +22994,8 @@ 0C0DF87D2C2DDD4900011B7D /* WordPressUI */, 0C0DF87F2C2DDD5100011B7D /* WordPressShared */, 0CC390392C2EE6B30037C201 /* MediaEditor */, + 0C0DB38F2C34870600F21218 /* Gravatar */, + 0C0DB3912C34870600F21218 /* GravatarUI */, ); productName = WordPress; productReference = 1D6058910D05DD3D006BFB54 /* WordPress.app */; @@ -23410,6 +23420,8 @@ 0C86B1A02C2DB2A7001AB70C /* WordPressUI */, 0C0DF8632C2DBF1500011B7D /* WordPressShared */, 0C3060232C2EE6340096D0F6 /* MediaEditor */, + 0C0DB38B2C3486F700F21218 /* Gravatar */, + 0C0DB38D2C3486F700F21218 /* GravatarUI */, ); productName = WordPress; productReference = FABB26522602FC2C00C8785C /* Jetpack.app */; @@ -23665,6 +23677,7 @@ 0C86B19F2C2DB2A7001AB70C /* XCRemoteSwiftPackageReference "WordPressUI-iOS" */, 0C0DF8622C2DBF1500011B7D /* XCRemoteSwiftPackageReference "WordPress-iOS-Shared" */, 0C3060222C2EE6340096D0F6 /* XCRemoteSwiftPackageReference "MediaEditor-iOS" */, + 0C0DB38A2C3486F700F21218 /* XCRemoteSwiftPackageReference "Gravatar-SDK-iOS" */, ); productRefGroup = 19C28FACFE9D520D11CA2CBB /* Products */; projectDirPath = ""; @@ -25054,8 +25067,6 @@ inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Apps-WordPress/Pods-Apps-WordPress-frameworks.sh", "${BUILT_PRODUCTS_DIR}/FSInteractiveMap/FSInteractiveMap.framework", - "${BUILT_PRODUCTS_DIR}/Gravatar/Gravatar.framework", - "${BUILT_PRODUCTS_DIR}/GravatarUI/GravatarUI.framework", "${BUILT_PRODUCTS_DIR}/WordPress-Aztec-iOS/Aztec.framework", "${BUILT_PRODUCTS_DIR}/WordPress-Editor-iOS/WordPressEditor.framework", "${PODS_XCFRAMEWORKS_BUILD_DIR}/Gutenberg/Gutenberg.framework/Gutenberg", @@ -25064,8 +25075,6 @@ name = "[CP] Embed Pods Frameworks"; outputPaths = ( "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FSInteractiveMap.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Gravatar.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GravatarUI.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Aztec.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WordPressEditor.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Gutenberg.framework", @@ -25371,8 +25380,6 @@ inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Apps-Jetpack/Pods-Apps-Jetpack-frameworks.sh", "${BUILT_PRODUCTS_DIR}/FSInteractiveMap/FSInteractiveMap.framework", - "${BUILT_PRODUCTS_DIR}/Gravatar/Gravatar.framework", - "${BUILT_PRODUCTS_DIR}/GravatarUI/GravatarUI.framework", "${BUILT_PRODUCTS_DIR}/WordPress-Aztec-iOS/Aztec.framework", "${BUILT_PRODUCTS_DIR}/WordPress-Editor-iOS/WordPressEditor.framework", "${PODS_XCFRAMEWORKS_BUILD_DIR}/Gutenberg/Gutenberg.framework/Gutenberg", @@ -25381,8 +25388,6 @@ name = "[CP] Embed Pods Frameworks"; outputPaths = ( "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FSInteractiveMap.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Gravatar.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GravatarUI.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Aztec.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WordPressEditor.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Gutenberg.framework", @@ -36303,6 +36308,14 @@ /* End XCConfigurationList section */ /* Begin XCRemoteSwiftPackageReference section */ + 0C0DB38A2C3486F700F21218 /* XCRemoteSwiftPackageReference "Gravatar-SDK-iOS" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/Automattic/Gravatar-SDK-iOS"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 2.1.0; + }; + }; 0C0DF8622C2DBF1500011B7D /* XCRemoteSwiftPackageReference "WordPress-iOS-Shared" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/wordpress-mobile/WordPress-iOS-Shared"; @@ -36578,6 +36591,26 @@ isa = XCSwiftPackageProductDependency; productName = DesignSystem; }; + 0C0DB38B2C3486F700F21218 /* Gravatar */ = { + isa = XCSwiftPackageProductDependency; + package = 0C0DB38A2C3486F700F21218 /* XCRemoteSwiftPackageReference "Gravatar-SDK-iOS" */; + productName = Gravatar; + }; + 0C0DB38D2C3486F700F21218 /* GravatarUI */ = { + isa = XCSwiftPackageProductDependency; + package = 0C0DB38A2C3486F700F21218 /* XCRemoteSwiftPackageReference "Gravatar-SDK-iOS" */; + productName = GravatarUI; + }; + 0C0DB38F2C34870600F21218 /* Gravatar */ = { + isa = XCSwiftPackageProductDependency; + package = 0C0DB38A2C3486F700F21218 /* XCRemoteSwiftPackageReference "Gravatar-SDK-iOS" */; + productName = Gravatar; + }; + 0C0DB3912C34870600F21218 /* GravatarUI */ = { + isa = XCSwiftPackageProductDependency; + package = 0C0DB38A2C3486F700F21218 /* XCRemoteSwiftPackageReference "Gravatar-SDK-iOS" */; + productName = GravatarUI; + }; 0C0DF85A2C2DB5EC00011B7D /* WordPressUI */ = { isa = XCSwiftPackageProductDependency; package = 0C86B19F2C2DB2A7001AB70C /* XCRemoteSwiftPackageReference "WordPressUI-iOS" */; From 9ffd18c1b8afe95986c177632689a0f73fc15e80 Mon Sep 17 00:00:00 2001 From: kean Date: Tue, 2 Jul 2024 15:30:49 -0400 Subject: [PATCH 4/4] Install FSInteractiveMap using CocoaPods --- Podfile | 2 - Podfile.lock | 13 +----- .../xcshareddata/swiftpm/Package.resolved | 9 ++++ WordPress/WordPress.xcodeproj/project.pbxproj | 41 ++++++++++++++----- 4 files changed, 41 insertions(+), 24 deletions(-) diff --git a/Podfile b/Podfile index e3f0d3f25b69..f6dce3c72ada 100644 --- a/Podfile +++ b/Podfile @@ -46,8 +46,6 @@ abstract_target 'Apps' do pod 'AppCenter', app_center_version, configurations: app_center_configurations pod 'AppCenter/Distribute', app_center_version, configurations: app_center_configurations - pod 'FSInteractiveMap', git: 'https://github.com/wordpress-mobile/FSInteractiveMap.git', tag: '0.2.0' - ## Automattic libraries ## ==================== ## diff --git a/Podfile.lock b/Podfile.lock index d4f337d347a5..8fe6893e48ea 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -9,7 +9,6 @@ PODS: - AppCenter/Core - AppCenter/Distribute (5.0.4): - AppCenter/Core - - FSInteractiveMap (0.1.0) - Gutenberg (1.120.1) - SwiftLint (0.54.0) - WordPress-Aztec-iOS (1.19.11) @@ -19,7 +18,6 @@ PODS: DEPENDENCIES: - AppCenter (~> 5.0) - AppCenter/Distribute (~> 5.0) - - FSInteractiveMap (from `https://github.com/wordpress-mobile/FSInteractiveMap.git`, tag `0.2.0`) - Gutenberg (from `https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.120.1.podspec`) - SwiftLint (= 0.54.0) - WordPress-Editor-iOS (~> 1.19.11) @@ -33,25 +31,16 @@ SPEC REPOS: - SwiftLint EXTERNAL SOURCES: - FSInteractiveMap: - :git: https://github.com/wordpress-mobile/FSInteractiveMap.git - :tag: 0.2.0 Gutenberg: :podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.120.1.podspec -CHECKOUT OPTIONS: - FSInteractiveMap: - :git: https://github.com/wordpress-mobile/FSInteractiveMap.git - :tag: 0.2.0 - SPEC CHECKSUMS: AppCenter: 85c92db0759d2792a65eb61d6842d2e86611a49a - FSInteractiveMap: a396f610f48b76cb540baa87139d056429abda86 Gutenberg: 0699e7dd207afb591ccd5e81252a92e6e7781391 SwiftLint: c1de071d9d08c8aba837545f6254315bc900e211 WordPress-Aztec-iOS: 3732c6d865a5c9f35788377bdeda8a80ea10d0a1 WordPress-Editor-iOS: 453345420ced3d3ef20f0051b3df46ff10281e0c -PODFILE CHECKSUM: 3bda7c5b90ba3f24024e44710eb54cc00a48e81b +PODFILE CHECKSUM: 12f9ac933ee5c704604bf92375b97c4b6c04a8f3 COCOAPODS: 1.15.2 diff --git a/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved b/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved index f1d8d7a0a736..f16393ebbd67 100644 --- a/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/WordPress.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -127,6 +127,15 @@ "version": null } }, + { + "package": "FSInteractiveMap", + "repositoryURL": "https://github.com/wordpress-mobile/FSInteractiveMap/", + "state": { + "branch": null, + "revision": "3a05cd433c4f6bfe66f09253459cef2be058b3ec", + "version": "0.3.0" + } + }, { "package": "Gifu", "repositoryURL": "https://github.com/kaishin/Gifu", diff --git a/WordPress/WordPress.xcodeproj/project.pbxproj b/WordPress/WordPress.xcodeproj/project.pbxproj index 67b7676d0b02..a2670a95336d 100644 --- a/WordPress/WordPress.xcodeproj/project.pbxproj +++ b/WordPress/WordPress.xcodeproj/project.pbxproj @@ -523,6 +523,8 @@ 0C3C50432BA3A024002A37B4 /* PostNoticePublishSuccessView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C3C50412BA3A024002A37B4 /* PostNoticePublishSuccessView.swift */; }; 0C5751102B011468001074E5 /* RemoteConfigDebugView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C57510F2B011468001074E5 /* RemoteConfigDebugView.swift */; }; 0C5751112B011468001074E5 /* RemoteConfigDebugView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C57510F2B011468001074E5 /* RemoteConfigDebugView.swift */; }; + 0C5C56B72C348D1A0064CF19 /* FSInteractiveMap in Frameworks */ = {isa = PBXBuildFile; productRef = 0C5C56B62C348D1A0064CF19 /* FSInteractiveMap */; }; + 0C5C56B92C348D270064CF19 /* FSInteractiveMap in Frameworks */ = {isa = PBXBuildFile; productRef = 0C5C56B82C348D270064CF19 /* FSInteractiveMap */; }; 0C63266F2A3D1305000B8C57 /* GutenbergFilesAppMediaSourceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C63266E2A3D1305000B8C57 /* GutenbergFilesAppMediaSourceTests.swift */; }; 0C6C4CD02A4F0A000049E762 /* BlazeCampaignsStreamTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C6C4CCF2A4F0A000049E762 /* BlazeCampaignsStreamTests.swift */; }; 0C6C4CD42A4F0AD90049E762 /* blaze-search-page-1.json in Resources */ = {isa = PBXBuildFile; fileRef = 0C6C4CD32A4F0AD80049E762 /* blaze-search-page-1.json */; }; @@ -11857,6 +11859,7 @@ 3F411B6F28987E3F002513AE /* Lottie in Frameworks */, 374CB16215B93C0800DD0EBC /* AudioToolbox.framework in Frameworks */, E10B3655158F2D7800419A93 /* CoreGraphics.framework in Frameworks */, + 0C5C56B92C348D270064CF19 /* FSInteractiveMap in Frameworks */, E10B3654158F2D4500419A93 /* UIKit.framework in Frameworks */, E10B3652158F2D3F00419A93 /* QuartzCore.framework in Frameworks */, 0CD9FB892AFA71C2009D9C7A /* DGCharts in Frameworks */, @@ -12094,6 +12097,7 @@ FABB26252602FC2C00C8785C /* UserNotifications.framework in Frameworks */, FABB26262602FC2C00C8785C /* Photos.framework in Frameworks */, FABB26272602FC2C00C8785C /* NotificationCenter.framework in Frameworks */, + 0C5C56B72C348D1A0064CF19 /* FSInteractiveMap in Frameworks */, FABB26282602FC2C00C8785C /* CoreTelephony.framework in Frameworks */, FABB26292602FC2C00C8785C /* SystemConfiguration.framework in Frameworks */, 08E63FCD2B28E52B00747E21 /* DesignSystem in Frameworks */, @@ -13290,7 +13294,7 @@ path = Classes; sourceTree = ""; }; - 29B97314FDCFA39411CA2CEA = { + 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { isa = PBXGroup; children = ( 3F20FDF3276BF21000DA3CAD /* Packages */, @@ -22996,6 +23000,7 @@ 0CC390392C2EE6B30037C201 /* MediaEditor */, 0C0DB38F2C34870600F21218 /* Gravatar */, 0C0DB3912C34870600F21218 /* GravatarUI */, + 0C5C56B82C348D270064CF19 /* FSInteractiveMap */, ); productName = WordPress; productReference = 1D6058910D05DD3D006BFB54 /* WordPress.app */; @@ -23422,6 +23427,7 @@ 0C3060232C2EE6340096D0F6 /* MediaEditor */, 0C0DB38B2C3486F700F21218 /* Gravatar */, 0C0DB38D2C3486F700F21218 /* GravatarUI */, + 0C5C56B62C348D1A0064CF19 /* FSInteractiveMap */, ); productName = WordPress; productReference = FABB26522602FC2C00C8785C /* Jetpack.app */; @@ -23643,7 +23649,7 @@ bg, sk, ); - mainGroup = 29B97314FDCFA39411CA2CEA; + mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */; packageReferences = ( 3FF1442E266F3C2400138163 /* XCRemoteSwiftPackageReference "ScreenObject" */, 3FC2C33B26C4CF0A00C6D98F /* XCRemoteSwiftPackageReference "XCUITestHelpers" */, @@ -23678,6 +23684,7 @@ 0C0DF8622C2DBF1500011B7D /* XCRemoteSwiftPackageReference "WordPress-iOS-Shared" */, 0C3060222C2EE6340096D0F6 /* XCRemoteSwiftPackageReference "MediaEditor-iOS" */, 0C0DB38A2C3486F700F21218 /* XCRemoteSwiftPackageReference "Gravatar-SDK-iOS" */, + 0C5C56B52C348D1A0064CF19 /* XCRemoteSwiftPackageReference "FSInteractiveMap" */, ); productRefGroup = 19C28FACFE9D520D11CA2CBB /* Products */; projectDirPath = ""; @@ -25066,7 +25073,6 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Apps-WordPress/Pods-Apps-WordPress-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/FSInteractiveMap/FSInteractiveMap.framework", "${BUILT_PRODUCTS_DIR}/WordPress-Aztec-iOS/Aztec.framework", "${BUILT_PRODUCTS_DIR}/WordPress-Editor-iOS/WordPressEditor.framework", "${PODS_XCFRAMEWORKS_BUILD_DIR}/Gutenberg/Gutenberg.framework/Gutenberg", @@ -25074,7 +25080,6 @@ ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FSInteractiveMap.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Aztec.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WordPressEditor.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Gutenberg.framework", @@ -25271,11 +25276,11 @@ files = ( ); inputPaths = ( - "$SRCROOT/../Scripts/BuildPhases/CopyGutenbergJS.inputs.xcfilelist", + $SRCROOT/../Scripts/BuildPhases/CopyGutenbergJS.inputs.xcfilelist, ); name = "Copy Gutenberg JS"; outputFileListPaths = ( - "$SRCROOT/../Scripts/BuildPhases/CopyGutenbergJS.outputs.xcfilelist", + $SRCROOT/../Scripts/BuildPhases/CopyGutenbergJS.outputs.xcfilelist, ); outputPaths = ( "", @@ -25379,7 +25384,6 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Apps-Jetpack/Pods-Apps-Jetpack-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/FSInteractiveMap/FSInteractiveMap.framework", "${BUILT_PRODUCTS_DIR}/WordPress-Aztec-iOS/Aztec.framework", "${BUILT_PRODUCTS_DIR}/WordPress-Editor-iOS/WordPressEditor.framework", "${PODS_XCFRAMEWORKS_BUILD_DIR}/Gutenberg/Gutenberg.framework/Gutenberg", @@ -25387,7 +25391,6 @@ ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FSInteractiveMap.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Aztec.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WordPressEditor.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Gutenberg.framework", @@ -25422,13 +25425,13 @@ files = ( ); inputFileListPaths = ( - "$SRCROOT/../Scripts/BuildPhases/CopyGutenbergJS.inputs.xcfilelist", + $SRCROOT/../Scripts/BuildPhases/CopyGutenbergJS.inputs.xcfilelist, ); inputPaths = ( ); name = "Copy Gutenberg JS"; outputFileListPaths = ( - "$SRCROOT/../Scripts/BuildPhases/CopyGutenbergJS.outputs.xcfilelist", + $SRCROOT/../Scripts/BuildPhases/CopyGutenbergJS.outputs.xcfilelist, ); outputPaths = ( ); @@ -36332,6 +36335,14 @@ kind = branch; }; }; + 0C5C56B52C348D1A0064CF19 /* XCRemoteSwiftPackageReference "FSInteractiveMap" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/wordpress-mobile/FSInteractiveMap/"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 0.3.0; + }; + }; 0C86B19F2C2DB2A7001AB70C /* XCRemoteSwiftPackageReference "WordPressUI-iOS" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/wordpress-mobile/WordPressUI-iOS"; @@ -36741,6 +36752,16 @@ package = 0C3060222C2EE6340096D0F6 /* XCRemoteSwiftPackageReference "MediaEditor-iOS" */; productName = MediaEditor; }; + 0C5C56B62C348D1A0064CF19 /* FSInteractiveMap */ = { + isa = XCSwiftPackageProductDependency; + package = 0C5C56B52C348D1A0064CF19 /* XCRemoteSwiftPackageReference "FSInteractiveMap" */; + productName = FSInteractiveMap; + }; + 0C5C56B82C348D270064CF19 /* FSInteractiveMap */ = { + isa = XCSwiftPackageProductDependency; + package = 0C5C56B52C348D1A0064CF19 /* XCRemoteSwiftPackageReference "FSInteractiveMap" */; + productName = FSInteractiveMap; + }; 0C86B1A02C2DB2A7001AB70C /* WordPressUI */ = { isa = XCSwiftPackageProductDependency; package = 0C86B19F2C2DB2A7001AB70C /* XCRemoteSwiftPackageReference "WordPressUI-iOS" */;