From 6d05f91e0cd0adae700e43f074b75df5d4ad4c63 Mon Sep 17 00:00:00 2001 From: Tony Li Date: Thu, 18 Apr 2024 13:37:37 +1200 Subject: [PATCH 1/3] Update Reachability from 3.2 to 3.7.6 --- Podfile | 2 +- Podfile.lock | 8 +++--- WordPress/WordPress.xcodeproj/project.pbxproj | 28 +++++++++++++++---- 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/Podfile b/Podfile index 14305a0d539f..4620ca112818 100644 --- a/Podfile +++ b/Podfile @@ -76,7 +76,7 @@ def shared_with_all_pods end def shared_with_networking_pods - pod 'Reachability', '3.2' + pod 'Reachability', '~> 3.7' wordpress_kit end diff --git a/Podfile.lock b/Podfile.lock index 16eb59d7a9c7..541a9ad921b1 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -49,7 +49,7 @@ PODS: - OHHTTPStubs/OHPathHelpers (9.1.0) - OHHTTPStubs/Swift (9.1.0): - OHHTTPStubs/Default - - Reachability (3.2) + - Reachability (3.7.6) - Sentry (8.21.0): - Sentry/Core (= 8.21.0) - SentryPrivate (= 8.21.0) @@ -115,7 +115,7 @@ DEPENDENCIES: - "NSURL+IDN (~> 0.4)" - OCMock (~> 3.4.3) - OHHTTPStubs/Swift (~> 9.1.0) - - Reachability (= 3.2) + - Reachability (~> 3.7) - Starscream (~> 4.0) - SVProgressHUD (= 2.2.5) - SwiftLint (= 0.54.0) @@ -205,7 +205,7 @@ SPEC CHECKSUMS: "NSURL+IDN": afc873e639c18138a1589697c3add197fe8679ca OCMock: 43565190abc78977ad44a61c0d20d7f0784d35ab OHHTTPStubs: 90eac6d8f2c18317baeca36698523dc67c513831 - Reachability: 33e18b67625424e47b6cde6d202dce689ad7af96 + Reachability: fd0ecd23705e2599e4cceeb943222ae02296cbc6 Sentry: ebc12276bd17613a114ab359074096b6b3725203 SentryPrivate: d651efb234cf385ec9a1cdd3eff94b5e78a0e0fe Sodium: 23d11554ecd556196d313cf6130d406dfe7ac6da @@ -229,6 +229,6 @@ SPEC CHECKSUMS: ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba ZIPFoundation: d170fa8e270b2a32bef9dcdcabff5b8f1a5deced -PODFILE CHECKSUM: d6d5151a5346f27190dfa55e3d3b7297e85bf5d5 +PODFILE CHECKSUM: b0ad0f3f5f2f2bcd9a9f7520cbd32324ccc62c9a COCOAPODS: 1.15.2 diff --git a/WordPress/WordPress.xcodeproj/project.pbxproj b/WordPress/WordPress.xcodeproj/project.pbxproj index 44407bbafb5d..dae499523f7a 100644 --- a/WordPress/WordPress.xcodeproj/project.pbxproj +++ b/WordPress/WordPress.xcodeproj/project.pbxproj @@ -10998,7 +10998,7 @@ path = Classes; sourceTree = ""; }; - 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { + 29B97314FDCFA39411CA2CEA = { isa = PBXGroup; children = ( 3F20FDF3276BF21000DA3CAD /* Packages */, @@ -19426,7 +19426,7 @@ bg, sk, ); - mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */; + mainGroup = 29B97314FDCFA39411CA2CEA; packageReferences = ( 3FF1442E266F3C2400138163 /* XCRemoteSwiftPackageReference "ScreenObject" */, 3FC2C33B26C4CF0A00C6D98F /* XCRemoteSwiftPackageReference "XCUITestHelpers" */, @@ -20395,12 +20395,14 @@ inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-JetpackStatsWidgets/Pods-JetpackStatsWidgets-resources.sh", "${PODS_CONFIGURATION_BUILD_DIR}/Gridicons/GridiconsAssets.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/Reachability/Reachability_Privacy.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/WordPressShared/WordPressShared.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/WordPressUI/WordPressUIResources.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GridiconsAssets.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Reachability_Privacy.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WordPressShared.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WordPressUIResources.bundle", ); @@ -20438,11 +20440,13 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-JetpackIntents/Pods-JetpackIntents-resources.sh", + "${PODS_CONFIGURATION_BUILD_DIR}/Reachability/Reachability_Privacy.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/WordPressShared/WordPressShared.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/WordPressUI/WordPressUIResources.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Reachability_Privacy.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WordPressShared.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WordPressUIResources.bundle", ); @@ -20666,6 +20670,7 @@ "${PODS_ROOT}/Target Support Files/Pods-JetpackShareExtension/Pods-JetpackShareExtension-resources.sh", "${PODS_ROOT}/Down/Resources/DownView.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/Gridicons/GridiconsAssets.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/Reachability/Reachability_Privacy.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}/WordPressShared/WordPressShared.bundle", @@ -20675,6 +20680,7 @@ outputPaths = ( "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/DownView.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GridiconsAssets.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Reachability_Privacy.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}/WordPressShared.bundle", @@ -20824,6 +20830,7 @@ "${PODS_ROOT}/Target Support Files/Pods-WordPressShareExtension/Pods-WordPressShareExtension-resources.sh", "${PODS_ROOT}/Down/Resources/DownView.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/Gridicons/GridiconsAssets.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/Reachability/Reachability_Privacy.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}/WordPressShared/WordPressShared.bundle", @@ -20833,6 +20840,7 @@ outputPaths = ( "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/DownView.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GridiconsAssets.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Reachability_Privacy.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}/WordPressShared.bundle", @@ -20860,6 +20868,7 @@ "${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}/Reachability/Reachability_Privacy.bundle", "${PODS_ROOT}/SVProgressHUD/SVProgressHUD/SVProgressHUD.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/Starscream/Starscream_Privacy.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/WordPress-Aztec-iOS/WordPress-Aztec-iOS.bundle", @@ -20881,6 +20890,7 @@ "${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}/Reachability_Privacy.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SVProgressHUD.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Starscream_Privacy.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WordPress-Aztec-iOS.bundle", @@ -20904,6 +20914,7 @@ "${PODS_ROOT}/Target Support Files/Pods-WordPressDraftActionExtension/Pods-WordPressDraftActionExtension-resources.sh", "${PODS_ROOT}/Down/Resources/DownView.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/Gridicons/GridiconsAssets.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/Reachability/Reachability_Privacy.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}/WordPressShared/WordPressShared.bundle", @@ -20913,6 +20924,7 @@ outputPaths = ( "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/DownView.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GridiconsAssets.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Reachability_Privacy.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}/WordPressShared.bundle", @@ -20964,6 +20976,7 @@ "${PODS_ROOT}/Target Support Files/Pods-JetpackDraftActionExtension/Pods-JetpackDraftActionExtension-resources.sh", "${PODS_ROOT}/Down/Resources/DownView.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/Gridicons/GridiconsAssets.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/Reachability/Reachability_Privacy.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}/WordPressShared/WordPressShared.bundle", @@ -20973,6 +20986,7 @@ outputPaths = ( "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/DownView.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GridiconsAssets.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Reachability_Privacy.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}/WordPressShared.bundle", @@ -21025,11 +21039,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 = ( "", @@ -21181,6 +21195,7 @@ "${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}/Reachability/Reachability_Privacy.bundle", "${PODS_ROOT}/SVProgressHUD/SVProgressHUD/SVProgressHUD.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/Starscream/Starscream_Privacy.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/WordPress-Aztec-iOS/WordPress-Aztec-iOS.bundle", @@ -21202,6 +21217,7 @@ "${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}/Reachability_Privacy.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SVProgressHUD.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Starscream_Privacy.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WordPress-Aztec-iOS.bundle", @@ -21222,13 +21238,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 019198eda6c59daabef63269899bf3f4f62f9d35 Mon Sep 17 00:00:00 2001 From: Tony Li Date: Thu, 18 Apr 2024 14:15:52 +1200 Subject: [PATCH 2/3] Add a release note --- RELEASE-NOTES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 621de2cb9cbf..2284036736a1 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,5 +1,6 @@ 24.8 ----- +* [*] [internal] Update Reachability. [#23030] 24.7 From 0c5ce64cf22fc6e3026505dd6b5e7314b19054c7 Mon Sep 17 00:00:00 2001 From: Tony Li Date: Wed, 24 Apr 2024 09:28:09 +1200 Subject: [PATCH 3/3] Remove an empty line --- RELEASE-NOTES.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 5043b39b6d52..8de0f135ab62 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,7 +1,6 @@ 24.8 ----- * [*] [internal] Update Reachability. [#23030] - * [*] Move "Settings" context menu action in "Pages" from the submenu to a separate section to make it easily discoverable and make it available for unpublished posts [#23065] * [*] Add "Stats" context menu action to "Pages" [#23065]