Update Reader bundle id and add keychain access group (#24478)

* Move Reader bundle identifier definition to `xcconfig`

* Update Reader bundle identifier to new one with correct app prefix id

Internal ref paaHJt-8hM-p2

* Add keychain access group to Reader entitlements

* Update Reader iTunes ID

See paaHJt-8hM-p2

* Add required `NSPhotoLibraryUsageDescription` to Reader

It's surprising that 4d7578f did not
include this key while also being successfully distributed to
TestFlight...

Author: mokagio

Sources/Reader/Info.plist

@@ -19,7 +19,7 @@
 	<key>WPExplatPlatform</key>
 	<string>wpios</string>
 	<key>WPItunesAppID</key>
-	<string>1565481562</string>
+	<string>6744776413</string>
 	<key>WPJetpackAppURLScheme</key>
 	<string>${WP_JETPACK_APP_URL_SCHEME}</string>
 	<key>WPMobileAnnounceAppID</key>

Sources/Reader/Reader.entitlements

@@ -14,5 +14,9 @@
 	<array>
 		<string>group.org.wordpress</string>
 	</array>
+	<key>keychain-access-groups</key>
+	<array>
+		<string>3TMU3BH3NK.org.wordpress</string>
+	</array>
 </dict>
 </plist>

WordPress/WordPress.xcodeproj/project.pbxproj

@@ -3962,6 +3962,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";
@@ -3972,7 +3973,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;
@@ -4010,6 +4010,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";
@@ -4020,7 +4021,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;
@@ -4057,6 +4057,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";
@@ -4067,7 +4068,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;

config/Reader.alpha.xcconfig

@@ -1,6 +1,8 @@
 #include "Common.alpha.xcconfig"
 #include "Version.public.xcconfig"
 
+PRODUCT_BUNDLE_IDENTIFIER = com.automattic.readerapp
+
 WP_PUSH_NOTIFICATION_APP_ID = TBD
 WP_BUILD_CONFIGURATION = alpha
 WP_APP_URL_SCHEME = wpreader

config/Reader.debug.xcconfig

@@ -1,6 +1,8 @@
 #include "Common.debug.xcconfig"
 #include "Version.public.xcconfig"
 
+PRODUCT_BUNDLE_IDENTIFIER = com.automattic.readerapp
+
 WP_PUSH_NOTIFICATION_APP_ID = TBD
 WP_BUILD_CONFIGURATION = debug
 WP_APP_URL_SCHEME = wpreader

config/Reader.release.xcconfig

@@ -1,6 +1,8 @@
 #include "Common.release.xcconfig"
 #include "Version.public.xcconfig"
 
+PRODUCT_BUNDLE_IDENTIFIER = com.automattic.readerapp
+
 WP_PUSH_NOTIFICATION_APP_ID = TBD
 WP_BUILD_CONFIGURATION = release
 WP_APP_URL_SCHEME = wpreader

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