Skip to content

Commit 0eb5f47

Browse files
keankean
committed
Link Aztec dynamically
1 parent e4c598b commit 0eb5f47

File tree

3 files changed

+27
-136
lines changed

3 files changed

+27
-136
lines changed

‎Podfile‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -125,39 +125,6 @@ abstract_target 'Tools' do
125125
pod 'SwiftLint', swiftlint_version
126126
end
127127

128-
# Static Frameworks:
129-
# ============
130-
#
131-
# Make all pods that are not shared across multiple targets into static frameworks by overriding the static_framework? function to return true
132-
# Linking the shared frameworks statically would lead to duplicate symbols
133-
# A future version of CocoaPods may make this easier to do. See https://github.com/CocoaPods/CocoaPods/issues/7428
134-
shared_targets = %w[WordPressFlux]
135-
dyanmic_framework_pods = %w[WordPressFlux]
136-
# Statically linking Sentry results in a conflict with `NSDictionary.objectAtKeyPath`, but dynamically
137-
# linking it resolves this.
138-
dyanmic_framework_pods += %w[Sentry SentryPrivate]
139-
pre_install do |installer|
140-
static = []
141-
dynamic = []
142-
installer.pod_targets.each do |pod|
143-
use_dynamic_frameworks = false
144-
use_dynamic_frameworks = true if dyanmic_framework_pods.include? pod.name
145-
146-
# If this pod is a dependency of one of our shared targets, it must be linked dynamically
147-
use_dynamic_frameworks = true if pod.target_definitions.any? { |t| shared_targets.include? t.name }
148-
149-
if use_dynamic_frameworks
150-
dynamic << pod
151-
pod.instance_variable_set(:@build_type, Pod::BuildType.dynamic_framework)
152-
else
153-
static << pod
154-
pod.instance_variable_set(:@build_type, Pod::BuildType.static_framework)
155-
end
156-
end
157-
puts "Installing #{static.count} pods as static frameworks"
158-
puts "Installing #{dynamic.count} pods as dynamic frameworks"
159-
end
160-
161128
post_install do |installer|
162129
gutenberg_post_install(installer: installer)
163130

‎Podfile.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,6 @@ SPEC CHECKSUMS:
6161
WordPress-Aztec-iOS: 3732c6d865a5c9f35788377bdeda8a80ea10d0a1
6262
WordPress-Editor-iOS: 453345420ced3d3ef20f0051b3df46ff10281e0c
6363

64-
PODFILE CHECKSUM: d26534cea122909b5ab54180ec284f286a3d3645
64+
PODFILE CHECKSUM: bea840133d26465e2a9bed7bce2663da40746848
6565

6666
COCOAPODS: 1.15.2

‎WordPress/WordPress.xcodeproj/project.pbxproj‎

