Skip to content

Commit

Permalink
Merge 24.7 code freeze (#23010)
Browse files Browse the repository at this point in the history
  • Loading branch information
momo-ozawa authored Apr 15, 2024
2 parents 199d402 + 8a0cdb7 commit 0d18629
Show file tree
Hide file tree
Showing 8 changed files with 95 additions and 94 deletions.
6 changes: 3 additions & 3 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ def gravatar
end

def wordpress_kit
# pod 'WordPressKit', '~> 16.0.0'
pod 'WordPressKit', git: 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', commit: '7343890fb3b1b6a7be29cddb9194bf88a71a4a2a'
pod 'WordPressKit', '~> 17.0.0'
# pod 'WordPressKit', git: 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', commit: ''
# pod 'WordPressKit', git: 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', branch: ''
# pod 'WordPressKit', git: 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', tag: ''
# pod 'WordPressKit', path: '../WordPressKit-iOS'
Expand Down Expand Up @@ -150,7 +150,7 @@ abstract_target 'Apps' do

pod 'NSURL+IDN', '~> 0.4'

pod 'WordPressAuthenticator', '~> 9.0', '>= 9.0.6'
pod 'WordPressAuthenticator', '~> 9.0', '>= 9.0.8'
# pod 'WordPressAuthenticator', git: 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', commit: ''
# pod 'WordPressAuthenticator', git: 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', branch: ''
# pod 'WordPressAuthenticator', path: '../WordPressAuthenticator-iOS'
Expand Down
23 changes: 9 additions & 14 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@ PODS:
- WordPress-Aztec-iOS (1.19.11)
- WordPress-Editor-iOS (1.19.11):
- WordPress-Aztec-iOS (= 1.19.11)
- WordPressAuthenticator (9.0.6):
- WordPressAuthenticator (9.0.8):
- Gridicons (~> 1.0)
- "NSURL+IDN (= 0.4)"
- SVProgressHUD (~> 2.2.5)
- WordPressKit (~> 16.0)
- WordPressKit (~> 17.0)
- WordPressShared (~> 2.1-beta)
- WordPressUI (~> 1.7-beta)
- WordPressKit (16.0.0):
- WordPressKit (17.0.0):
- NSObject-SafeExpectations (~> 0.0.4)
- UIDeviceIdentifier (~> 2.0)
- WordPressShared (~> 2.0-beta)
Expand Down Expand Up @@ -120,8 +120,8 @@ DEPENDENCIES:
- SVProgressHUD (= 2.2.5)
- SwiftLint (= 0.54.0)
- WordPress-Editor-iOS (~> 1.19.11)
- WordPressAuthenticator (>= 9.0.6, ~> 9.0)
- WordPressKit (from `https://github.com/wordpress-mobile/WordPressKit-iOS.git`, commit `7343890fb3b1b6a7be29cddb9194bf88a71a4a2a`)
- WordPressAuthenticator (>= 9.0.8, ~> 9.0)
- WordPressKit (~> 17.0.0)
- WordPressShared (>= 2.3.1, ~> 2.3)
- WordPressUI (~> 1.16)
- ZendeskSupportSDK (= 5.3.0)
Expand Down Expand Up @@ -159,6 +159,7 @@ SPEC REPOS:
- SVProgressHUD
- SwiftLint
- UIDeviceIdentifier
- WordPressKit
- WordPressShared
- WordPressUI
- wpxmlrpc
Expand All @@ -177,17 +178,11 @@ EXTERNAL SOURCES:
:tag: 0.2.0
Gutenberg:
:podspec: https://cdn.a8c-ci.services/gutenberg-mobile/Gutenberg-v1.117.0.podspec
WordPressKit:
:commit: 7343890fb3b1b6a7be29cddb9194bf88a71a4a2a
:git: https://github.com/wordpress-mobile/WordPressKit-iOS.git

CHECKOUT OPTIONS:
FSInteractiveMap:
:git: https://github.com/wordpress-mobile/FSInteractiveMap.git
:tag: 0.2.0
WordPressKit:
:commit: 7343890fb3b1b6a7be29cddb9194bf88a71a4a2a
:git: https://github.com/wordpress-mobile/WordPressKit-iOS.git

SPEC CHECKSUMS:
Alamofire: 02b772c9910e8eba1a079227c32fbd9e46c90a24
Expand Down Expand Up @@ -220,8 +215,8 @@ SPEC CHECKSUMS:
UIDeviceIdentifier: 442b65b4ff1832d4ca9c2a157815cb29ad981b17
WordPress-Aztec-iOS: 3732c6d865a5c9f35788377bdeda8a80ea10d0a1
WordPress-Editor-iOS: 453345420ced3d3ef20f0051b3df46ff10281e0c
WordPressAuthenticator: 6be121346d4303dd32904a57f6d0e68eaa825152
WordPressKit: f6dc2acce37a526ddb59e02388b3d59da50918ed
WordPressAuthenticator: 898acaac75c5ade9b900c02622a15b9aef8fde1a
WordPressKit: a71cc550f4b525ab5eef057984c8de071462edd5
WordPressShared: 04c6d51441bb8fa29651075b3a5536c90ae89c76
WordPressUI: ec5ebcf7e63e797ba51d07513e340c1b14cf45a4
wpxmlrpc: 68db063041e85d186db21f674adf08d9c70627fd
Expand All @@ -234,6 +229,6 @@ SPEC CHECKSUMS:
ZendeskSupportSDK: 3a8e508ab1d9dd22dc038df6c694466414e037ba
ZIPFoundation: d170fa8e270b2a32bef9dcdcabff5b8f1a5deced

PODFILE CHECKSUM: 6e74065cba7463e109be714fa4648c038642c5bf
PODFILE CHECKSUM: 97ff5204073bd07d564a6d36b1ee21a398dba255

COCOAPODS: 1.15.2
4 changes: 4 additions & 0 deletions RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
24.8
-----


24.7
-----

Expand Down
7 changes: 4 additions & 3 deletions WordPress/Jetpack/Resources/release_notes.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
We fixed a handful of issues with highlighted text formatting. We don’t know about you, but that’s the highlight of our week.
While we were at it, we solved the problems causing multiple error messages on the Insights screen. No drama, just data.
You should also see the most current version of your site in the reader—not an older, cached version. Newer is always better.

* [*] [Jetpack-only] Stats: Optimized the Insights tab to enhance loading and scrolling performance. [#22592]


Loading

0 comments on commit 0d18629

Please sign in to comment.