Merge pull request #2321 from CruGlobal/fix/deployment

Fix/deployment

.github/workflows/ci-cd.yml

@@ -290,7 +290,7 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: fastlane-gym-logs
-          path: "/Users/runner/Library/Logs/gym/MissionHub-MissionHub.log"
+          path: '/Users/runner/Library/Logs/gym/MissionHub-MissionHub.log'
 
   android-deploy:
     runs-on: ubuntu-latest

android/app/build.gradle

@@ -141,7 +141,7 @@ android {
         applicationId "com.missionhub"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionName "5.4.4"
+        versionName "5.4.5"
         versionCode grgit.log(includes:['HEAD']).size() + 363
 
         // Enable multidex for apps with over 64K lines

ios/Gemfile

@@ -1,4 +1,4 @@
 source "https://rubygems.org"
 
 gem "fastlane"
-gem "cocoapods", "1.14.3"
+gem "cocoapods"

ios/Gemfile.lock

@@ -274,7 +274,7 @@ GEM
 
 PLATFORMS
   ruby
-  x64-mingw-ucrt
+  x64-unknown
 
 DEPENDENCIES
   cocoapods

ios/MissionHub.xcodeproj/project.pbxproj

@@ -643,7 +643,7 @@
 					"$(SRCROOT)/../node_modules/react-native-view-overflow/ios",
 				);
 				INFOPLIST_FILE = MissionHubTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				OTHER_LDFLAGS = (
@@ -696,14 +696,14 @@
 					"$(SRCROOT)/../node_modules/rollbar-react-native/ios/rollbar-ios/Rollbar/",
 				);
 				INFOPLIST_FILE = MissionHub/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)",
 					"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)",
 					"$(inherited)",
 				);
-				MARKETING_VERSION = 5.4.4;
+				MARKETING_VERSION = 5.4.5;
 				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.missionhub;
 				PRODUCT_NAME = MissionHub;
@@ -766,7 +766,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = NO;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -804,14 +804,14 @@
 					"$(SRCROOT)/../node_modules/rollbar-react-native/ios/rollbar-ios/Rollbar/",
 				);
 				INFOPLIST_FILE = MissionHub/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)",
 					"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)",
 					"$(inherited)",
 				);
-				MARKETING_VERSION = 5.4.4;
+				MARKETING_VERSION = 5.4.5;
 				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.missionhub;
 				PRODUCT_NAME = MissionHub;
@@ -847,7 +847,7 @@
 					"$(SRCROOT)/../node_modules/react-native-view-overflow/ios",
 				);
 				INFOPLIST_FILE = MissionHubTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				OTHER_LDFLAGS = (
@@ -914,7 +914,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;

ios/MissionHub/AppDelegate.m

@@ -43,7 +43,7 @@ @interface AppDelegate () <RCTBridgeDelegate>
 #import <CodePush/CodePush.h>
 #import <FBSDKCoreKit/FBSDKCoreKit.h>
 #include "TargetConditionals.h"
-#import "ReactNativeConfig.h"
+#import "RNCConfig.h"
 #import <RollbarReactNative/RollbarReactNative.h>
 #import <React/RCTLinkingManager.h>
 
@@ -113,7 +113,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
   RollbarConfiguration *config = [RollbarConfiguration configuration];
   config.environment = environment;
 
-  NSString *rollbarAccessToken = [ReactNativeConfig envFor:@"ROLLBAR_ACCESS_TOKEN"];
+  NSString *rollbarAccessToken = [RNCConfig envFor:@"ROLLBAR_ACCESS_TOKEN"];
   [RollbarReactNative initWithAccessToken:rollbarAccessToken configuration:config];
 
   return YES;

ios/Podfile

@@ -2,7 +2,7 @@ require_relative '../node_modules/react-native/scripts/react_native_pods'
 require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
 require_relative '../node_modules/react-native-unimodules/cocoapods.rb'
 
-platform :ios, '10.0'
+platform :ios, '11.0'
 
 inhibit_all_warnings!
 
@@ -27,23 +27,41 @@ target 'MissionHub' do
   #
   # Note that if you have use_frameworks! enabled, Flipper will not work and
   # you should disable these next few lines.
-  use_flipper!
+  use_flipper!({ 'Flipper-Folly' => '2.5.3', 'Flipper' => '0.87.0', 'Flipper-RSocket' => '1.3.1' })
 
   post_install do |installer|
     flipper_post_install(installer)
 
-    installer.pods_project.targets.each do |target|
-      if target.name == 'react-native-config' # https://github.com/luggit/react-native-config/issues/357#issuecomment-508649128
-        phase = target.project.new(Xcodeproj::Project::Object::PBXShellScriptBuildPhase)
-        phase.shell_script = "cd ../../"\
-                             " && RNC_ROOT=./node_modules/react-native-config/"\
-                             " && export SYMROOT=$RNC_ROOT/ios/ReactNativeConfig"\
-                             " && export BUILD_DIR=$RNC_ROOT/ios/ReactNativeConfig"\
-                             " && ruby $RNC_ROOT/ios/ReactNativeConfig/BuildDotenvConfig.ruby"
+    # installer.pods_project.targets.each do |target|
+    #   if target.name == 'react-native-config' # https://github.com/luggit/react-native-config/issues/357#issuecomment-508649128
+    #     phase = target.project.new(Xcodeproj::Project::Object::PBXShellScriptBuildPhase)
+    #     phase.shell_script = "cd ../../"\
+    #                          " && RNC_ROOT=./node_modules/react-native-config/"\
+    #                          " && export SYMROOT=$RNC_ROOT/ios/RNCConfig"\
+    #                          " && export BUILD_DIR=$RNC_ROOT/ios/RNCConfig"\
+    #                          " && ruby $RNC_ROOT/ios/RNCConfig/BuildDotenvConfig.ruby"
 
-        target.build_phases << phase
-        target.build_phases.move(phase,0)
+    #     target.build_phases << phase
+    #     target.build_phases.move(phase,0)
+    #   end
+    # end
+
+    installer.pods_project.targets.each do |target|
+      if target.respond_to?(:product_type) and target.product_type == "com.apple.product-type.bundle"
+        target.build_configurations.each do |config|
+            config.build_settings['CODE_SIGNING_ALLOWED'] = 'NO'
+        end
       end
     end
+
+    installer.pods_project.build_configurations.each do |config|
+      config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64"
+    end
+
+    installer.pods_project.targets.each do |target|
+      target.build_configurations.each do |config|
+       config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0'
+      end
+     end
   end
 end

package.json

@@ -82,7 +82,7 @@
     "react-native-animatable": "^1.3.2",
     "react-native-camera": "^3.24.1",
     "react-native-code-push": "^6.2.1",
-    "react-native-config": "^0.11.7",
+    "react-native-config": "^1.5.1",
     "react-native-device-info": "^5.3.0",
     "react-native-fbsdk": "^2.0.0",
     "react-native-gesture-handler": "^1.6.1",

src/utils/rollbar.config.ts

@@ -7,7 +7,7 @@ const codeVersion = `${Config.TRAVIS_COMMIT ||
   Config.COMMIT_SHA ||
   'development'}.${Platform.OS}`;
 
-const config = new Configuration(Config.ROLLBAR_ACCESS_TOKEN, {
+const config = new Configuration(Config.ROLLBAR_ACCESS_TOKEN || '', {
   enabled: !__DEV__,
   // @ts-ignore
   captureDeviceInfo: !__DEV__, // New feature in rollbar-react-native 0.7.0 that breaks Chrome debugging https://github.com/rollbar/rollbar-react-native/issues/101. Disabling in dev.