Lines changed: 26 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -13282,7 +13282,7 @@
1328213282
path = Classes;
1328313283
sourceTree = "<group>";
1328413284
};
13285-
29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
13285+
29B97314FDCFA39411CA2CEA = {
1328613286
isa = PBXGroup;
1328713287
children = (
1328813288
3F20FDF3276BF21000DA3CAD /* Packages */,
@@ -23162,7 +23162,6 @@
2316223162
7457666E202B558C00F42E40 /* Sources */,
2316323163
7457666F202B558C00F42E40 /* Frameworks */,
2316423164
74576670202B558C00F42E40 /* Resources */,
23165-
9D186898B0632AA1273C9DE2 /* [CP] Copy Pods Resources */,
2316623165
);
2316723166
buildRules = (
2316823167
);
@@ -23191,7 +23190,6 @@
2319123190
809620D128E540D700940A5D /* Sources */,
2319223191
8096211428E540D700940A5D /* Frameworks */,
2319323192
8096211628E540D700940A5D /* Resources */,
23194-
4C304224F0F810A17D96A402 /* [CP] Copy Pods Resources */,
2319523193
);
2319623194
buildRules = (
2319723195
);
@@ -23220,7 +23218,6 @@
2322023218
8096213228E55C9400940A5D /* Sources */,
2322123219
8096217528E55C9400940A5D /* Frameworks */,
2322223220
8096217728E55C9400940A5D /* Resources */,
23223-
D880C306E1943EA76DA53078 /* [CP] Copy Pods Resources */,
2322423221
);
2322523222
buildRules = (
2322623223
);
@@ -23289,7 +23286,6 @@
2328923286
932225A31C7CE50300443B02 /* Sources */,
2329023287
932225A41C7CE50300443B02 /* Frameworks */,
2329123288
932225A51C7CE50300443B02 /* Resources */,
23292-
83D79708413A3DA10638659F /* [CP] Copy Pods Resources */,
2329323289
);
2329423290
buildRules = (
2329523291
);
@@ -23635,7 +23631,7 @@
2363523631
bg,
2363623632
sk,
2363723633
);
23638-
mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
23634+
mainGroup = 29B97314FDCFA39411CA2CEA;
2363923635
packageReferences = (
2364023636
3FF1442E266F3C2400138163 /* XCRemoteSwiftPackageReference "ScreenObject" */,
2364123637
3FC2C33B26C4CF0A00C6D98F /* XCRemoteSwiftPackageReference "XCUITestHelpers" */,
@@ -25057,11 +25053,21 @@
2505725053
);
2505825054
inputPaths = (
2505925055
"${PODS_ROOT}/Target Support Files/Pods-Apps-WordPress/Pods-Apps-WordPress-frameworks.sh",
25056+
"${BUILT_PRODUCTS_DIR}/FSInteractiveMap/FSInteractiveMap.framework",
25057+
"${BUILT_PRODUCTS_DIR}/Gravatar/Gravatar.framework",
25058+
"${BUILT_PRODUCTS_DIR}/GravatarUI/GravatarUI.framework",
25059+
"${BUILT_PRODUCTS_DIR}/WordPress-Aztec-iOS/Aztec.framework",
25060+
"${BUILT_PRODUCTS_DIR}/WordPress-Editor-iOS/WordPressEditor.framework",
2506025061
"${PODS_XCFRAMEWORKS_BUILD_DIR}/Gutenberg/Gutenberg.framework/Gutenberg",
2506125062
"${PODS_XCFRAMEWORKS_BUILD_DIR}/Gutenberg/hermes.framework/hermes",
2506225063
);
2506325064
name = "[CP] Embed Pods Frameworks";
2506425065
outputPaths = (
25066+
"${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",
25069+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Aztec.framework",
25070+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WordPressEditor.framework",
2506525071
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Gutenberg.framework",
2506625072
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
2506725073
);
@@ -25110,26 +25116,6 @@
2511025116
shellScript = "$SRCROOT/../Scripts/BuildPhases/ConfigureSimulatorForUITesting.sh\n";
2511125117
showEnvVarsInLog = 0;
2511225118
};
25113-
4C304224F0F810A17D96A402 /* [CP] Copy Pods Resources */ = {
25114-
isa = PBXShellScriptBuildPhase;
25115-
buildActionMask = 2147483647;
25116-
files = (
25117-
);
25118-
inputPaths = (
25119-
"${PODS_ROOT}/Target Support Files/Pods-JetpackShareExtension/Pods-JetpackShareExtension-resources.sh",
25120-
"${PODS_CONFIGURATION_BUILD_DIR}/WordPress-Aztec-iOS/WordPress-Aztec-iOS.bundle",
25121-
"${PODS_ROOT}/WordPress-Editor-iOS/WordPressEditor/WordPressEditor/Assets/aztec.png",
25122-
);
25123-
name = "[CP] Copy Pods Resources";
25124-
outputPaths = (
25125-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WordPress-Aztec-iOS.bundle",
25126-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/aztec.png",
25127-
);
25128-
runOnlyForDeploymentPostprocessing = 0;
25129-
shellPath = /bin/sh;
25130-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-JetpackShareExtension/Pods-JetpackShareExtension-resources.sh\"\n";
25131-
showEnvVarsInLog = 0;
25132-
};
2513325119
4F4D5C2BB6478A3E90ADC3C5 /* [CP] Check Pods Manifest.lock */ = {
2513425120
isa = PBXShellScriptBuildPhase;
2513525121
buildActionMask = 2147483647;
@@ -25202,70 +25188,24 @@
2520225188
shellPath = /bin/sh;
2520325189
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";
2520425190
};
25205-
83D79708413A3DA10638659F /* [CP] Copy Pods Resources */ = {
25206-
isa = PBXShellScriptBuildPhase;
25207-
buildActionMask = 2147483647;
25208-
files = (
25209-
);
25210-
inputPaths = (
25211-
"${PODS_ROOT}/Target Support Files/Pods-WordPressShareExtension/Pods-WordPressShareExtension-resources.sh",
25212-
"${PODS_CONFIGURATION_BUILD_DIR}/WordPress-Aztec-iOS/WordPress-Aztec-iOS.bundle",
25213-
"${PODS_ROOT}/WordPress-Editor-iOS/WordPressEditor/WordPressEditor/Assets/aztec.png",
25214-
);
25215-
name = "[CP] Copy Pods Resources";
25216-
outputPaths = (
25217-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WordPress-Aztec-iOS.bundle",
25218-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/aztec.png",
25219-
);
25220-
runOnlyForDeploymentPostprocessing = 0;
25221-
shellPath = /bin/sh;
25222-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-WordPressShareExtension/Pods-WordPressShareExtension-resources.sh\"\n";
25223-
showEnvVarsInLog = 0;
25224-
};
2522525191
920B9A6DAD47189622A86A9C /* [CP] Copy Pods Resources */ = {
2522625192
isa = PBXShellScriptBuildPhase;
2522725193
buildActionMask = 2147483647;
2522825194
files = (
2522925195
);
2523025196
inputPaths = (
2523125197
"${PODS_ROOT}/Target Support Files/Pods-Apps-WordPress/Pods-Apps-WordPress-resources.sh",
25232-
"${PODS_CONFIGURATION_BUILD_DIR}/GravatarUI/GravatarUI.bundle",
25233-
"${PODS_CONFIGURATION_BUILD_DIR}/WordPress-Aztec-iOS/WordPress-Aztec-iOS.bundle",
25234-
"${PODS_ROOT}/WordPress-Editor-iOS/WordPressEditor/WordPressEditor/Assets/aztec.png",
2523525198
"${PODS_CONFIGURATION_BUILD_DIR}/AppCenter/AppCenterDistributeResources.bundle",
2523625199
);
2523725200
name = "[CP] Copy Pods Resources";
2523825201
outputPaths = (
25239-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GravatarUI.bundle",
25240-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WordPress-Aztec-iOS.bundle",
25241-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/aztec.png",
2524225202
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AppCenterDistributeResources.bundle",
2524325203
);
2524425204
runOnlyForDeploymentPostprocessing = 0;
2524525205
shellPath = /bin/sh;
2524625206
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Apps-WordPress/Pods-Apps-WordPress-resources.sh\"\n";
2524725207
showEnvVarsInLog = 0;
2524825208
};
25249-
9D186898B0632AA1273C9DE2 /* [CP] Copy Pods Resources */ = {
25250-
isa = PBXShellScriptBuildPhase;
25251-
buildActionMask = 2147483647;
25252-
files = (
25253-
);
25254-
inputPaths = (
25255-
"${PODS_ROOT}/Target Support Files/Pods-WordPressDraftActionExtension/Pods-WordPressDraftActionExtension-resources.sh",
25256-
"${PODS_CONFIGURATION_BUILD_DIR}/WordPress-Aztec-iOS/WordPress-Aztec-iOS.bundle",
25257-
"${PODS_ROOT}/WordPress-Editor-iOS/WordPressEditor/WordPressEditor/Assets/aztec.png",
25258-
);
25259-
name = "[CP] Copy Pods Resources";
25260-
outputPaths = (
25261-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WordPress-Aztec-iOS.bundle",
25262-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/aztec.png",
25263-
);
25264-
runOnlyForDeploymentPostprocessing = 0;
25265-
shellPath = /bin/sh;
25266-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-WordPressDraftActionExtension/Pods-WordPressDraftActionExtension-resources.sh\"\n";
25267-
showEnvVarsInLog = 0;
25268-
};
2526925209
A279580D198819F50031C6A3 /* ShellScript */ = {
2527025210
isa = PBXShellScriptBuildPhase;
2527125211
buildActionMask = 2147483647;
@@ -25280,26 +25220,6 @@
2528025220
shellScript = "# sh ../run-oclint.sh <optional: filename to lint>\nsh ../Scripts/run-oclint.sh";
2528125221
showEnvVarsInLog = 0;
2528225222
};
25283-
D880C306E1943EA76DA53078 /* [CP] Copy Pods Resources */ = {
25284-
isa = PBXShellScriptBuildPhase;
25285-
buildActionMask = 2147483647;
25286-
files = (
25287-
);
25288-
inputPaths = (
25289-
"${PODS_ROOT}/Target Support Files/Pods-JetpackDraftActionExtension/Pods-JetpackDraftActionExtension-resources.sh",
25290-
"${PODS_CONFIGURATION_BUILD_DIR}/WordPress-Aztec-iOS/WordPress-Aztec-iOS.bundle",
25291-
"${PODS_ROOT}/WordPress-Editor-iOS/WordPressEditor/WordPressEditor/Assets/aztec.png",
25292-
);
25293-
name = "[CP] Copy Pods Resources";
25294-
outputPaths = (
25295-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WordPress-Aztec-iOS.bundle",
25296-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/aztec.png",
25297-
);
25298-
runOnlyForDeploymentPostprocessing = 0;
25299-
shellPath = /bin/sh;
25300-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-JetpackDraftActionExtension/Pods-JetpackDraftActionExtension-resources.sh\"\n";
25301-
showEnvVarsInLog = 0;
25302-
};
2530325223
E00F6488DE2D86BDC84FBB0B /* [CP] Check Pods Manifest.lock */ = {
2530425224
isa = PBXShellScriptBuildPhase;
2530525225
buildActionMask = 2147483647;
@@ -25342,11 +25262,11 @@
2534225262
files = (
2534325263
);
2534425264
inputPaths = (
25345-
$SRCROOT/../Scripts/BuildPhases/CopyGutenbergJS.inputs.xcfilelist,
25265+
"$SRCROOT/../Scripts/BuildPhases/CopyGutenbergJS.inputs.xcfilelist",
2534625266
);
2534725267
name = "Copy Gutenberg JS";
2534825268
outputFileListPaths = (
25349-
$SRCROOT/../Scripts/BuildPhases/CopyGutenbergJS.outputs.xcfilelist,
25269+
"$SRCROOT/../Scripts/BuildPhases/CopyGutenbergJS.outputs.xcfilelist",
2535025270
);
2535125271
outputPaths = (
2535225272
"",
@@ -25450,11 +25370,21 @@
2545025370
);
2545125371
inputPaths = (
2545225372
"${PODS_ROOT}/Target Support Files/Pods-Apps-Jetpack/Pods-Apps-Jetpack-frameworks.sh",
25373+
"${BUILT_PRODUCTS_DIR}/FSInteractiveMap/FSInteractiveMap.framework",
25374+
"${BUILT_PRODUCTS_DIR}/Gravatar/Gravatar.framework",
25375+
"${BUILT_PRODUCTS_DIR}/GravatarUI/GravatarUI.framework",
25376+
"${BUILT_PRODUCTS_DIR}/WordPress-Aztec-iOS/Aztec.framework",
25377+
"${BUILT_PRODUCTS_DIR}/WordPress-Editor-iOS/WordPressEditor.framework",
2545325378
"${PODS_XCFRAMEWORKS_BUILD_DIR}/Gutenberg/Gutenberg.framework/Gutenberg",
2545425379
"${PODS_XCFRAMEWORKS_BUILD_DIR}/Gutenberg/hermes.framework/hermes",
2545525380
);
2545625381
name = "[CP] Embed Pods Frameworks";
2545725382
outputPaths = (
25383+
"${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",
25386+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Aztec.framework",
25387+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WordPressEditor.framework",
2545825388
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Gutenberg.framework",
2545925389
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
2546025390
);
@@ -25470,16 +25400,10 @@
2547025400
);
2547125401
inputPaths = (
2547225402
"${PODS_ROOT}/Target Support Files/Pods-Apps-Jetpack/Pods-Apps-Jetpack-resources.sh",
25473-
"${PODS_CONFIGURATION_BUILD_DIR}/GravatarUI/GravatarUI.bundle",
25474-
"${PODS_CONFIGURATION_BUILD_DIR}/WordPress-Aztec-iOS/WordPress-Aztec-iOS.bundle",
25475-
"${PODS_ROOT}/WordPress-Editor-iOS/WordPressEditor/WordPressEditor/Assets/aztec.png",
2547625403
"${PODS_CONFIGURATION_BUILD_DIR}/AppCenter/AppCenterDistributeResources.bundle",
2547725404
);
2547825405
name = "[CP] Copy Pods Resources";
2547925406
outputPaths = (
25480-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GravatarUI.bundle",
25481-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WordPress-Aztec-iOS.bundle",
25482-
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/aztec.png",
2548325407
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AppCenterDistributeResources.bundle",
2548425408
);
2548525409
runOnlyForDeploymentPostprocessing = 0;
@@ -25493,13 +25417,13 @@
2549325417
files = (
2549425418
);
2549525419
inputFileListPaths = (
25496-
$SRCROOT/../Scripts/BuildPhases/CopyGutenbergJS.inputs.xcfilelist,
25420+
"$SRCROOT/../Scripts/BuildPhases/CopyGutenbergJS.inputs.xcfilelist",
2549725421
);
2549825422
inputPaths = (
2549925423
);
2550025424
name = "Copy Gutenberg JS";
2550125425
outputFileListPaths = (
25502-
$SRCROOT/../Scripts/BuildPhases/CopyGutenbergJS.outputs.xcfilelist,
25426+
"$SRCROOT/../Scripts/BuildPhases/CopyGutenbergJS.outputs.xcfilelist",
2550325427
);
2550425428
outputPaths = (
2550525429
);

0 commit comments

Comments
 (0)