Skip to content

Commit db5bbc7

Browse files
oguzkoceroguzkocer
authored
Merge pull request #20205 from wordpress-mobile/release/24.3
Merge 24.3 code freeze to trunk
2 parents 0d4a330 + 9371c0e commit db5bbc7

File tree

7 files changed

+63
-49
lines changed

7 files changed

+63
-49
lines changed

‎Gemfile.lock‎

Lines changed: 43 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.6)
4+
CFPropertyList (3.0.7)
5+
base64
6+
nkf
57
rexml
6-
activesupport (7.1.2)
8+
activesupport (7.1.3)
79
base64
810
bigdecimal
911
concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -19,24 +21,25 @@ GEM
1921
ast (2.4.2)
2022
atomos (0.1.3)
2123
aws-eventstream (1.3.0)
22-
aws-partitions (1.855.0)
23-
aws-sdk-core (3.188.0)
24-
aws-eventstream (~> 1, >= 1.0.2)
24+
aws-partitions (1.894.0)
25+
aws-sdk-core (3.191.2)
26+
aws-eventstream (~> 1, >= 1.3.0)
2527
aws-partitions (~> 1, >= 1.651.0)
26-
aws-sigv4 (~> 1.5)
28+
aws-sigv4 (~> 1.8)
29+
base64
2730
jmespath (~> 1, >= 1.6.1)
28-
aws-sdk-kms (1.73.0)
29-
aws-sdk-core (~> 3, >= 3.188.0)
31+
aws-sdk-kms (1.77.0)
32+
aws-sdk-core (~> 3, >= 3.191.0)
3033
aws-sigv4 (~> 1.1)
31-
aws-sdk-s3 (1.139.0)
32-
aws-sdk-core (~> 3, >= 3.188.0)
34+
aws-sdk-s3 (1.143.0)
35+
aws-sdk-core (~> 3, >= 3.191.0)
3336
aws-sdk-kms (~> 1)
34-
aws-sigv4 (~> 1.6)
35-
aws-sigv4 (1.7.0)
37+
aws-sigv4 (~> 1.8)
38+
aws-sigv4 (1.8.0)
3639
aws-eventstream (~> 1, >= 1.0.2)
3740
babosa (1.0.4)
3841
base64 (0.2.0)
39-
bigdecimal (3.1.4)
42+
bigdecimal (3.1.6)
4043
buildkit (1.5.0)
4144
sawyer (>= 0.6)
4245
chroma (0.2.0)
@@ -49,7 +52,7 @@ GEM
4952
colored2 (3.1.2)
5053
commander (4.6.0)
5154
highline (~> 2.0.0)
52-
concurrent-ruby (1.2.2)
55+
concurrent-ruby (1.2.3)
5356
connection_pool (2.4.1)
5457
cork (0.3.0)
5558
colored2 (~> 3.1)
@@ -86,19 +89,19 @@ GEM
8689
danger
8790
rake (> 10)
8891
thor (~> 1.0.0)
89-
danger-xcode_summary (1.2.0)
92+
danger-xcode_summary (1.3.0)
9093
danger-plugin-api (~> 1.0)
9194
xcresult (~> 0.2)
9295
declarative (0.0.20)
9396
diffy (3.4.2)
9497
digest-crc (0.6.5)
9598
rake (>= 12.0.0, < 14.0.0)
96-
domain_name (0.6.20231109)
99+
domain_name (0.6.20240107)
97100
dotenv (2.8.1)
98101
drb (2.2.0)
99102
ruby2_keywords
100103
emoji_regex (3.2.3)
101-
excon (0.104.0)
104+
excon (0.109.0)
102105
faraday (1.10.3)
103106
faraday-em_http (~> 1.0)
104107
faraday-em_synchrony (~> 1.0)
@@ -129,8 +132,8 @@ GEM
129132
faraday-retry (1.0.3)
130133
faraday_middleware (1.2.0)
131134
faraday (~> 1.0)
132-
fastimage (2.2.7)
133-
fastlane (2.217.0)
135+
fastimage (2.3.0)
136+
fastlane (2.219.0)
134137
CFPropertyList (>= 2.3, < 4.0.0)
135138
addressable (>= 2.8, < 3.0.0)
136139
artifactory (~> 3.0)
@@ -149,6 +152,7 @@ GEM
149152
gh_inspector (>= 1.1.2, < 2.0.0)
150153
google-apis-androidpublisher_v3 (~> 0.3)
151154
google-apis-playcustomapp_v1 (~> 0.1)
155+
google-cloud-env (>= 1.6.0, < 2.0.0)
152156
google-cloud-storage (~> 1.31)
153157
highline (~> 2.0)
154158
http-cookie (~> 1.0.5)
@@ -157,7 +161,7 @@ GEM
157161
mini_magick (>= 4.9.4, < 5.0.0)
158162
multipart-post (>= 2.0.0, < 3.0.0)
159163
naturally (~> 2.2)
160-
optparse (~> 0.1.1)
164+
optparse (>= 0.1.1)
161165
plist (>= 3.1.0, < 4.0.0)
162166
rubyzip (>= 2.0.0, < 3.0.0)
163167
security (= 0.1.3)
@@ -170,7 +174,7 @@ GEM
170174
xcodeproj (>= 1.13.0, < 2.0.0)
171175
xcpretty (~> 0.3.0)
172176
xcpretty-travis-formatter (>= 0.0.3)
173-
fastlane-plugin-wpmreleasetoolkit (9.2.0)
177+
fastlane-plugin-wpmreleasetoolkit (9.4.0)
174178
activesupport (>= 6.1.7.1)
175179
buildkit (~> 1.5)
176180
chroma (= 0.2.0)
@@ -179,7 +183,7 @@ GEM
179183
git (~> 1.3)
180184
google-cloud-storage (~> 1.31)
181185
java-properties (~> 0.3.0)
182-
nokogiri (~> 1.11)
186+
nokogiri (~> 1.11, < 1.16)
183187
octokit (~> 6.1)
184188
parallel (~> 1.14)
185189
plist (~> 3.1)
@@ -191,34 +195,33 @@ GEM
191195
git (1.19.1)
192196
addressable (~> 2.8)
193197
rchardet (~> 1.8)
194-
google-apis-androidpublisher_v3 (0.53.0)
198+
google-apis-androidpublisher_v3 (0.54.0)
195199
google-apis-core (>= 0.11.0, < 2.a)
196-
google-apis-core (0.11.2)
200+
google-apis-core (0.11.3)
197201
addressable (~> 2.5, >= 2.5.1)
198202
googleauth (>= 0.16.2, < 2.a)
199203
httpclient (>= 2.8.1, < 3.a)
200204
mini_mime (~> 1.0)
201205
representable (~> 3.0)
202206
retriable (>= 2.0, < 4.a)
203207
rexml
204-
webrick
205208
google-apis-iamcredentials_v1 (0.17.0)
206209
google-apis-core (>= 0.11.0, < 2.a)
207210
google-apis-playcustomapp_v1 (0.13.0)
208211
google-apis-core (>= 0.11.0, < 2.a)
209-
google-apis-storage_v1 (0.29.0)
212+
google-apis-storage_v1 (0.31.0)
210213
google-apis-core (>= 0.11.0, < 2.a)
211-
google-cloud-core (1.6.0)
212-
google-cloud-env (~> 1.0)
214+
google-cloud-core (1.6.1)
215+
google-cloud-env (>= 1.0, < 3.a)
213216
google-cloud-errors (~> 1.0)
214217
google-cloud-env (1.6.0)
215218
faraday (>= 0.17.3, < 3.0)
216219
google-cloud-errors (1.3.1)
217-
google-cloud-storage (1.45.0)
220+
google-cloud-storage (1.47.0)
218221
addressable (~> 2.8)
219222
digest-crc (~> 0.4)
220223
google-apis-iamcredentials_v1 (~> 0.1)
221-
google-apis-storage_v1 (~> 0.29.0)
224+
google-apis-storage_v1 (~> 0.31.0)
222225
google-cloud-core (~> 1.6)
223226
googleauth (>= 0.16.2, < 2.a)
224227
mini_mime (~> 1.0)
@@ -237,7 +240,8 @@ GEM
237240
java-properties (0.3.0)
238241
jmespath (1.6.2)
239242
json (2.7.1)
240-
jwt (2.7.1)
243+
jwt (2.8.0)
244+
base64
241245
kramdown (2.4.0)
242246
rexml
243247
kramdown-parser-gfm (1.1.0)
@@ -246,13 +250,14 @@ GEM
246250
mini_magick (4.12.0)
247251
mini_mime (1.1.5)
248252
mini_portile2 (2.8.5)
249-
minitest (5.20.0)
253+
minitest (5.22.2)
250254
multi_json (1.15.0)
251255
multipart-post (2.4.0)
252256
mutex_m (0.2.0)
253257
nanaimo (0.3.0)
254258
nap (1.1.0)
255259
naturally (2.2.1)
260+
nkf (0.2.0)
256261
no_proxy_fix (0.1.2)
257262
nokogiri (1.15.5)
258263
mini_portile2 (~> 2.8.2)
@@ -262,22 +267,22 @@ GEM
262267
sawyer (~> 0.9)
263268
open4 (1.3.4)
264269
options (2.3.2)
265-
optparse (0.1.1)
270+
optparse (0.4.0)
266271
os (1.1.4)
267272
ox (2.14.17)
268273
parallel (1.24.0)
269274
parser (3.3.0.5)
270275
ast (~> 2.4.1)
271276
racc
272-
plist (3.7.0)
277+
plist (3.7.1)
273278
progress_bar (1.3.3)
274279
highline (>= 1.6, < 3)
275280
options (~> 2.3.0)
276281
public_suffix (5.0.4)
277282
racc (1.7.3)
278283
rainbow (3.1.1)
279284
rake (13.1.0)
280-
rake-compiler (1.2.5)
285+
rake-compiler (1.2.7)
281286
rake
282287
rchardet (1.8.0)
283288
regexp_parser (2.9.0)
@@ -309,7 +314,7 @@ GEM
309314
addressable (>= 2.3.5)
310315
faraday (>= 0.17.3, < 3)
311316
security (0.1.3)
312-
signet (0.18.0)
317+
signet (0.19.0)
313318
addressable (~> 2.8)
314319
faraday (>= 0.17.5, < 3.a)
315320
jwt (>= 1.5, < 3.0)
@@ -323,16 +328,15 @@ GEM
323328
thor (1.0.1)
324329
trailblazer-option (0.1.2)
325330
tty-cursor (0.7.1)
326-
tty-screen (0.8.1)
331+
tty-screen (0.8.2)
327332
tty-spinner (0.9.3)
328333
tty-cursor (~> 0.7)
329334
tzinfo (2.0.6)
330335
concurrent-ruby (~> 1.0)
331336
uber (0.1.0)
332337
unicode-display_width (2.5.0)
333-
webrick (1.8.1)
334338
word_wrap (1.0.0)
335-
xcodeproj (1.23.0)
339+
xcodeproj (1.24.0)
336340
CFPropertyList (>= 2.3.3, < 4.0)
337341
atomos (~> 0.1.3)
338342
claide (>= 1.0.2, < 2.0)

