From 8d697dd5b5a17eaba9345f9378aae37b90c348d6 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Wed, 13 Dec 2023 09:48:54 +1100 Subject: [PATCH 1/7] Bump version number --- config/Version.internal.xcconfig | 4 ++-- config/Version.public.xcconfig | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/Version.internal.xcconfig b/config/Version.internal.xcconfig index 58348e722e41..bd0ed1c4bbf0 100644 --- a/config/Version.internal.xcconfig +++ b/config/Version.internal.xcconfig @@ -1,2 +1,2 @@ -VERSION_LONG = 23.8.0.20231208 -VERSION_SHORT = 23.8 +VERSION_LONG = 23.8.1.20231213 +VERSION_SHORT = 23.8.1 diff --git a/config/Version.public.xcconfig b/config/Version.public.xcconfig index ab4fc191542b..f530d468d0c3 100644 --- a/config/Version.public.xcconfig +++ b/config/Version.public.xcconfig @@ -1,2 +1,2 @@ -VERSION_LONG = 23.8.0.3 -VERSION_SHORT = 23.8 +VERSION_LONG = 23.8.1.0 +VERSION_SHORT = 23.8.1 From 0834423512ed694b5c3aaf07cd034b06e7216ce7 Mon Sep 17 00:00:00 2001 From: Chris McGraw <2454408+wargcm@users.noreply.github.com> Date: Tue, 12 Dec 2023 19:07:40 -0500 Subject: [PATCH 2/7] Replace hyphen with dash in Bloganuary nudge text --- .../Cards/Prompts/DashboardBloganuaryCardCell.swift | 2 +- WordPress/Resources/en-GB.lproj/Localizable.strings | 2 +- WordPress/Resources/en.lproj/Localizable.strings | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/WordPress/Classes/ViewRelated/Blog/Blog Dashboard/Cards/Prompts/DashboardBloganuaryCardCell.swift b/WordPress/Classes/ViewRelated/Blog/Blog Dashboard/Cards/Prompts/DashboardBloganuaryCardCell.swift index d81169c5ec1c..71030375ae57 100644 --- a/WordPress/Classes/ViewRelated/Blog/Blog Dashboard/Cards/Prompts/DashboardBloganuaryCardCell.swift +++ b/WordPress/Classes/ViewRelated/Blog/Blog Dashboard/Cards/Prompts/DashboardBloganuaryCardCell.swift @@ -163,7 +163,7 @@ private struct BloganuaryNudgeCardView: View { static let description = NSLocalizedString( "bloganuary.dashboard.card.description", value: """ - For the month of January, blogging prompts will come from Bloganuary - \ + For the month of January, blogging prompts will come from Bloganuary — \ our community challenge to build a blogging habit for the new year. """, comment: "Short description for the Bloganuary event, shown right below the title." diff --git a/WordPress/Resources/en-GB.lproj/Localizable.strings b/WordPress/Resources/en-GB.lproj/Localizable.strings index 3fbcdcb4e9d0..042106adf0c3 100644 --- a/WordPress/Resources/en-GB.lproj/Localizable.strings +++ b/WordPress/Resources/en-GB.lproj/Localizable.strings @@ -9568,7 +9568,7 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */ "bloganuary.dashboard.card.button.learnMore" = "Learn more"; /* Short description for the Bloganuary event, shown right below the title. */ -"bloganuary.dashboard.card.description" = "For the month of January, blogging prompts will come from Bloganuary – our community challenge to build a blogging habit for the new year."; +"bloganuary.dashboard.card.description" = "For the month of January, blogging prompts will come from Bloganuary — our community challenge to build a blogging habit for the new year."; /* Title for the Bloganuary dashboard card. */ "bloganuary.dashboard.card.title" = "Bloganuary is coming!"; diff --git a/WordPress/Resources/en.lproj/Localizable.strings b/WordPress/Resources/en.lproj/Localizable.strings index b9f9a123e786..a05023cb3acd 100644 --- a/WordPress/Resources/en.lproj/Localizable.strings +++ b/WordPress/Resources/en.lproj/Localizable.strings @@ -1367,7 +1367,7 @@ "bloganuary.dashboard.card.button.learnMore" = "Learn more"; /* Short description for the Bloganuary event, shown right below the title. */ -"bloganuary.dashboard.card.description" = "For the month of January, blogging prompts will come from Bloganuary - our community challenge to build a blogging habit for the new year."; +"bloganuary.dashboard.card.description" = "For the month of January, blogging prompts will come from Bloganuary — our community challenge to build a blogging habit for the new year."; /* Title for the Bloganuary dashboard card. */ "bloganuary.dashboard.card.title" = "Bloganuary is coming!"; From 6155351482548b5ebd768a36b82eb281cdc81b98 Mon Sep 17 00:00:00 2001 From: Chris McGraw <2454408+wargcm@users.noreply.github.com> Date: Tue, 12 Dec 2023 19:35:47 -0500 Subject: [PATCH 3/7] Update Bloganury nude text's `value` to be one line --- .../Cards/Prompts/DashboardBloganuaryCardCell.swift | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/WordPress/Classes/ViewRelated/Blog/Blog Dashboard/Cards/Prompts/DashboardBloganuaryCardCell.swift b/WordPress/Classes/ViewRelated/Blog/Blog Dashboard/Cards/Prompts/DashboardBloganuaryCardCell.swift index 71030375ae57..e267bab74592 100644 --- a/WordPress/Classes/ViewRelated/Blog/Blog Dashboard/Cards/Prompts/DashboardBloganuaryCardCell.swift +++ b/WordPress/Classes/ViewRelated/Blog/Blog Dashboard/Cards/Prompts/DashboardBloganuaryCardCell.swift @@ -162,10 +162,7 @@ private struct BloganuaryNudgeCardView: View { static let description = NSLocalizedString( "bloganuary.dashboard.card.description", - value: """ - For the month of January, blogging prompts will come from Bloganuary — \ - our community challenge to build a blogging habit for the new year. - """, + value: "For the month of January, blogging prompts will come from Bloganuary — our community challenge to build a blogging habit for the new year.", comment: "Short description for the Bloganuary event, shown right below the title." ) From 244ffbdc7d46d35d5bd4dc74a8e375374a43fb58 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Wed, 13 Dec 2023 12:45:03 +1100 Subject: [PATCH 4/7] Replace hyphen with dash in Bloganuary nudge `ar` localization --- WordPress/Resources/ar.lproj/Localizable.strings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/Resources/ar.lproj/Localizable.strings b/WordPress/Resources/ar.lproj/Localizable.strings index 007dc9618bc2..7cfbe8272d9e 100644 --- a/WordPress/Resources/ar.lproj/Localizable.strings +++ b/WordPress/Resources/ar.lproj/Localizable.strings @@ -9562,7 +9562,7 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */ "bloganuary.dashboard.card.button.learnMore" = "معرفة المزيد"; /* Short description for the Bloganuary event, shown right below the title. */ -"bloganuary.dashboard.card.description" = "بالنسبة إلى شهر يناير، ستأتي موجّهات التدوين من Bloganuary - تحدٍّ مجتمعي لدينا لإنشاء عادة التدوين الخاصة بالعام الجديد."; +"bloganuary.dashboard.card.description" = "بالنسبة إلى شهر يناير، ستأتي موجّهات التدوين من Bloganuary — تحدٍّ مجتمعي لدينا لإنشاء عادة التدوين الخاصة بالعام الجديد."; /* Title for the Bloganuary dashboard card. */ "bloganuary.dashboard.card.title" = "Bloganuary قادمة!"; From 41ccbcb0cb830629b8a4cc71c7ba88b944aa1c9c Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Wed, 13 Dec 2023 12:45:03 +1100 Subject: [PATCH 5/7] Replace hyphen with em dash in Bloganuary nudge `ar` localization --- WordPress/Resources/ar.lproj/Localizable.strings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/Resources/ar.lproj/Localizable.strings b/WordPress/Resources/ar.lproj/Localizable.strings index 007dc9618bc2..7cfbe8272d9e 100644 --- a/WordPress/Resources/ar.lproj/Localizable.strings +++ b/WordPress/Resources/ar.lproj/Localizable.strings @@ -9562,7 +9562,7 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */ "bloganuary.dashboard.card.button.learnMore" = "معرفة المزيد"; /* Short description for the Bloganuary event, shown right below the title. */ -"bloganuary.dashboard.card.description" = "بالنسبة إلى شهر يناير، ستأتي موجّهات التدوين من Bloganuary - تحدٍّ مجتمعي لدينا لإنشاء عادة التدوين الخاصة بالعام الجديد."; +"bloganuary.dashboard.card.description" = "بالنسبة إلى شهر يناير، ستأتي موجّهات التدوين من Bloganuary — تحدٍّ مجتمعي لدينا لإنشاء عادة التدوين الخاصة بالعام الجديد."; /* Title for the Bloganuary dashboard card. */ "bloganuary.dashboard.card.title" = "Bloganuary قادمة!"; From 372a322a9dbfe11ba5153c145c685307b3305cd8 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Wed, 13 Dec 2023 12:55:16 +1100 Subject: [PATCH 6/7] Replace hyphen with em dash in Bloganuary nudge `ro` localization --- WordPress/Resources/ro.lproj/Localizable.strings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/Resources/ro.lproj/Localizable.strings b/WordPress/Resources/ro.lproj/Localizable.strings index c39bb5a4ac36..920955a58587 100644 --- a/WordPress/Resources/ro.lproj/Localizable.strings +++ b/WordPress/Resources/ro.lproj/Localizable.strings @@ -9568,7 +9568,7 @@ translators: %s: Select control option value e.g: \"Auto, 25%\". */ "bloganuary.dashboard.card.button.learnMore" = "Află mai multe"; /* Short description for the Bloganuary event, shown right below the title. */ -"bloganuary.dashboard.card.description" = "În luna ianuarie, îndemnurile de a scrie vor veni de la Bloganuary - provocarea comunității noastre de a crea un obicei de a scrie pe bloguri în noul an."; +"bloganuary.dashboard.card.description" = "În luna ianuarie, îndemnurile de a scrie vor veni de la Bloganuary — provocarea comunității noastre de a crea un obicei de a scrie pe bloguri în noul an."; /* Title for the Bloganuary dashboard card. */ "bloganuary.dashboard.card.title" = "Bloganuary vine în curând!"; From 962d2f214bb735e855bc7701a5f5f32a56acbde3 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Wed, 13 Dec 2023 15:09:41 +1100 Subject: [PATCH 7/7] Update Fastlane to version 2.217.0 This was done because the automation to upload metadata to ASC kept failing due to being unable to find an editable version. Before looking more into it, I decided to update Fastlane. The problem went away, however I can't tell whether it was due to the update or just ASC flakiness as the release notes don't explicitly mention this. See https://github.com/fastlane/fastlane/releases/tag/2.217.0 --- Gemfile.lock | 59 +++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 31 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index f985bfc1999a..31bf340e114e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -21,7 +21,7 @@ GEM i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.8.5) + addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) @@ -29,21 +29,21 @@ GEM artifactory (3.0.15) ast (2.4.2) atomos (0.1.3) - aws-eventstream (1.2.0) - aws-partitions (1.843.0) - aws-sdk-core (3.185.1) - aws-eventstream (~> 1, >= 1.0.2) + aws-eventstream (1.3.0) + aws-partitions (1.865.0) + aws-sdk-core (3.190.0) + aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.5) + aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.72.0) - aws-sdk-core (~> 3, >= 3.184.0) + aws-sdk-kms (1.74.0) + aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.136.0) - aws-sdk-core (~> 3, >= 3.181.0) + aws-sdk-s3 (1.141.0) + aws-sdk-core (~> 3, >= 3.189.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.6) - aws-sigv4 (1.6.1) + aws-sigv4 (~> 1.8) + aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) buildkit (1.5.0) @@ -131,14 +131,13 @@ GEM diffy (3.4.2) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) + domain_name (0.6.20231109) dotenv (2.8.1) emoji_regex (3.2.3) escape (0.0.4) ethon (0.16.0) ffi (>= 1.15.0) - excon (0.104.0) + excon (0.105.0) faraday (1.10.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -170,7 +169,7 @@ GEM faraday_middleware (1.2.0) faraday (~> 1.0) fastimage (2.2.7) - fastlane (2.216.0) + fastlane (2.217.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -237,7 +236,7 @@ GEM git (1.18.0) addressable (~> 2.8) rchardet (~> 1.8) - google-apis-androidpublisher_v3 (0.51.0) + google-apis-androidpublisher_v3 (0.53.0) google-apis-core (>= 0.11.0, < 2.a) google-apis-core (0.11.2) addressable (~> 2.5, >= 2.5.1) @@ -252,24 +251,25 @@ GEM google-apis-core (>= 0.11.0, < 2.a) google-apis-playcustomapp_v1 (0.13.0) google-apis-core (>= 0.11.0, < 2.a) - google-apis-storage_v1 (0.19.0) - google-apis-core (>= 0.9.0, < 2.a) - google-cloud-core (1.6.0) - google-cloud-env (~> 1.0) + google-apis-storage_v1 (0.29.0) + google-apis-core (>= 0.11.0, < 2.a) + google-cloud-core (1.6.1) + google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) - google-cloud-env (1.6.0) - faraday (>= 0.17.3, < 3.0) + google-cloud-env (2.1.0) + faraday (>= 1.0, < 3.a) google-cloud-errors (1.3.1) - google-cloud-storage (1.44.0) + google-cloud-storage (1.45.0) addressable (~> 2.8) digest-crc (~> 0.4) google-apis-iamcredentials_v1 (~> 0.1) - google-apis-storage_v1 (~> 0.19.0) + google-apis-storage_v1 (~> 0.29.0) google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - googleauth (1.8.1) - faraday (>= 0.17.3, < 3.a) + googleauth (1.9.1) + faraday (>= 1.0, < 3.a) + google-cloud-env (~> 2.1) jwt (>= 1.4, < 3.0) multi_json (~> 1.11) os (>= 0.9, < 2.0) @@ -282,7 +282,7 @@ GEM concurrent-ruby (~> 1.0) java-properties (0.3.0) jmespath (1.6.2) - json (2.6.3) + json (2.7.1) jwt (2.7.1) kramdown (2.4.0) rexml @@ -381,9 +381,6 @@ GEM tzinfo (2.0.6) concurrent-ruby (~> 1.0) uber (0.1.0) - unf (0.1.4) - unf_ext - unf_ext (0.0.8.2) unicode-display_width (2.5.0) webrick (1.8.1) word_wrap (1.0.0)