From fbca2379ceb72307489b54555d0bdc2c0f8ba460 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Fri, 18 Apr 2025 07:59:49 +1000 Subject: [PATCH 1/5] Move Reader bundle identifier definition to `xcconfig` --- WordPress/WordPress.xcodeproj/project.pbxproj | 3 --- config/Reader.alpha.xcconfig | 2 ++ config/Reader.debug.xcconfig | 2 ++ config/Reader.release.xcconfig | 2 ++ 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/WordPress/WordPress.xcodeproj/project.pbxproj b/WordPress/WordPress.xcodeproj/project.pbxproj index f779f5f04956..eafd560a14f4 100644 --- a/WordPress/WordPress.xcodeproj/project.pbxproj +++ b/WordPress/WordPress.xcodeproj/project.pbxproj @@ -3992,7 +3992,6 @@ MARKETING_VERSION = "${VERSION_SHORT}"; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.automattic.reader; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)"; SWIFT_TREAT_WARNINGS_AS_ERRORS = NO; @@ -4040,7 +4039,6 @@ MARKETING_VERSION = "${VERSION_SHORT}"; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.automattic.reader; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_TREAT_WARNINGS_AS_ERRORS = NO; SWIFT_VERSION = 5.0; @@ -4087,7 +4085,6 @@ MARKETING_VERSION = "${VERSION_SHORT}"; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.automattic.reader; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_TREAT_WARNINGS_AS_ERRORS = NO; SWIFT_VERSION = 5.0; diff --git a/config/Reader.alpha.xcconfig b/config/Reader.alpha.xcconfig index 828e29ea2d6e..3e64238c336d 100644 --- a/config/Reader.alpha.xcconfig +++ b/config/Reader.alpha.xcconfig @@ -1,6 +1,8 @@ #include "Common.alpha.xcconfig" #include "Version.public.xcconfig" +PRODUCT_BUNDLE_IDENTIFIER = com.automattic.reader + WP_PUSH_NOTIFICATION_APP_ID = TBD WP_BUILD_CONFIGURATION = alpha WP_APP_URL_SCHEME = wpreader diff --git a/config/Reader.debug.xcconfig b/config/Reader.debug.xcconfig index 1b9f72ffa574..965a0969605e 100644 --- a/config/Reader.debug.xcconfig +++ b/config/Reader.debug.xcconfig @@ -1,6 +1,8 @@ #include "Common.debug.xcconfig" #include "Version.public.xcconfig" +PRODUCT_BUNDLE_IDENTIFIER = com.automattic.reader + WP_PUSH_NOTIFICATION_APP_ID = TBD WP_BUILD_CONFIGURATION = debug WP_APP_URL_SCHEME = wpreader diff --git a/config/Reader.release.xcconfig b/config/Reader.release.xcconfig index 573551319850..eb4daac82373 100644 --- a/config/Reader.release.xcconfig +++ b/config/Reader.release.xcconfig @@ -1,6 +1,8 @@ #include "Common.release.xcconfig" #include "Version.public.xcconfig" +PRODUCT_BUNDLE_IDENTIFIER = com.automattic.reader + WP_PUSH_NOTIFICATION_APP_ID = TBD WP_BUILD_CONFIGURATION = release WP_APP_URL_SCHEME = wpreader From ed3ffaa4b3b885ee554c3ec225f1c3dbe62a99dd Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Fri, 18 Apr 2025 08:11:06 +1000 Subject: [PATCH 2/5] Update Reader bundle identifier to new one with correct app prefix id Internal ref paaHJt-8hM-p2 --- config/Reader.alpha.xcconfig | 2 +- config/Reader.debug.xcconfig | 2 +- config/Reader.release.xcconfig | 2 +- fastlane/Fastfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/Reader.alpha.xcconfig b/config/Reader.alpha.xcconfig index 3e64238c336d..17b40f97ba3b 100644 --- a/config/Reader.alpha.xcconfig +++ b/config/Reader.alpha.xcconfig @@ -1,7 +1,7 @@ #include "Common.alpha.xcconfig" #include "Version.public.xcconfig" -PRODUCT_BUNDLE_IDENTIFIER = com.automattic.reader +PRODUCT_BUNDLE_IDENTIFIER = com.automattic.readerapp WP_PUSH_NOTIFICATION_APP_ID = TBD WP_BUILD_CONFIGURATION = alpha diff --git a/config/Reader.debug.xcconfig b/config/Reader.debug.xcconfig index 965a0969605e..6dbe490d37a1 100644 --- a/config/Reader.debug.xcconfig +++ b/config/Reader.debug.xcconfig @@ -1,7 +1,7 @@ #include "Common.debug.xcconfig" #include "Version.public.xcconfig" -PRODUCT_BUNDLE_IDENTIFIER = com.automattic.reader +PRODUCT_BUNDLE_IDENTIFIER = com.automattic.readerapp WP_PUSH_NOTIFICATION_APP_ID = TBD WP_BUILD_CONFIGURATION = debug diff --git a/config/Reader.release.xcconfig b/config/Reader.release.xcconfig index eb4daac82373..b2e88a878233 100644 --- a/config/Reader.release.xcconfig +++ b/config/Reader.release.xcconfig @@ -1,7 +1,7 @@ #include "Common.release.xcconfig" #include "Version.public.xcconfig" -PRODUCT_BUNDLE_IDENTIFIER = com.automattic.reader +PRODUCT_BUNDLE_IDENTIFIER = com.automattic.readerapp WP_PUSH_NOTIFICATION_APP_ID = TBD WP_BUILD_CONFIGURATION = release diff --git a/fastlane/Fastfile b/fastlane/Fastfile index edbb0b93f57f..af2f3b4f2626 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -48,7 +48,7 @@ JETPACK_EXTENSIONS_BUNDLE_IDENTIFIERS = %w[ ].map { |suffix| "#{JETPACK_BUNDLE_IDENTIFIER}.#{suffix}" } ALL_JETPACK_BUNDLE_IDENTIFIERS = [JETPACK_BUNDLE_IDENTIFIER, *JETPACK_EXTENSIONS_BUNDLE_IDENTIFIERS].freeze -READER_BUNDLE_IDENTIFIER = 'com.automattic.reader' +READER_BUNDLE_IDENTIFIER = 'com.automattic.readerapp' # Redundant but handy for consistency, especially in codesign.rb ALL_READER_BUNDLE_IDENTIFIERS = [READER_BUNDLE_IDENTIFIER].freeze From 26df4fa7140a403af75a2cf6ce04399a9da01401 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Fri, 18 Apr 2025 08:13:27 +1000 Subject: [PATCH 3/5] Add keychain access group to Reader entitlements --- Sources/Reader/Reader.entitlements | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Sources/Reader/Reader.entitlements b/Sources/Reader/Reader.entitlements index 70cf1beeadfb..f88a631916f2 100644 --- a/Sources/Reader/Reader.entitlements +++ b/Sources/Reader/Reader.entitlements @@ -14,5 +14,9 @@ group.org.wordpress + keychain-access-groups + + 3TMU3BH3NK.org.wordpress + From b085e5152a5bf17ff1de6d15765e2fc3832c4751 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Fri, 18 Apr 2025 08:20:20 +1000 Subject: [PATCH 4/5] Update Reader iTunes ID See paaHJt-8hM-p2 --- Sources/Reader/Info.plist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/Reader/Info.plist b/Sources/Reader/Info.plist index 8ef8b93c285c..2681b2ffa522 100644 --- a/Sources/Reader/Info.plist +++ b/Sources/Reader/Info.plist @@ -19,7 +19,7 @@ WPExplatPlatform wpios WPItunesAppID - 1565481562 + 6744776413 WPJetpackAppURLScheme ${WP_JETPACK_APP_URL_SCHEME} WPMobileAnnounceAppID From 3ba04d8b9b52938569e53a858a2d9d6ffd8c12e8 Mon Sep 17 00:00:00 2001 From: Gio Lodi Date: Tue, 22 Apr 2025 12:51:00 +1000 Subject: [PATCH 5/5] Add required `NSPhotoLibraryUsageDescription` to Reader It's surprising that 4d7578f667080139236a1ae83ea72402f84167ec did not include this key while also being successfully distributed to TestFlight... --- WordPress/WordPress.xcodeproj/project.pbxproj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/WordPress/WordPress.xcodeproj/project.pbxproj b/WordPress/WordPress.xcodeproj/project.pbxproj index eafd560a14f4..b800bce693e8 100644 --- a/WordPress/WordPress.xcodeproj/project.pbxproj +++ b/WordPress/WordPress.xcodeproj/project.pbxproj @@ -3982,6 +3982,7 @@ INFOPLIST_KEY_ITSAppUsesNonExemptEncryption = NO; INFOPLIST_KEY_NSCameraUsageDescription = "To take photos or videos to use in your posts."; INFOPLIST_KEY_NSMicrophoneUsageDescription = "Enable microphone access to record sound in your videos."; + INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "To add photos or videos to your posts."; INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; @@ -4029,6 +4030,7 @@ INFOPLIST_KEY_ITSAppUsesNonExemptEncryption = NO; INFOPLIST_KEY_NSCameraUsageDescription = "To take photos or videos to use in your posts."; INFOPLIST_KEY_NSMicrophoneUsageDescription = "Enable microphone access to record sound in your videos."; + INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "To add photos or videos to your posts."; INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown"; @@ -4075,6 +4077,7 @@ INFOPLIST_KEY_ITSAppUsesNonExemptEncryption = NO; INFOPLIST_KEY_NSCameraUsageDescription = "To take photos or videos to use in your posts."; INFOPLIST_KEY_NSMicrophoneUsageDescription = "Enable microphone access to record sound in your videos."; + INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "To add photos or videos to your posts."; INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";