Merge trunk in SPM PR (#23393)

* Optimize TopTotalsCell to add rows only when the cell loads TopTotalsCell was calling addRows on every configuration of cell which in turn created and added a hierarchy of UIStackView-based views. Optimizing TopTotalsCell to only add rows once and then make manipulations on existing rows. * Optimize CountriesCell to add rows only when the cell loads * Do not track StatsTraffic tableView scrolling * Update RELEASE-NOTES.txt * Update TopTotalsCell to use setNeedsLayout for more efficiency * Update CountriesCell to use setNeedsLayout for more efficiency * Update RELEASE-NOTES * Move additional checks for adding default rows into the extension * Fix rare crash in GutenbergWebViewController * Update release notes * Remove force layout calls when setting subtitle visibility These calls were added together with dynamic type support, however, they slow down layout process of the cell * Make maximum content size category smaller for stats cell subtitles * Create StatsRowsCell with default child stack view rows and ability to configure more * Put analyticsTracker back since it's used by JetpackBanner * JPBackground as png * Move JPBackground to AppImage specific to the Jetpack app * Remove Stories related files * Remove unused site creation icons * Reduce rppreview size * Replace JPBackground with tiny-fied icons * Remove custom fonts used by Kanvas * Remove remaining Kanvas related code * Remove Kanvas related code * Remove StoryEditor * Replace remaining Kanvas usages * Remove StoriesIntroViewController * Remove Kanvas pod * Update rubocop.yml * Add unique identifier to file downloads rows (#23310) File Downloads data can be identical which can result in a rare duplicate diffable data source identifiers crash. Pass a unique identifier to ensure that each file downloads row is treated as unique. * Support editing media metadata via XML-RPC #809 (#23316) * Support media metadata editing for XML-RPC connected self-hosted sites - Updated WordPressKit supports editing title, description, and caption of the media via XML-RPC - XML-RPC API doesn't support editing alt-text * Support editing media metadata via XMLRPC in MediaService Media is a type of a post therefore "wp.editPost" can be used to edit media metadata. Note that alternative text cannot be edited due to lack of XML-RPC support https://core.trac.wordpress.org/ticket/58582 * Update RELEASE-NOTES.txt * Fix warnings in MemoryCache * Fix warnings in CachedAsyncImage * Fix more warnings * Remove deprecated in JetpackBrandingVisibility.enabled * Remove AlamofireNetworkActivityIndicator (#23385) * Merge 25.1 release finalization (#23391) * Fix announcement card keep showing up after tapping Done (#23384) * Update app translations – `Localizable.strings` * Update WordPress metadata translations * Update Jetpack metadata translations * Bump version number --------- Co-authored-by: David Christiandy <[email protected]> * Update WordPressKit and WordPressAuthentificator setup (#23392) * Install WordPressUI using SPM * Remove WordPressShared from Podfile * Add WordPressShared using SPM * Fix WordPress compilation * Fix WordPressKit being embeded in the wrong targets * Disable some warnings in WordPressKit * Remove redundant manual linker flags * Fix WordPressKit tests * Fix WordPressAuthentificator tests * Remove Specta and Expecta from Podfile * Fix WordPressAuthentificator tests by temporary disabling LoginFacadeTests * Update WordPressAuthenticator so that it could be compliled as an ObjC module again * Rewrite LoginFacadeTests * Fix WordPressTests * Add missing executable_path/../../Frameworks in the share extensions --------- Co-authored-by: Povilas Staskus <[email protected]> Co-authored-by: Jeremy Massel <[email protected]> Co-authored-by: WordPress Mobile Bot Account <[email protected]> Co-authored-by: David Christiandy <[email protected]>
wordpress-mobile · Jul 5, 2024 · e98daf4 · e98daf4
1 parent 13c85e5
commit e98daf4
Show file tree

Hide file tree

Showing 281 changed files with 1,160 additions and 3,815 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -3,6 +3,8 @@ AllCops:
     - DerivedData/**/*
     - Pods/**/*
     - vendor/**/*
+    - WordPressAuthenticator/**/*
+    - WordPressKit/**/*
   NewCops: enable
 
 Metrics/BlockLength:

diff --git a/Podfile b/Podfile
@@ -19,16 +19,6 @@ inhibit_all_warnings!
 use_frameworks!
 workspace 'WordPress.xcworkspace'
 
-## Pods shared between all the targets
-## ===================================
-##
-def wordpress_shared
-  pod 'WordPressShared', '~> 2.3', '>= 2.3.1'
-  # pod 'WordPressShared', git: 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', branch: ''
-  # pod 'WordPressShared', git: 'https://github.com/wordpress-mobile/WordPress-iOS-Shared.git', commit: ''
-  # pod 'WordPressShared', path: '../WordPress-iOS-Shared'
-end
-
 def aztec
   ## When using a tagged version, feel free to comment out the WordPress-Aztec-iOS line below.
   ## When using a commit number (during development) you should provide the same commit number for both pods.
@@ -39,14 +29,6 @@ def aztec
   pod 'WordPress-Editor-iOS', '~> 1.19.11'
 end
 
-def wordpress_ui
-  pod 'WordPressUI', '~> 1.16'
-  # pod 'WordPressUI', git: 'https://github.com/wordpress-mobile/WordPressUI-iOS', tag: ''
-  # pod 'WordPressUI', git: 'https://github.com/wordpress-mobile/WordPressUI-iOS', branch: ''
-  # pod 'WordPressUI', git: 'https://github.com/wordpress-mobile/WordPressUI-iOS', commit: ''
-  # pod 'WordPressUI', path: '../WordPressUI-iOS'
-end
-
 def gravatar
   # pod 'Gravatar', path: '../Gravatar-SDK-iOS'
   # pod 'GravatarUI', path: '../Gravatar-SDK-iOS'
@@ -56,36 +38,9 @@ def gravatar
   pod 'GravatarUI', '2.0.0'
 end
 
-def kanvas
-  pod 'Kanvas', '~> 1.4.4'
-  # pod 'Kanvas', git: 'https://github.com/tumblr/Kanvas-iOS.git', tag: ''
-  # pod 'Kanvas', git: 'https://github.com/tumblr/Kanvas-iOS.git', commit: ''
-  # pod 'Kanvas', path: '../Kanvas-iOS'
-end
-
-def shared_with_all_pods
-  wordpress_shared
-end
-
-def shared_test_pods
-  pod 'Expecta', '1.0.6'
-  pod 'Specta', '1.0.7'
-  gutenberg_pod
-end
-
-def shared_with_extension_pods
-  # The PrivacyInfo in this library is incorrectly copied to the app bundle's root directory.
-  # That conflicts with the our own app's PrivacyInfo. We can update this library once the
-  # issue is resolved.
-  # See https://github.com/weichsel/ZIPFoundation/pull/314
-end
-
 abstract_target 'Apps' do
   project 'WordPress/WordPress.xcodeproj'
 
-  shared_with_all_pods
-  shared_with_extension_pods
-
   ## Gutenberg (React Native)
   ## =====================
   ##
@@ -106,8 +61,6 @@ abstract_target 'Apps' do
   ## Automattic libraries
   ## ====================
   ##
-  wordpress_shared
-  kanvas
   gravatar
 
   # Production
@@ -117,7 +70,6 @@ abstract_target 'Apps' do
   # pod 'MediaEditor', path: '../MediaEditor-iOS'
 
   aztec
-  wordpress_ui
 
   ## WordPress App iOS
   ## =================
@@ -126,7 +78,7 @@ abstract_target 'Apps' do
     target 'WordPressTest' do
       inherit! :search_paths
 
-      shared_test_pods
+      gutenberg_pod
     end
   end
 
@@ -142,21 +94,13 @@ end
 target 'WordPressShareExtension' do
   project 'WordPress/WordPress.xcodeproj'
 
-  shared_with_extension_pods
-
   aztec
-  shared_with_all_pods
-  wordpress_ui
 end
 
 target 'JetpackShareExtension' do
   project 'WordPress/WordPress.xcodeproj'
 
-  shared_with_extension_pods
-
   aztec
-  shared_with_all_pods
-  wordpress_ui
 end
 
 ## DraftAction Extension
@@ -165,74 +109,13 @@ end
 target 'WordPressDraftActionExtension' do
   project 'WordPress/WordPress.xcodeproj'
 
-  shared_with_extension_pods
-
   aztec
-  shared_with_all_pods
-  wordpress_ui
 end
 
 target 'JetpackDraftActionExtension' do
   project 'WordPress/WordPress.xcodeproj'
 
-  shared_with_extension_pods
-
   aztec
-  shared_with_all_pods
-  wordpress_ui
-end
-
-## Widgets
-## ============
-##
-
-target 'JetpackStatsWidgets' do
-  project 'WordPress/WordPress.xcodeproj'
-
-  shared_with_all_pods
-  wordpress_ui
-end
-
-## Intents
-## ============
-##
-
-target 'JetpackIntents' do
-  project 'WordPress/WordPress.xcodeproj'
-
-  shared_with_all_pods
-  wordpress_ui
-end
-
-## Notification Service Extension
-## ==============================
-##
-target 'WordPressNotificationServiceExtension' do
-  project 'WordPress/WordPress.xcodeproj'
-
-  wordpress_shared
-  wordpress_ui
-end
-
-target 'JetpackNotificationServiceExtension' do
-  project 'WordPress/WordPress.xcodeproj'
-
-  wordpress_shared
-  wordpress_ui
-end
-
-## Screenshot Generation
-## ===================
-##
-target 'WordPressScreenshotGeneration' do
-  project 'WordPress/WordPress.xcodeproj'
-end
-
-## UI Tests
-## ===================
-##
-target 'WordPressUITests' do
-  project 'WordPress/WordPress.xcodeproj'
 end
 
 ## Tools
@@ -256,7 +139,7 @@ end
 # 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 WordPressShared WordPressUI]
+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]

