From 4d4cb9719094a89cf21a47252724612b108987e6 Mon Sep 17 00:00:00 2001 From: Paolo Musolino Date: Tue, 18 Jul 2023 15:43:12 +0200 Subject: [PATCH 1/5] Updated WordPressUI pod to point to the branch with the fix the Crash in BottomSheetViewController due to Incorrect Selector Usage --- Podfile | 2 +- Podfile.lock | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Podfile b/Podfile index a7a8e30f6a6..c7efde02afc 100644 --- a/Podfile +++ b/Podfile @@ -90,7 +90,7 @@ target 'WooCommerce' do wordpress_shared - pod 'WordPressUI', '~> 1.13' + pod 'WordPressUI', :git => 'https://github.com/wordpress-mobile/WordPressUI-iOS.git', :branch => 'task/fix-crash-BottomSheetViewController' # pod 'WordPressUI', :git => 'https://github.com/wordpress-mobile/WordPressUI-iOS.git', :branch => '' aztec diff --git a/Podfile.lock b/Podfile.lock index 7f9640540cd..87dcd57902c 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -57,7 +57,7 @@ PODS: - WordPressShared (~> 2.0-beta) - wpxmlrpc (~> 0.10) - WordPressShared (2.1.0) - - WordPressUI (1.13.0) + - WordPressUI (1.13.1) - Wormholy (1.6.6) - WPMediaPicker (1.8.1) - wpxmlrpc (0.10.0) @@ -88,7 +88,7 @@ DEPENDENCIES: - WordPress-Editor-iOS (~> 1.11.0) - WordPressAuthenticator (from `https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git`, branch `trunk`) - WordPressShared (~> 2.1) - - WordPressUI (~> 1.13) + - WordPressUI (from `https://github.com/wordpress-mobile/WordPressUI-iOS.git`, branch `task/fix-crash-BottomSheetViewController`) - Wormholy (~> 1.6.6) - WPMediaPicker (~> 1.8.1) - ZendeskSupportSDK (~> 6.0) @@ -119,7 +119,6 @@ SPEC REPOS: - WordPress-Aztec-iOS - WordPress-Editor-iOS - WordPressShared - - WordPressUI - Wormholy - WPMediaPicker - wpxmlrpc @@ -135,11 +134,17 @@ EXTERNAL SOURCES: WordPressAuthenticator: :branch: trunk :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git + WordPressUI: + :branch: task/fix-crash-BottomSheetViewController + :git: https://github.com/wordpress-mobile/WordPressUI-iOS.git CHECKOUT OPTIONS: WordPressAuthenticator: :commit: bfdfde6fcd9a0faf0509db8380aa208e6d093a08 :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git + WordPressUI: + :commit: 7c48ae434db04d0244009a609859e8288ad2f175 + :git: https://github.com/wordpress-mobile/WordPressUI-iOS.git SPEC CHECKSUMS: Alamofire: 3ec537f71edc9804815215393ae2b1a8ea33a844 @@ -166,7 +171,7 @@ SPEC CHECKSUMS: WordPressAuthenticator: 8a27a3c61ca0d740df66f260902aa2ca8528c61b WordPressKit: b65a51863982d8166897bea8b753f1fc51732aad WordPressShared: 0aa459e5257a77184db87805a998f447443c9706 - WordPressUI: 9951bdade87c8c64b50535aaed2a53a11d0c52ee + WordPressUI: 7304a3a604b8dc582981e723e6d7caa9dd5a9f0e Wormholy: 09da0b876f9276031fd47383627cb75e194fc068 WPMediaPicker: 9011a0ec1f468c039af7485c244576b4c9889a0f wpxmlrpc: 68db063041e85d186db21f674adf08d9c70627fd @@ -178,6 +183,6 @@ SPEC CHECKSUMS: ZendeskSupportProvidersSDK: 685b5d185af47ced0ec40564ec46355c838bbd06 ZendeskSupportSDK: 92e6f9d334e81e9186f8a17583862350460a5393 -PODFILE CHECKSUM: 33119766b8581a4e76206f345a770ca2c617f78d +PODFILE CHECKSUM: e0f09766fdce4a0d69cca5f4724e81c8bba21104 COCOAPODS: 1.12.1 From 05f4c86ae556df84d82897940eff1ec7b7bc55e7 Mon Sep 17 00:00:00 2001 From: Paolo Musolino Date: Tue, 18 Jul 2023 15:45:36 +0200 Subject: [PATCH 2/5] Improved release-notes --- RELEASE-NOTES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index c77d751379d..d6034d43010 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -5,6 +5,7 @@ - [Internal] Switched AI endpoint to be able to track and measure costs. [https://github.com/woocommerce/woocommerce-ios/pull/10218] - [Internal] Media picker flow was refactored to support interactive dismissal for device photo picker and WordPress media picker sources. Affected flows: product form > images, and virtual product form > downloadable files. [https://github.com/woocommerce/woocommerce-ios/pull/10236] - [**] Product discounts: Users can now add discounts to products when creating an order. [https://github.com/woocommerce/woocommerce-ios/pull/10244] +- [*] We've resolved an issue that was causing the app to crash when trying to dismiss certain screens (bottom sheets). 14.5 From 1fe9e834b544bca80f1f65ede31606deb13a0d58 Mon Sep 17 00:00:00 2001 From: Paolo Musolino Date: Tue, 18 Jul 2023 15:49:57 +0200 Subject: [PATCH 3/5] feat: added PR link to release-notes --- RELEASE-NOTES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index d6034d43010..591788ab08f 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -5,7 +5,7 @@ - [Internal] Switched AI endpoint to be able to track and measure costs. [https://github.com/woocommerce/woocommerce-ios/pull/10218] - [Internal] Media picker flow was refactored to support interactive dismissal for device photo picker and WordPress media picker sources. Affected flows: product form > images, and virtual product form > downloadable files. [https://github.com/woocommerce/woocommerce-ios/pull/10236] - [**] Product discounts: Users can now add discounts to products when creating an order. [https://github.com/woocommerce/woocommerce-ios/pull/10244] -- [*] We've resolved an issue that was causing the app to crash when trying to dismiss certain screens (bottom sheets). +- [*] We've resolved an issue that was causing the app to crash when trying to dismiss certain screens (bottom sheets). [https://github.com/woocommerce/woocommerce-ios/pull/10254] 14.5 From 21c4eaa8baeec5f3fa646c37e03cfc07e0d98402 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Thu, 20 Jul 2023 13:25:05 +1000 Subject: [PATCH 4/5] Point WordPressUI to the latest stable version --- Podfile | 2 +- Podfile.lock | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/Podfile b/Podfile index c7efde02afc..a7a8e30f6a6 100644 --- a/Podfile +++ b/Podfile @@ -90,7 +90,7 @@ target 'WooCommerce' do wordpress_shared - pod 'WordPressUI', :git => 'https://github.com/wordpress-mobile/WordPressUI-iOS.git', :branch => 'task/fix-crash-BottomSheetViewController' + pod 'WordPressUI', '~> 1.13' # pod 'WordPressUI', :git => 'https://github.com/wordpress-mobile/WordPressUI-iOS.git', :branch => '' aztec diff --git a/Podfile.lock b/Podfile.lock index 87dcd57902c..17b04999372 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -88,7 +88,7 @@ DEPENDENCIES: - WordPress-Editor-iOS (~> 1.11.0) - WordPressAuthenticator (from `https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git`, branch `trunk`) - WordPressShared (~> 2.1) - - WordPressUI (from `https://github.com/wordpress-mobile/WordPressUI-iOS.git`, branch `task/fix-crash-BottomSheetViewController`) + - WordPressUI (~> 1.13) - Wormholy (~> 1.6.6) - WPMediaPicker (~> 1.8.1) - ZendeskSupportSDK (~> 6.0) @@ -119,6 +119,7 @@ SPEC REPOS: - WordPress-Aztec-iOS - WordPress-Editor-iOS - WordPressShared + - WordPressUI - Wormholy - WPMediaPicker - wpxmlrpc @@ -134,17 +135,11 @@ EXTERNAL SOURCES: WordPressAuthenticator: :branch: trunk :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git - WordPressUI: - :branch: task/fix-crash-BottomSheetViewController - :git: https://github.com/wordpress-mobile/WordPressUI-iOS.git CHECKOUT OPTIONS: WordPressAuthenticator: :commit: bfdfde6fcd9a0faf0509db8380aa208e6d093a08 :git: https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git - WordPressUI: - :commit: 7c48ae434db04d0244009a609859e8288ad2f175 - :git: https://github.com/wordpress-mobile/WordPressUI-iOS.git SPEC CHECKSUMS: Alamofire: 3ec537f71edc9804815215393ae2b1a8ea33a844 @@ -183,6 +178,6 @@ SPEC CHECKSUMS: ZendeskSupportProvidersSDK: 685b5d185af47ced0ec40564ec46355c838bbd06 ZendeskSupportSDK: 92e6f9d334e81e9186f8a17583862350460a5393 -PODFILE CHECKSUM: e0f09766fdce4a0d69cca5f4724e81c8bba21104 +PODFILE CHECKSUM: 33119766b8581a4e76206f345a770ca2c617f78d COCOAPODS: 1.12.1 From b395bb43bdf286f5ececb06de88d60196ef99974 Mon Sep 17 00:00:00 2001 From: Paolo Musolino Date: Thu, 20 Jul 2023 13:17:12 +0200 Subject: [PATCH 5/5] fix: removed space in RELEASE-NOTES --- RELEASE-NOTES.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index e7b67e3fcc8..2fd7bdd43a2 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -10,7 +10,6 @@ - [**] Product discounts: Users can now add discounts to products when creating an order. [https://github.com/woocommerce/woocommerce-ios/pull/10244] - [*] We've resolved an issue that was causing the app to crash when trying to dismiss certain screens (bottom sheets). [https://github.com/woocommerce/woocommerce-ios/pull/10254] - [Internal] Fixed a bug preventing the "We couldn't load your data" error banner from appearing on the My store dashboard. [https://github.com/woocommerce/woocommerce-ios/pull/10262] - - [Internal] A new way to create a product from an image using AI is being A/B tested. [https://github.com/woocommerce/woocommerce-ios/pull/10253] 14.5