diff --git a/client/react-native/android/app/build.gradle b/client/react-native/android/app/build.gradle index eda465c86f..2de400e634 100644 --- a/client/react-native/android/app/build.gradle +++ b/client/react-native/android/app/build.gradle @@ -90,6 +90,16 @@ project.ext.react = [ apply from: "../../node_modules/react-native/react.gradle" + +project.ext.envConfigFiles = [ + debug: ".env", + release: ".env", + anothercustombuild: ".env", +] + +apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.gradle" + + /** * Set this to true to create two separate APKs instead of one: * - An APK that only works on ARM devices @@ -123,6 +133,8 @@ android { versionCode 1 versionName "1.0" + resValue "string", "build_config_package", "chat.berty.main" + ndk { abiFilters "armeabi-v7a", "x86" } @@ -204,6 +216,7 @@ android { } dependencies { + compile project(':react-native-config') compile project(':react-native-dev-menu') compile project(':instabug-reactnative') compile project(':lottie-react-native') diff --git a/client/react-native/android/app/src/main/java/chat/berty/main/MainApplication.java b/client/react-native/android/app/src/main/java/chat/berty/main/MainApplication.java index 46b9f488d4..f533af5f9d 100644 --- a/client/react-native/android/app/src/main/java/chat/berty/main/MainApplication.java +++ b/client/react-native/android/app/src/main/java/chat/berty/main/MainApplication.java @@ -3,6 +3,7 @@ import android.app.Application; import com.facebook.react.ReactApplication; +import com.lugg.ReactNativeConfig.ReactNativeConfigPackage; import com.zoontek.rndevmenu.RNDevMenuPackage; import com.instabug.reactlibrary.RNInstabugReactnativePackage; import com.airbnb.android.react.lottie.LottiePackage; @@ -49,9 +50,10 @@ protected List getPackages() { new CorePackage(), new ImagePickerPackage(), new MainReactPackage(), + new ReactNativeConfigPackage(), new RNDevMenuPackage(), - new RNInstabugReactnativePackage.Builder("YOUR_ANDROID_APPLICATION_TOKEN",MainApplication.this) - .setInvocationEvent("shake") + new RNInstabugReactnativePackage.Builder(BuildConfig.INSTABUG_TOKEN,MainApplication.this) + .setInvocationEvent(BuildConfig.DEBUG ? "none" : "shake") .setPrimaryColor("#1D82DC") .setFloatingEdge("left") .setFloatingButtonOffsetFromTop(250) diff --git a/client/react-native/android/settings.gradle b/client/react-native/android/settings.gradle index bdcb9fe803..834db6d8b4 100644 --- a/client/react-native/android/settings.gradle +++ b/client/react-native/android/settings.gradle @@ -1,4 +1,6 @@ rootProject.name = 'Berty' +include ':react-native-config' +project(':react-native-config').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-config/android') include ':react-native-dev-menu' project(':react-native-dev-menu').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-dev-menu/android') include ':instabug-reactnative' diff --git a/client/react-native/common/components/App.js b/client/react-native/common/components/App.js index f64db88a17..bb6b2f7c24 100644 --- a/client/react-native/common/components/App.js +++ b/client/react-native/common/components/App.js @@ -13,6 +13,8 @@ import ReactNativeLanguages from 'react-native-languages' import i18n from '../i18n' import Instabug from 'instabug-reactnative'; import { btoa } from 'b64-lite' +import Config from 'react-native-config' + export default class App extends PureComponent { state = { @@ -31,7 +33,7 @@ export default class App extends PureComponent { if (Platform.OS === 'ios') { Instabug.startWithToken( - "IOS_TOKEN", + Config.INSTABUG_TOKEN, [__DEV__ ? Instabug.invocationEvent.none : Instabug.invocationEvent.shake], ) } diff --git a/client/react-native/ios/Berty.xcodeproj/project.pbxproj b/client/react-native/ios/Berty.xcodeproj/project.pbxproj index b721ca8e43..2df614b82d 100644 --- a/client/react-native/ios/Berty.xcodeproj/project.pbxproj +++ b/client/react-native/ios/Berty.xcodeproj/project.pbxproj @@ -45,6 +45,7 @@ 54124C83C6A84A21A36FE047 /* MaterialCommunityIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E1C9A4F1DC6B4E75A55ACAF7 /* MaterialCommunityIcons.ttf */; }; 5416D0AE85EC4EDF9A7CBB34 /* libLottie.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2549D59BAEDE40719D093DE4 /* libLottie.a */; }; 5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; }; + 73F51646E211443CAC749BD1 /* libReactNativeConfig-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 426D4C4945B64F8EB0C0EB28 /* libReactNativeConfig-tvOS.a */; }; 76F82E0606D7449F9A9451B4 /* libRNSVG.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 03729C1E22E64EEB9A2172DD /* libRNSVG.a */; }; 77F47068D2CA4705A0DF1B7A /* libRNDeviceInfo-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D668F1688A8479E8A548A0B /* libRNDeviceInfo-tvOS.a */; }; 7E5A2067F32748CCA009CD7B /* libRNFetchBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FF901C50CB09437EA89C5241 /* libRNFetchBlob.a */; }; @@ -74,6 +75,7 @@ D8F41B65D4574B55B47EF756 /* Foundation.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 17D9618F77704A108128C1D4 /* Foundation.ttf */; }; DBCA0527B5E5452CBB25A469 /* FontAwesome5_Solid.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 81A473A5CA794BE987DF240A /* FontAwesome5_Solid.ttf */; }; E06D3F08438E443B9720B383 /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 189BB2B54F564464817850BE /* Zocial.ttf */; }; + EC2F46E9CF5D43F299F7ECA6 /* libReactNativeConfig.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ED56BA87533A40609801F6AB /* libReactNativeConfig.a */; }; EFEFDB40F99B499C82D9C417 /* libReactNativeExceptionHandler.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E3263E81D0DF4FCD8CFC71E5 /* libReactNativeExceptionHandler.a */; }; F09B398921C02731000AA9A8 /* libRCTCameraRoll.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F09B398821C02721000AA9A8 /* libRCTCameraRoll.a */; }; F625BCB39E3C45ADA463C308 /* Feather.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6BCA3B477305485C91CB74DA /* Feather.ttf */; }; @@ -457,6 +459,20 @@ remoteGlobalIDString = 134814201AA4EA6300B7C361; remoteInfo = RNDevMenu; }; + 99F1AF0A22088EBC000033DA /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 7F82C784A254485E98065301 /* ReactNativeConfig.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = EB2648DF1C7BE17A00B8F155; + remoteInfo = ReactNativeConfig; + }; + 99F1AF0C22088EBC000033DA /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 7F82C784A254485E98065301 /* ReactNativeConfig.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 3DF7F6AC203AA09B00D0EAB7; + remoteInfo = "ReactNativeConfig-tvOS"; + }; ADBDB9261DFEBF0700ED6528 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */; @@ -617,6 +633,7 @@ 315E18D636B840518CA9A54F /* RNImagePicker.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNImagePicker.xcodeproj; path = "../node_modules/react-native-image-picker/ios/RNImagePicker.xcodeproj"; sourceTree = ""; }; 400CAEE705C04D549AC5B5BF /* RNCamera.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNCamera.xcodeproj; path = "../node_modules/react-native-camera/ios/RNCamera.xcodeproj"; sourceTree = ""; }; 404393F653304CE5B3D2FECF /* libRNVectorIcons-tvOS.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = "libRNVectorIcons-tvOS.a"; sourceTree = ""; }; + 426D4C4945B64F8EB0C0EB28 /* libReactNativeConfig-tvOS.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = "libReactNativeConfig-tvOS.a"; sourceTree = ""; }; 43BA67C9174044EB85A12EC4 /* RNLanguages.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNLanguages.xcodeproj; path = "../node_modules/react-native-languages/ios/RNLanguages.xcodeproj"; sourceTree = ""; }; 46D4617AEDB145E1B15B2216 /* libRNDevMenu.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNDevMenu.a; sourceTree = ""; }; 480E37922190872400BE10A5 /* RCTPushNotification.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTPushNotification.xcodeproj; path = "../node_modules/react-native/Libraries/PushNotificationIOS/RCTPushNotification.xcodeproj"; sourceTree = ""; }; @@ -637,6 +654,7 @@ 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = ""; }; 7C9AB76FDD904A32BC97B8C9 /* libRNCamera.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNCamera.a; sourceTree = ""; }; 7D5F34DA44DA43D69497F135 /* RNFetchBlob.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNFetchBlob.xcodeproj; path = "../node_modules/rn-fetch-blob/ios/RNFetchBlob.xcodeproj"; sourceTree = ""; }; + 7F82C784A254485E98065301 /* ReactNativeConfig.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = ReactNativeConfig.xcodeproj; path = "../node_modules/react-native-config/ios/ReactNativeConfig.xcodeproj"; sourceTree = ""; }; 81A473A5CA794BE987DF240A /* FontAwesome5_Solid.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome5_Solid.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Solid.ttf"; sourceTree = ""; }; 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = ""; }; 836972A508FE484CAFBB6331 /* RNNetworkInfo.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNNetworkInfo.xcodeproj; path = "../node_modules/react-native-network-info/ios/RNNetworkInfo.xcodeproj"; sourceTree = ""; }; @@ -662,6 +680,7 @@ E1C9A4F1DC6B4E75A55ACAF7 /* MaterialCommunityIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = MaterialCommunityIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf"; sourceTree = ""; }; E3263E81D0DF4FCD8CFC71E5 /* libReactNativeExceptionHandler.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libReactNativeExceptionHandler.a; sourceTree = ""; }; EA6D87ECC1124C58A5918D63 /* libRNDeviceInfo.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNDeviceInfo.a; sourceTree = ""; }; + ED56BA87533A40609801F6AB /* libReactNativeConfig.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libReactNativeConfig.a; sourceTree = ""; }; F09B398321C02721000AA9A8 /* RCTCameraRoll.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTCameraRoll.xcodeproj; path = "../node_modules/react-native/Libraries/CameraRoll/RCTCameraRoll.xcodeproj"; sourceTree = ""; }; F0A89E292F5C4E9198BCD8F3 /* libRNInstabug.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNInstabug.a; sourceTree = ""; }; F0BAE21221906E73003601A0 /* Berty.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = Berty.entitlements; path = Berty/Berty.entitlements; sourceTree = ""; }; @@ -726,6 +745,7 @@ 9C0BBC032D8947FABC65C77A /* libRNInstabug.a in Frameworks */, 9FD33F0495822F9AFD5F2DCA /* Instabug.framework in Frameworks */, 90E88BBFF04C4F05A6D26075 /* libRNDevMenu.a in Frameworks */, + EC2F46E9CF5D43F299F7ECA6 /* libReactNativeConfig.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -744,6 +764,7 @@ FCA390D83E0043E4B3C3DDBF /* libRNSVG-tvOS.a in Frameworks */, 77F47068D2CA4705A0DF1B7A /* libRNDeviceInfo-tvOS.a in Frameworks */, 9B739150E7CB483DA4A73015 /* libRNLanguages-tvOS.a in Frameworks */, + 73F51646E211443CAC749BD1 /* libReactNativeConfig-tvOS.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -955,6 +976,7 @@ 8E1D0314925B45DFBA2E4B6B /* Lottie.xcodeproj */, 9977408CAA8E4D17AF46013D /* RNInstabug.xcodeproj */, 23F9AFE22CE24476938F63F3 /* RNDevMenu.xcodeproj */, + 7F82C784A254485E98065301 /* ReactNativeConfig.xcodeproj */, ); name = Libraries; sourceTree = ""; @@ -1044,6 +1066,8 @@ 2549D59BAEDE40719D093DE4 /* libLottie.a */, F0A89E292F5C4E9198BCD8F3 /* libRNInstabug.a */, 46D4617AEDB145E1B15B2216 /* libRNDevMenu.a */, + ED56BA87533A40609801F6AB /* libReactNativeConfig.a */, + 426D4C4945B64F8EB0C0EB28 /* libReactNativeConfig-tvOS.a */, ); name = "Recovered References"; sourceTree = ""; @@ -1083,6 +1107,15 @@ name = Products; sourceTree = ""; }; + 99F1AEDA22088EBC000033DA /* Products */ = { + isa = PBXGroup; + children = ( + 99F1AF0B22088EBC000033DA /* libReactNativeConfig.a */, + 99F1AF0D22088EBC000033DA /* libReactNativeConfig-tvOS.a */, + ); + name = Products; + sourceTree = ""; + }; ADBDB9201DFEBF0600ED6528 /* Products */ = { isa = PBXGroup; children = ( @@ -1395,6 +1428,10 @@ ProductGroup = 146834001AC3E56700842450 /* Products */; ProjectRef = 146833FF1AC3E56700842450 /* React.xcodeproj */; }, + { + ProductGroup = 99F1AEDA22088EBC000033DA /* Products */; + ProjectRef = 7F82C784A254485E98065301 /* ReactNativeConfig.xcodeproj */; + }, { ProductGroup = F8E5BE002194844D009E886C /* Products */; ProjectRef = B3E7C65ABAF9412C87CEC334 /* ReactNativeExceptionHandler.xcodeproj */; @@ -1802,6 +1839,20 @@ remoteRef = 99F1AEBA22088824000033DA /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + 99F1AF0B22088EBC000033DA /* libReactNativeConfig.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libReactNativeConfig.a; + remoteRef = 99F1AF0A22088EBC000033DA /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 99F1AF0D22088EBC000033DA /* libReactNativeConfig-tvOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libReactNativeConfig-tvOS.a"; + remoteRef = 99F1AF0C22088EBC000033DA /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -2100,6 +2151,7 @@ "$(SRCROOT)/../node_modules/lottie-ios/lottie-ios/Classes/**", "$(SRCROOT)/../node_modules/instabug-reactnative/ios/RNInstabug/**", "$(SRCROOT)/../node_modules/react-native-dev-menu/ios", + "$(SRCROOT)/../node_modules/react-native-config/ios/ReactNativeConfig", ); INFOPLIST_FILE = BertyTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; @@ -2111,6 +2163,8 @@ "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", ); OTHER_LDFLAGS = ( "-ObjC", @@ -2145,6 +2199,7 @@ "$(SRCROOT)/../node_modules/lottie-ios/lottie-ios/Classes/**", "$(SRCROOT)/../node_modules/instabug-reactnative/ios/RNInstabug/**", "$(SRCROOT)/../node_modules/react-native-dev-menu/ios", + "$(SRCROOT)/../node_modules/react-native-config/ios/ReactNativeConfig", ); INFOPLIST_FILE = BertyTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; @@ -2156,6 +2211,8 @@ "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", ); OTHER_LDFLAGS = ( "-ObjC", @@ -2204,6 +2261,7 @@ "$(SRCROOT)/../node_modules/lottie-ios/lottie-ios/Classes/**", "$(SRCROOT)/../node_modules/instabug-reactnative/ios/RNInstabug/**", "$(SRCROOT)/../node_modules/react-native-dev-menu/ios", + "$(SRCROOT)/../node_modules/react-native-config/ios/ReactNativeConfig", ); INFOPLIST_FILE = Berty/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -2268,6 +2326,7 @@ "$(SRCROOT)/../node_modules/lottie-ios/lottie-ios/Classes/**", "$(SRCROOT)/../node_modules/instabug-reactnative/ios/RNInstabug/**", "$(SRCROOT)/../node_modules/react-native-dev-menu/ios", + "$(SRCROOT)/../node_modules/react-native-config/ios/ReactNativeConfig", ); INFOPLIST_FILE = Berty/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -2324,6 +2383,7 @@ "$(SRCROOT)/../node_modules/lottie-ios/lottie-ios/Classes/**", "$(SRCROOT)/../node_modules/instabug-reactnative/ios/RNInstabug/**", "$(SRCROOT)/../node_modules/react-native-dev-menu/ios", + "$(SRCROOT)/../node_modules/react-native-config/ios/ReactNativeConfig", ); INFOPLIST_FILE = "Berty-tvOS/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -2334,6 +2394,8 @@ "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", ); OTHER_LDFLAGS = ( "-ObjC", @@ -2377,6 +2439,7 @@ "$(SRCROOT)/../node_modules/lottie-ios/lottie-ios/Classes/**", "$(SRCROOT)/../node_modules/instabug-reactnative/ios/RNInstabug/**", "$(SRCROOT)/../node_modules/react-native-dev-menu/ios", + "$(SRCROOT)/../node_modules/react-native-config/ios/ReactNativeConfig", ); INFOPLIST_FILE = "Berty-tvOS/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -2387,6 +2450,8 @@ "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", ); OTHER_LDFLAGS = ( "-ObjC", @@ -2429,6 +2494,7 @@ "$(SRCROOT)/../node_modules/lottie-ios/lottie-ios/Classes/**", "$(SRCROOT)/../node_modules/instabug-reactnative/ios/RNInstabug/**", "$(SRCROOT)/../node_modules/react-native-dev-menu/ios", + "$(SRCROOT)/../node_modules/react-native-config/ios/ReactNativeConfig", ); INFOPLIST_FILE = "Berty-tvOSTests/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -2439,6 +2505,8 @@ "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", ); OTHER_LDFLAGS = ( "-ObjC", @@ -2481,6 +2549,7 @@ "$(SRCROOT)/../node_modules/lottie-ios/lottie-ios/Classes/**", "$(SRCROOT)/../node_modules/instabug-reactnative/ios/RNInstabug/**", "$(SRCROOT)/../node_modules/react-native-dev-menu/ios", + "$(SRCROOT)/../node_modules/react-native-config/ios/ReactNativeConfig", ); INFOPLIST_FILE = "Berty-tvOSTests/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -2491,6 +2560,8 @@ "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", ); OTHER_LDFLAGS = ( "-ObjC", @@ -2577,6 +2648,7 @@ "$(SRCROOT)/../node_modules/lottie-ios/lottie-ios/Classes/**", "$(SRCROOT)/../node_modules/instabug-reactnative/ios/RNInstabug/**", "$(SRCROOT)/../node_modules/react-native-dev-menu/ios", + "$(SRCROOT)/../node_modules/react-native-config/ios/ReactNativeConfig", ); INFOPLIST_FILE = Berty/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -2626,6 +2698,7 @@ "$(SRCROOT)/../node_modules/lottie-ios/lottie-ios/Classes/**", "$(SRCROOT)/../node_modules/instabug-reactnative/ios/RNInstabug/**", "$(SRCROOT)/../node_modules/react-native-dev-menu/ios", + "$(SRCROOT)/../node_modules/react-native-config/ios/ReactNativeConfig", ); INFOPLIST_FILE = BertyTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; @@ -2637,6 +2710,8 @@ "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", ); OTHER_LDFLAGS = ( "-ObjC", @@ -2676,6 +2751,7 @@ "$(SRCROOT)/../node_modules/lottie-ios/lottie-ios/Classes/**", "$(SRCROOT)/../node_modules/instabug-reactnative/ios/RNInstabug/**", "$(SRCROOT)/../node_modules/react-native-dev-menu/ios", + "$(SRCROOT)/../node_modules/react-native-config/ios/ReactNativeConfig", ); INFOPLIST_FILE = "Berty-tvOS/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -2686,6 +2762,8 @@ "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", ); OTHER_LDFLAGS = ( "-ObjC", @@ -2727,6 +2805,7 @@ "$(SRCROOT)/../node_modules/lottie-ios/lottie-ios/Classes/**", "$(SRCROOT)/../node_modules/instabug-reactnative/ios/RNInstabug/**", "$(SRCROOT)/../node_modules/react-native-dev-menu/ios", + "$(SRCROOT)/../node_modules/react-native-config/ios/ReactNativeConfig", ); INFOPLIST_FILE = "Berty-tvOSTests/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -2737,6 +2816,8 @@ "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", ); OTHER_LDFLAGS = ( "-ObjC", @@ -2825,6 +2906,7 @@ "$(SRCROOT)/../node_modules/lottie-ios/lottie-ios/Classes/**", "$(SRCROOT)/../node_modules/instabug-reactnative/ios/RNInstabug/**", "$(SRCROOT)/../node_modules/react-native-dev-menu/ios", + "$(SRCROOT)/../node_modules/react-native-config/ios/ReactNativeConfig", ); INFOPLIST_FILE = Berty/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -2875,6 +2957,7 @@ "$(SRCROOT)/../node_modules/lottie-ios/lottie-ios/Classes/**", "$(SRCROOT)/../node_modules/instabug-reactnative/ios/RNInstabug/**", "$(SRCROOT)/../node_modules/react-native-dev-menu/ios", + "$(SRCROOT)/../node_modules/react-native-config/ios/ReactNativeConfig", ); INFOPLIST_FILE = BertyTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; @@ -2886,6 +2969,8 @@ "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", ); OTHER_LDFLAGS = ( "-ObjC", @@ -2926,6 +3011,7 @@ "$(SRCROOT)/../node_modules/lottie-ios/lottie-ios/Classes/**", "$(SRCROOT)/../node_modules/instabug-reactnative/ios/RNInstabug/**", "$(SRCROOT)/../node_modules/react-native-dev-menu/ios", + "$(SRCROOT)/../node_modules/react-native-config/ios/ReactNativeConfig", ); INFOPLIST_FILE = "Berty-tvOS/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -2936,6 +3022,8 @@ "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", ); OTHER_LDFLAGS = ( "-ObjC", @@ -2978,6 +3066,7 @@ "$(SRCROOT)/../node_modules/lottie-ios/lottie-ios/Classes/**", "$(SRCROOT)/../node_modules/instabug-reactnative/ios/RNInstabug/**", "$(SRCROOT)/../node_modules/react-native-dev-menu/ios", + "$(SRCROOT)/../node_modules/react-native-config/ios/ReactNativeConfig", ); INFOPLIST_FILE = "Berty-tvOSTests/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -2988,6 +3077,8 @@ "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", ); OTHER_LDFLAGS = ( "-ObjC", diff --git a/client/react-native/package.json b/client/react-native/package.json index c8b71dd5ac..b40e6aba19 100644 --- a/client/react-native/package.json +++ b/client/react-native/package.json @@ -33,6 +33,7 @@ "react-native": "^0.57.6", "react-native-camera": "^1.4.3", "react-native-collapsible": "^1.3.0", + "react-native-config": "^0.11.7", "react-native-dev-menu": "^2.0.1", "react-native-device-info": "^0.24.3", "react-native-elements": "^1.0.0-beta7", diff --git a/client/react-native/yarn.lock b/client/react-native/yarn.lock index ea8157bda9..ce961ad88e 100644 --- a/client/react-native/yarn.lock +++ b/client/react-native/yarn.lock @@ -5167,6 +5167,10 @@ react-native-collapsible@^1.3.0: dependencies: prop-types "^15.6.2" +react-native-config@^0.11.7: + version "0.11.7" + resolved "https://registry.yarnpkg.com/react-native-config/-/react-native-config-0.11.7.tgz#a2b323f2ecd76a4df88cbb6bc86eaa2ef9febee7" + react-native-dev-menu@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/react-native-dev-menu/-/react-native-dev-menu-2.0.1.tgz#8a54ab04532af26e2cbbe86bd41d8ce390fe2a04"