‎RELEASE-NOTES.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
*** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
22

3+
24.4
4+
-----
5+
6+
37
24.3
48
-----
59
* [**] Added support to use third-party passkey providers and other devices passkeys as a WordPress.com login option [https://github.com/wordpress-mobile/WordPress-Android/pull/20174]

‎WordPress/jetpack_metadata/release_notes.txt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
- We added a new look and feel for content navigation and filtering.
2-
- Images and other media won’t “blink” during upload.
3-
- The editor won’t crash when you’re working on a large post.
4-
- We added new Site Monitoring menu items like metrics, PHP logs, and web server logs.
1+
* [**] Added support to use third-party passkey providers and other devices passkeys as a WordPress.com login option [https://github.com/wordpress-mobile/WordPress-Android/pull/20174]
2+
* [*] [Jetpack-only] Fix the visibility issue with the menu button on the stats [https://github.com/wordpress-mobile/WordPress-Android/pull/20175]
3+

‎WordPress/metadata/release_notes.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
We fixed an issue that made images and other media blink away while being uploaded. Presto, no more disappearing act.
1+
* [**] Added support to use third-party passkey providers and other devices passkeys as a WordPress.com login option [https://github.com/wordpress-mobile/WordPress-Android/pull/20174]
22

3-
The editor won’t crash anymore when you’re working on large posts. That’s right, we’ve saved your drafts and your sanity.

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ ext {
2525
automatticTracksVersion = '3.4.0'
2626
gutenbergMobileVersion = 'v1.112.0'
2727
wordPressAztecVersion = 'v2.0'
28-
wordPressFluxCVersion = 'trunk-ed60798b4d96ec19863c74b0f525e2e20f4525db'
29-
wordPressLoginVersion = 'trunk-a90b1ce939aba700d822f188d41624385f9c1dce'
28+
wordPressFluxCVersion = '2.67.0'
29+
wordPressLoginVersion = '1.14.0'
3030
wordPressPersistentEditTextVersion = '1.0.2'
3131
wordPressUtilsVersion = '3.13.0'
3232
indexosMediaForMobileVersion = '43a9026f0973a2f0a74fa813132f6a16f7499c3a'

‎fastlane/resources/values/strings.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2869,6 +2869,11 @@
28692869
<string name="premium_upgrades_message">You have active premium upgrades on your site. Please cancel your upgrades prior to deleting your site.</string>
28702870
<string name="show_purchases">Show purchases</string>
28712871
<string name="checking_purchases">Checking purchases</string>
2872+
<string name="gravatar_info_title">Your WordPress.com profile is powered by Gravatar</string>
2873+
<string name="gravatar_info_description">Updating your avatar, name, and about info here will also update it across all sites that use Gravatar profiles.</string>
2874+
<string name="gravatar_info_learn_more_link">What is Gravatar?</string>
2875+
<string name="gravatar_info_sync_message">Updates might take some time to sync with your Gravatar profile.</string>
2876+
<string name="gravatar_info_sync_done_button">Done</string>
28722877

28732878
<!--Account Settings-->
28742879
<string name="account_settings">Account Settings</string>
@@ -4880,4 +4885,7 @@ translators: %s: Select control option value e.g: "Auto, 25%". -->
48804885
<string name="site_monitoring_tab_title_php_logs">PHP Logs</string>
48814886
<string name="site_monitoring_tab_title_web_server_logs">Web Server Logs</string>
48824887
<string name="site_monitoring_cannot_be_started">We cannot open site monitoring at the moment. Please try again later</string>
4888+
4889+
<!-- Super Fast Media Upload QRCodeMediaLink -->
4890+
<string name="qrcode_media_deeplink_error">Site not found. Check that you are logged into the correct account.</string>
48834891
</resources>

‎version.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
versionName=24.2
2-
versionCode=1410
1+
versionName=24.3-rc-1
2+
versionCode=1411

0 commit comments

Comments
 (0)