From 1914cf2f025430c3d680c3a75cb2d225e0efec6f Mon Sep 17 00:00:00 2001 From: James Frost Date: Fri, 4 Sep 2020 10:01:27 +0100 Subject: [PATCH 1/4] Bump MediaEditor to 1.2.1 --- Podfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Podfile b/Podfile index 6b762ecbe524..8f1aa931cf67 100644 --- a/Podfile +++ b/Podfile @@ -197,7 +197,7 @@ target 'WordPress' do # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :commit => '' # pod 'WordPressAuthenticator', :path => '../WordPressAuthenticator-iOS' - pod 'MediaEditor', '~> 1.2.0' + pod 'MediaEditor', '~> 1.2.1' # pod 'MediaEditor', :git => 'https://github.com/wordpress-mobile/MediaEditor-iOS.git', :commit => 'a4178ed9b0f3622faafb41dd12503e26c5523a32' # pod 'MediaEditor', :path => '../MediaEditor-iOS' From 796a56f9cc88995e8873d6c6533ded9510f785a3 Mon Sep 17 00:00:00 2001 From: James Frost Date: Fri, 4 Sep 2020 10:16:32 +0100 Subject: [PATCH 2/4] Update release notes --- RELEASE-NOTES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 7c7de10bf61a..5b938268ef1f 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -3,6 +3,7 @@ * [**] Updated UI when connecting a self-hosted site from Login Epilogue, My Sites, and Post Signup Interstitial. (https://git.io/JUU6a) * [**] You can now follow conversations for P2 sites * [**] Block Editor: Block settings now immediately reflect changes from menu sliders. +* [*] Media editing: Reduced memory usage when marking up an image, which could cause a crash. 15.6 ----- From 15c51ff635c035de979c556df5fdbc15a873b7aa Mon Sep 17 00:00:00 2001 From: Leandro Alonso Date: Fri, 4 Sep 2020 10:00:09 -0300 Subject: [PATCH 3/4] Update Podfile.lock --- Podfile.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index 8f8feb289811..b971201c3557 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -34,7 +34,7 @@ PODS: - CocoaLumberjack (3.5.2): - CocoaLumberjack/Core (= 3.5.2) - CocoaLumberjack/Core (3.5.2) - - CropViewController (2.5.3) + - CropViewController (2.5.4) - DoubleConversion (1.1.5) - Down (0.6.6) - FBLazyVector (0.61.5) @@ -80,7 +80,7 @@ PODS: - RNTAztecView - JTAppleCalendar (8.0.3) - lottie-ios (3.1.6) - - MediaEditor (1.2.0): + - MediaEditor (1.2.1): - CropViewController (~> 2.5.3) - MRProgress (0.8.3): - MRProgress/ActivityIndicator (= 0.8.3) @@ -458,7 +458,7 @@ DEPENDENCIES: - Gridicons (~> 1.0.1) - Gutenberg (from `http://github.com/wordpress-mobile/gutenberg-mobile/`, tag `v1.36.0`) - JTAppleCalendar (~> 8.0.2) - - MediaEditor (~> 1.2.0) + - MediaEditor (~> 1.2.1) - MRProgress (= 0.8.3) - Nimble (~> 7.3.1) - NSObject-SafeExpectations (~> 0.0.4) @@ -688,7 +688,7 @@ SPEC CHECKSUMS: boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c Charts: f69cf0518b6d1d62608ca504248f1bbe0b6ae77e CocoaLumberjack: 118bf4a820efc641f79fa487b75ed928dccfae23 - CropViewController: a5c143548a0fabcd6cc25f2d26e40460cfb8c78c + CropViewController: 980df34ffc499db89755b2f307f20eca00cd40c6 DoubleConversion: e22e0762848812a87afd67ffda3998d9ef29170c Down: 71bf4af3c04fa093e65dffa25c4b64fa61287373 FBLazyVector: 47798d43f20e85af0d3cef09928b6e2d16dbbe4c @@ -705,7 +705,7 @@ SPEC CHECKSUMS: Gutenberg: 4e0a15233314558f1bda18b00d1259fc750c9da3 JTAppleCalendar: 932cadea40b1051beab10f67843451d48ba16c99 lottie-ios: 85ce835dd8c53e02509f20729fc7d6a4e6645a0a - MediaEditor: 1ff91fda23f693b97c8b56de2456a46bbbebdbe1 + MediaEditor: 20cdeb46bdecd040b8bc94467ac85a52b53b193a MRProgress: 16de7cc9f347e8846797a770db102a323fe7ef09 Nimble: 051e3d8912d40138fa5591c78594f95fb172af37 NSObject-SafeExpectations: ab8fe623d36b25aa1f150affa324e40a2f3c0374 @@ -772,6 +772,6 @@ SPEC CHECKSUMS: ZendeskSupportSDK: a87ab1e4badace92c75eb11dc77ede1e995b2adc ZIPFoundation: 249fa8890597086cd536bb2df5c9804d84e122b0 -PODFILE CHECKSUM: 88f5990fe63945677637722307ac3e72fc6a09c0 +PODFILE CHECKSUM: bf345ab0b774e4d15f3ae2b39e06b60cf07c0b53 COCOAPODS: 1.9.3 From e82c15c5e3cedae855515e39b156272322c48bd9 Mon Sep 17 00:00:00 2001 From: James Frost Date: Fri, 4 Sep 2020 16:16:10 +0100 Subject: [PATCH 4/4] Another Podfile.lock fix attempt --- Podfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Podfile.lock b/Podfile.lock index b971201c3557..6ed04e8f6b66 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -741,7 +741,7 @@ SPEC CHECKSUMS: React-RCTVibration: 20deb1f6f001000d1f2603722ec110c66c74796b ReactCommon: 48926fc48fcd7c8a629860049ffba9c23b4005dc ReactNativeDarkMode: f61376360c5d983907e5c316e8e1c853a8c2f348 - RNCMaskedView: 5a8ec07677aa885546a0d98da336457e2bea557f + RNCMaskedView: 72b5012baac53b13a9ba717eaa554afd3f2930c5 RNGestureHandler: 82a89b0fde0a37e633c6233418f7249e2f8e59b5 RNReanimated: 13f7a6a22667c4f00aac217bc66f94e8560b3d59 RNScreens: 6833ac5c29cf2f03eed12103140530bbd75b6aea