From 85ffd915fa184a056797118990cc51a358edb532 Mon Sep 17 00:00:00 2001 From: Diego Mello Date: Mon, 19 Jun 2023 18:07:49 -0300 Subject: [PATCH] Signing to main --- ios/NotificationService/Info.plist | 4 +- ios/RocketChatRN.xcodeproj/project.pbxproj | 44 +++++++++++++--------- ios/RocketChatRN/Info.plist | 14 +++---- ios/ShareRocketChatRN/Info.plist | 14 +++---- 4 files changed, 42 insertions(+), 34 deletions(-) diff --git a/ios/NotificationService/Info.plist b/ios/NotificationService/Info.plist index 9d9595029..0b649883e 100644 --- a/ios/NotificationService/Info.plist +++ b/ios/NotificationService/Info.plist @@ -4,8 +4,6 @@ AppGroup group.ios.chat.rocket - IS_OFFICIAL - CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName @@ -24,6 +22,8 @@ $(MARKETING_VERSION) CFBundleVersion 1 + IS_OFFICIAL + KeychainGroup $(AppIdentifierPrefix)chat.rocket.reactnative NSExtension diff --git a/ios/RocketChatRN.xcodeproj/project.pbxproj b/ios/RocketChatRN.xcodeproj/project.pbxproj index 4dc095e32..8a7ce5478 100644 --- a/ios/RocketChatRN.xcodeproj/project.pbxproj +++ b/ios/RocketChatRN.xcodeproj/project.pbxproj @@ -719,7 +719,7 @@ 13B07F861A680F5B00A75B9A = { DevelopmentTeam = S6UPZG7ZR3; LastSwiftMigration = 1030; - ProvisioningStyle = Manual; + ProvisioningStyle = Automatic; SystemCapabilities = { com.apple.ApplicationGroups.iOS = { enabled = 1; @@ -738,7 +738,7 @@ 1EC6ACAF22CB9FC300A41C61 = { CreatedOnToolsVersion = 10.2.1; DevelopmentTeam = S6UPZG7ZR3; - ProvisioningStyle = Manual; + ProvisioningStyle = Automatic; SystemCapabilities = { com.apple.ApplicationGroups.iOS = { enabled = 1; @@ -748,7 +748,7 @@ 1EFEB5942493B6640072EDC0 = { CreatedOnToolsVersion = 11.5; DevelopmentTeam = S6UPZG7ZR3; - ProvisioningStyle = Manual; + ProvisioningStyle = Automatic; }; 7AAB3E0D257E6A6E00707CF6 = { DevelopmentTeam = S6UPZG7ZR3; @@ -1490,9 +1490,8 @@ ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = ""; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = RocketChatRN/RocketChatRN.entitlements; - CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = S6UPZG7ZR3; @@ -1525,8 +1524,9 @@ "-lc++", ); OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG"; - PRODUCT_BUNDLE_IDENTIFIER = chat.rocket.reactnative; + PRODUCT_BUNDLE_IDENTIFIER = chat.rocket.ios; PRODUCT_NAME = "Rocket.Chat Experimental"; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "RocketChatRN-Bridging-Header.h"; SWIFT_OBJC_INTERFACE_HEADER_NAME = "RocketChatRN-Swift.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -1552,6 +1552,7 @@ CURRENT_PROJECT_VERSION = 1; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = S6UPZG7ZR3; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = S6UPZG7ZR3; ENABLE_BITCODE = NO; EXCLUDED_ARCHS = ""; FRAMEWORK_SEARCH_PATHS = ( @@ -1581,9 +1582,10 @@ "-lc++", ); OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE"; - PRODUCT_BUNDLE_IDENTIFIER = chat.rocket.reactnative; + PRODUCT_BUNDLE_IDENTIFIER = chat.rocket.ios; PRODUCT_NAME = "Rocket.Chat Experimental"; PROVISIONING_PROFILE_SPECIFIER = "match AppStore chat.rocket.reactnative"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore chat.rocket.ios"; SWIFT_OBJC_BRIDGING_HEADER = "RocketChatRN-Bridging-Header.h"; SWIFT_OBJC_INTERFACE_HEADER_NAME = "RocketChatRN-Swift.h"; SWIFT_VERSION = 5.0; @@ -1615,9 +1617,8 @@ CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_ENTITLEMENTS = ShareRocketChatRN/ShareRocketChatRN.entitlements; - CODE_SIGN_IDENTITY = "iPhone Distribution"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = S6UPZG7ZR3; ENABLE_BITCODE = NO; @@ -1636,7 +1637,7 @@ "$(inherited)", "$(SRCROOT)/../node_modules/rn-extensions-share/ios/**", "$(SRCROOT)/../node_modules/react-native-firebase/ios/RNFirebase/**", - "$PODS_CONFIGURATION_BUILD_DIR/Firebase", + $PODS_CONFIGURATION_BUILD_DIR/Firebase, ); INFOPLIST_FILE = ShareRocketChatRN/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; @@ -1653,8 +1654,9 @@ "-DFB_SONARKIT_ENABLED=1", ); OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG"; - PRODUCT_BUNDLE_IDENTIFIER = chat.rocket.reactnative.ShareExtension; + PRODUCT_BUNDLE_IDENTIFIER = "chat.rocket.ios.Rocket-Chat-ShareExtension"; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1690,6 +1692,7 @@ COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = S6UPZG7ZR3; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = S6UPZG7ZR3; ENABLE_BITCODE = NO; EXCLUDED_ARCHS = ""; FRAMEWORK_SEARCH_PATHS = ( @@ -1705,7 +1708,7 @@ "$(inherited)", "$(SRCROOT)/../node_modules/rn-extensions-share/ios/**", "$(SRCROOT)/../node_modules/react-native-firebase/ios/RNFirebase/**", - "$PODS_CONFIGURATION_BUILD_DIR/Firebase", + $PODS_CONFIGURATION_BUILD_DIR/Firebase, ); INFOPLIST_FILE = ShareRocketChatRN/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; @@ -1721,9 +1724,10 @@ "-DFB_SONARKIT_ENABLED=1", ); OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE"; - PRODUCT_BUNDLE_IDENTIFIER = chat.rocket.reactnative.ShareExtension; + PRODUCT_BUNDLE_IDENTIFIER = "chat.rocket.ios.Rocket-Chat-ShareExtension"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "match AppStore chat.rocket.reactnative.ShareExtension"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore chat.rocket.ios.Rocket-Chat-ShareExtension"; SKIP_INSTALL = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1743,7 +1747,8 @@ CLANG_WARN_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_ENTITLEMENTS = NotificationService/NotificationService.entitlements; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = S6UPZG7ZR3; ENABLE_BITCODE = NO; @@ -1756,8 +1761,9 @@ MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG"; - PRODUCT_BUNDLE_IDENTIFIER = chat.rocket.reactnative.NotificationService; + PRODUCT_BUNDLE_IDENTIFIER = chat.rocket.ios.NotificationService; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OBJC_BRIDGING_HEADER = "NotificationService/NotificationService-Bridging-Header.h"; @@ -1785,6 +1791,7 @@ COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = S6UPZG7ZR3; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = S6UPZG7ZR3; ENABLE_BITCODE = NO; EXCLUDED_ARCHS = ""; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -1794,9 +1801,10 @@ MARKETING_VERSION = 4.40.0; MTL_FAST_MATH = YES; OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE"; - PRODUCT_BUNDLE_IDENTIFIER = chat.rocket.reactnative.NotificationService; + PRODUCT_BUNDLE_IDENTIFIER = chat.rocket.ios.NotificationService; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = "match AppStore chat.rocket.reactnative.NotificationService"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore chat.rocket.ios.NotificationService"; SKIP_INSTALL = YES; SWIFT_OBJC_BRIDGING_HEADER = "NotificationService/NotificationService-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-O"; diff --git a/ios/RocketChatRN/Info.plist b/ios/RocketChatRN/Info.plist index 563bd43e6..9a43f1d06 100644 --- a/ios/RocketChatRN/Info.plist +++ b/ios/RocketChatRN/Info.plist @@ -2,15 +2,8 @@ - IS_OFFICIAL - AppGroup group.ios.chat.rocket - bugsnag - - apiKey - apiKeyValue - CFBundleDevelopmentRegion en CFBundleDisplayName @@ -44,6 +37,8 @@ CFBundleVersion $(CURRENT_PROJECT_VERSION) + IS_OFFICIAL + ITSAppUsesNonExemptEncryption KeychainGroup @@ -109,5 +104,10 @@ UIViewControllerBasedStatusBarAppearance + bugsnag + + apiKey + apiKeyValue + diff --git a/ios/ShareRocketChatRN/Info.plist b/ios/ShareRocketChatRN/Info.plist index a54193a43..e3cf14b14 100644 --- a/ios/ShareRocketChatRN/Info.plist +++ b/ios/ShareRocketChatRN/Info.plist @@ -4,13 +4,6 @@ AppGroup group.ios.chat.rocket - IS_OFFICIAL - - bugsnag - - apiKey - apiKeyValue - CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName @@ -29,6 +22,8 @@ 4.40.0 CFBundleVersion 1 + IS_OFFICIAL + KeychainGroup $(AppIdentifierPrefix)chat.rocket.reactnative NSAppTransportSecurity @@ -72,5 +67,10 @@ custom.ttf Inter.ttf + bugsnag + + apiKey + apiKeyValue +