diff --git a/Podfile.lock b/Podfile.lock
@@ -10,56 +10,40 @@ PODS:
   - AppCenter/Distribute (5.0.4):
     - AppCenter/Core
   - CropViewController (2.5.3)
-  - Expecta (1.0.6)
   - FSInteractiveMap (0.1.0)
   - Gravatar (2.0.0)
   - GravatarUI (2.0.0):
     - Gravatar (= 2.0.0)
   - Gutenberg (1.120.1)
-  - Kanvas (1.4.9):
-    - CropViewController
   - MediaEditor (1.2.2):
     - CropViewController (~> 2.5.3)
-  - Specta (1.0.7)
   - SwiftLint (0.54.0)
   - WordPress-Aztec-iOS (1.19.11)
   - WordPress-Editor-iOS (1.19.11):
     - WordPress-Aztec-iOS (= 1.19.11)
-  - WordPressShared (2.4.0)
-  - WordPressUI (1.16.0)
 
 DEPENDENCIES:
   - AppCenter (~> 5.0)
   - AppCenter/Distribute (~> 5.0)
   - CropViewController (= 2.5.3)
-  - Expecta (= 1.0.6)
   - 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`)
-  - Kanvas (~> 1.4.4)
   - MediaEditor (>= 1.2.2, ~> 1.2)
-  - Specta (= 1.0.7)
   - SwiftLint (= 0.54.0)
   - WordPress-Editor-iOS (~> 1.19.11)
-  - WordPressShared (>= 2.3.1, ~> 2.3)
-  - WordPressUI (~> 1.16)
 
 SPEC REPOS:
   https://github.com/wordpress-mobile/cocoapods-specs.git:
     - WordPress-Aztec-iOS
     - WordPress-Editor-iOS
-    - WordPressShared
-    - WordPressUI
   trunk:
     - AppCenter
     - CropViewController
-    - Expecta
     - Gravatar
     - GravatarUI
-    - Kanvas
     - MediaEditor
-    - Specta
     - SwiftLint
 
 EXTERNAL SOURCES:
@@ -77,20 +61,15 @@ CHECKOUT OPTIONS:
 SPEC CHECKSUMS:
   AppCenter: 85c92db0759d2792a65eb61d6842d2e86611a49a
   CropViewController: a5c143548a0fabcd6cc25f2d26e40460cfb8c78c
-  Expecta: 3b6bd90a64b9a1dcb0b70aa0e10a7f8f631667d5
   FSInteractiveMap: a396f610f48b76cb540baa87139d056429abda86
   Gravatar: 54fc63ea6298e9afca7329007815be25868f1dfe
   GravatarUI: bb5e03cda2da61e54aa1c20d4dde32b7153fa8b4
   Gutenberg: 0699e7dd207afb591ccd5e81252a92e6e7781391
-  Kanvas: cc027f8058de881a4ae2b5aa5f05037b6d054d08
   MediaEditor: d08314cfcbfac74361071a306b4bc3a39b3356ae
-  Specta: 3e1bd89c3517421982dc4d1c992503e48bd5fe66
   SwiftLint: c1de071d9d08c8aba837545f6254315bc900e211
   WordPress-Aztec-iOS: 3732c6d865a5c9f35788377bdeda8a80ea10d0a1
   WordPress-Editor-iOS: 453345420ced3d3ef20f0051b3df46ff10281e0c
-  WordPressShared: 0160364ed24f4d67fed4e85003fefa837faad84f
-  WordPressUI: f883fdd2508a0bc525c19805b2bbae980b581271
 
-PODFILE CHECKSUM: be2b1266b694f9fb945c63ec61af8a26ee415305
+PODFILE CHECKSUM: 3f613d671323ac233553cfced32e6931b915bdc8
 
 COCOAPODS: 1.15.2
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -1,7 +1,11 @@
 25.2
 -----
+
+* [*] [Jetpack-only] Stats: Made optimizations to enhance scrolling performance. [#22847]
 * [*] Simplify post list context menu sections [#23356]
 * [*] Fix an issue with incorrect snackbar shown when saving drafts manually [#23358]
+* [**] Support editing media metadata for sites not powered by Jetpack and reliant on XML-RPC [#23316]
+* [*] Fix rare crash in the unsupported block editor [#23379]
 
 25.1
 -----

diff --git a/Scripts/BuildPhases/Authenticator/CopyResources-input.xcfilelist b/Scripts/BuildPhases/Authenticator/CopyResources-input.xcfilelist
diff --git a/Scripts/BuildPhases/Authenticator/CopyResources-output.xcfilelist b/Scripts/BuildPhases/Authenticator/CopyResources-output.xcfilelist