From cfe44617a72fd9fb24f2efaf2405974415a1f835 Mon Sep 17 00:00:00 2001 From: Godefroy Ponsinet Date: Mon, 19 Aug 2019 15:32:12 +0200 Subject: [PATCH] fix(ios): could not build module Signed-off-by: Godefroy Ponsinet --- client/.gitignore | 2 +- client/Makefile | 32 +- client/android/app/build.gradle | 2 +- .../java/chat/berty/main/MainApplication.java | 1 + client/android/settings.gradle | 4 +- client/ios/Berty.xcodeproj/project.pbxproj | 233 +++++++-------- client/ios/Podfile | 17 +- client/ios/Podfile.lock | 160 +++++----- client/package-lock.json | 278 ++++++++++-------- client/package.json | 6 +- client/packages/component/package-lock.json | 18 -- 11 files changed, 385 insertions(+), 368 deletions(-) diff --git a/client/.gitignore b/client/.gitignore index d178dca09b..54322ac5a1 100644 --- a/client/.gitignore +++ b/client/.gitignore @@ -39,7 +39,7 @@ DerivedData *.ipa *.ipa.meta *.xcuserstate -project.xcworkspace +# project.xcworkspace *.dSYM.zip # Android/IntelliJ diff --git a/client/Makefile b/client/Makefile index 7710825b29..305269f2c1 100644 --- a/client/Makefile +++ b/client/Makefile @@ -387,7 +387,7 @@ clean.android: .PHONY .IGNORE: clean.ios clean.ios: - cd $(IOS) && rm -rf build && xcodebuild clean + cd $(IOS); rm -rf build; xcodebuild clean; rm -rf $(HOME)/Library/Developer/Xcode/DerivedData; rm -rf Pods; rm -rf ~/Library/Caches/CocoaPods .PHONY .IGNORE: clean.web clean.web: @@ -509,39 +509,49 @@ version.android: version version.ios: version plutil -replace CFBundleShortVersionString -string $(IOS_VERSION) $(IOS)/Berty/Info.plist +.PHONY: fastlane.match.development fastlane.match.development: deps.ios time bundle exec fastlane run match type:development app_identifier:$(IOS_BUNDLE_ID_DEBUG) team_id:$(MATCH_COMPANY_TEAM_ID) +.PHONY: fastlane.match.appstore fastlane.match.appstore: deps.ios time bundle exec fastlane run match type:appstore app_identifier:$(IOS_BUNDLE_ID_RELEASE) team_id:$(MATCH_COMPANY_TEAM_ID) +.PHONY: fastlane.match.adhoc fastlane.match.adhoc: deps.ios time bundle exec fastlane run match force_for_new_devices:true type:adhoc app_identifier:$(IOS_BUNDLE_ID_ADHOC) team_id:$(MATCH_COMPANY_TEAM_ID) +.PHONY: fastlane.match.enterprise fastlane.match.enterprise: deps.ios time bundle exec fastlane run match type:enterprise app_identifier:$(IOS_BUNDLE_ID_HOUSE) team_id:$(MATCH_ENTERPRISE_TEAM_ID) +.PHONY: fastlane.match.all fastlane.match.all: fastlane.match.development fastlane.match.appstore fastlane.match.adhoc fastlane.match.enterprise +.PHONY: fastlane.pem.development fastlane.pem.development: deps.ios time bundle exec fastlane voip_cert app_identifier:$(IOS_BUNDLE_ID_DEBUG) team_id:$(PEM_COMPANY_TEAM_ID) pem_name:$(IOS_BUNDLE_ID_DEBUG)-voip.pem time bundle exec fastlane pem --app_identifier $(IOS_BUNDLE_ID_DEBUG) --team_id $(PEM_COMPANY_TEAM_ID) --pem_name $(IOS_BUNDLE_ID_DEBUG)-dev.pem --development +.PHONY: fastlane.pem.appstore fastlane.pem.appstore: deps.ios time bundle exec fastlane voip_cert app_identifier:$(IOS_BUNDLE_ID_RELEASE) team_id:$(PEM_COMPANY_TEAM_ID) pem_name:$(IOS_BUNDLE_ID_RELEASE)-voip.pem time bundle exec fastlane pem --app_identifier $(IOS_BUNDLE_ID_RELEASE) --team_id $(PEM_COMPANY_TEAM_ID) --pem_name $(IOS_BUNDLE_ID_RELEASE).pem time bundle exec fastlane pem --app_identifier $(IOS_BUNDLE_ID_RELEASE) --team_id $(PEM_COMPANY_TEAM_ID) --pem_name $(IOS_BUNDLE_ID_RELEASE)-dev.pem --development +.PHONY: fastlane.pem.adhoc fastlane.pem.adhoc: deps.ios time bundle exec fastlane pem --app_identifier $(IOS_BUNDLE_ID_ADHOC) --team_id $(PEM_COMPANY_TEAM_ID) --pem_name $(IOS_BUNDLE_ID_ADHOC).pem time bundle exec fastlane pem --app_identifier $(IOS_BUNDLE_ID_ADHOC) --team_id $(PEM_COMPANY_TEAM_ID) --pem_name $(IOS_BUNDLE_ID_ADHOC)-dev.pem --development time bundle exec fastlane voip_cert app_identifier:$(IOS_BUNDLE_ID_ADHOC) team_id:$(PEM_COMPANY_TEAM_ID) pem_name:$(IOS_BUNDLE_ID_ADHOC)-voip.pem +.PHONY: fastlane.pem.enterprise fastlane.pem.enterprise: deps.ios time bundle exec fastlane pem --app_identifier $(IOS_BUNDLE_ID_HOUSE) --team_id $(PEM_ENTERPRISE_TEAM_ID) --pem_name $(IOS_BUNDLE_ID_HOUSE).pem time bundle exec fastlane pem --app_identifier $(IOS_BUNDLE_ID_HOUSE) --team_id $(PEM_ENTERPRISE_TEAM_ID) --pem_name $(IOS_BUNDLE_ID_HOUSE)-dev.pem --development time bundle exec fastlane voip_cert app_identifier:$(IOS_BUNDLE_ID_HOUSE) team_id:$(PEM_ENTERPRISE_TEAM_ID) pem_name:$(IOS_BUNDLE_ID_HOUSE)-voip.pem +.PHONY: fastlane.setup_circle fastlane.setup_circle: bundle exec fastlane run create_keychain timeout:3600 default_keychain:true unlock:true add_to_search_list:true @@ -569,30 +579,34 @@ fastlane.setup_circle: security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k $(KEYCHAIN_PASSWORD) $(KEYCHAIN_NAME) +.PHONY: fastlane.ios.debug fastlane.ios.debug: deps.ios mkdir -p $(IOS_BUILD) + FL_BUILDLOG_PATH=$(IOS_BUILD) \ GYM_CLEAN=false \ GYM_OPTION_METHOD=development \ GYM_OPTION_APP_ID=$(IOS_BUNDLE_ID_DEBUG) \ GYM_OPTION_PROVISIONING_PROFILE=$(MATCH_PROVISIONING_PROFILE_DEBUG) \ GYM_OUTPUT_NAME=$(NAME) \ GYM_OUTPUT_DIRECTORY=$(IOS_BUILD) \ - GYM_PROJECT=ios/Berty.xcodeproj \ + GYM_WORKSPACE=ios/Berty.xcworkspace \ GYM_SCHEME=debug \ GYM_INCLUDE_SYMBOLS=false \ time bundle exec fastlane ios build --verbose +.PHONY: fastlane.ios.adhoc fastlane.ios.adhoc: deps.ios mkdir -p $(IOS_BUILD) + FL_BUILDLOG_PATH=$(IOS_BUILD) \ GYM_CLEAN=false \ GYM_OPTION_METHOD=ad-hoc \ GYM_OPTION_APP_ID=$(IOS_BUNDLE_ID_ADHOC) \ GYM_OPTION_PROVISIONING_PROFILE=$(MATCH_PROVISIONING_PROFILE_ADHOC) \ GYM_OUTPUT_NAME=$(NAME) \ GYM_OUTPUT_DIRECTORY=$(IOS_BUILD) \ - GYM_PROJECT=ios/Berty.xcodeproj \ + GYM_WORKSPACE=ios/Berty.xcworkspace \ GYM_SCHEME=adhoc \ GYM_INCLUDE_SYMBOLS=false \ time bundle exec fastlane ios build --verbose @@ -603,16 +617,18 @@ fastlane.ios.adhoc: deps.ios # extract build informations unzip -p $(IOS_BUILD)/$(NAME).ipa Payload/*.app/embedded.mobileprovision | security cms -D > $(IOS_BUILD)/$(NAME).embedded.mobileprovision.txt +.PHONY: fastlane.ios.house fastlane.ios.house: deps.ios mkdir -p $(IOS_BUILD) + FL_BUILDLOG_PATH=$(IOS_BUILD) \ GYM_CLEAN=true \ GYM_OPTION_METHOD=enterprise \ GYM_OPTION_APP_ID=$(IOS_BUNDLE_ID_HOUSE) \ GYM_OPTION_PROVISIONING_PROFILE=$(MATCH_PROVISIONING_PROFILE_HOUSE) \ GYM_OUTPUT_NAME=$(NAME) \ GYM_OUTPUT_DIRECTORY=$(IOS_BUILD) \ - GYM_PROJECT=ios/Berty.xcodeproj \ + GYM_WORKSPACE=ios/Berty.xcworkspace \ GYM_SCHEME=house \ GYM_SKIP_PROFILE_DETECTION=true \ GYM_INCLUDE_SYMBOLS=false \ @@ -624,16 +640,18 @@ fastlane.ios.house: deps.ios # extract build informations unzip -p $(IOS_BUILD)/$(NAME).ipa Payload/*.app/embedded.mobileprovision | security cms -D > $(IOS_BUILD)/$(NAME).embedded.mobileprovision.txt +.PHONY: fastlane.ios.release fastlane.ios.release: deps.ios mkdir -p $(IOS_BUILD) + FL_BUILDLOG_PATH=$(IOS_BUILD) \ GYM_CLEAN=true \ GYM_OPTION_METHOD=app-store \ GYM_OPTION_APP_ID=$(IOS_BUNDLE_ID_RELEASE) \ GYM_OPTION_PROVISIONING_PROFILE=$(MATCH_PROVISIONING_PROFILE_RELEASE) \ GYM_OUTPUT_NAME=$(NAME) \ GYM_OUTPUT_DIRECTORY=$(IOS_BUILD) \ - GYM_PROJECT=ios/Berty.xcodeproj \ + GYM_WORKSPACE=ios/Berty.xcworkspace \ GYM_SCHEME=house \ GYM_SKIP_PROFILE_DETECTION=true \ GYM_INCLUDE_SYMBOLS=false \ @@ -645,9 +663,11 @@ fastlane.ios.release: deps.ios # extract build informations unzip -p $(IOS_BUILD)/$(NAME).ipa Payload/*.app/embedded.mobileprovision | security cms -D > $(IOS_BUILD)/$(NAME).embedded.mobileprovision.txt +.PHONY: fastlane.ios.release.appstore fastlane.ios.release.appstore: fastlane.ios.release time bundle exec fastlane run pilot upload --verbose ipa:$(IOS_BUILD)/Berty.ipa skip_waiting_for_build_processing:true +.PHONY: fastlane.android.staff fastlane.android.staff: deps.android # get the google-services.json [ -e $(PWD)/android/app/google-services.json ] \ @@ -665,6 +685,7 @@ fastlane.android.staff: deps.android # check if apk is correctly signed jarsigner -verify $(ANDROID_BUILD)/*.apk +.PHONY: fastlane.android.yolo fastlane.android.yolo: deps.android # get the google-services.json [ -e $(PWD)/android/app/google-services.json ] \ @@ -681,6 +702,7 @@ fastlane.android.yolo: deps.android # check if apk is correctly signed jarsigner -verify $(ANDROID_BUILD)/*.apk +.PHONY: fastlane.android.release fastlane.android.release: deps.android # get the google-services.json [ -e $(PWD)/android/app/google-services.json ] \ diff --git a/client/android/app/build.gradle b/client/android/app/build.gradle index fb32555609..b223d76d0e 100644 --- a/client/android/app/build.gradle +++ b/client/android/app/build.gradle @@ -248,6 +248,7 @@ android { } dependencies { + implementation project(':lottie-react-native') implementation project(':rn-fetch-blob') implementation project(':react-native-view-shot') implementation project(':react-native-vector-icons') @@ -262,7 +263,6 @@ dependencies { implementation project(':react-native-dev-menu') implementation project(':react-native-config') implementation project(':react-native-camera') - implementation project(':lottie-react-native') implementation fileTree(dir: "libs", include: ["*.jar"]) implementation "com.facebook.react:react-native:+" // From node_modules implementation 'com.google.firebase:firebase-messaging:17.3.4' diff --git a/client/android/app/src/main/java/chat/berty/main/MainApplication.java b/client/android/app/src/main/java/chat/berty/main/MainApplication.java index 0263740a8e..ec207f6c2f 100644 --- a/client/android/app/src/main/java/chat/berty/main/MainApplication.java +++ b/client/android/app/src/main/java/chat/berty/main/MainApplication.java @@ -7,6 +7,7 @@ import com.facebook.hermes.reactexecutor.HermesExecutorFactory; import com.facebook.react.bridge.JavaScriptExecutorFactory; import com.facebook.react.ReactApplication; +import com.airbnb.android.react.lottie.LottiePackage; import com.facebook.react.ReactNativeHost; import com.facebook.react.ReactPackage; diff --git a/client/android/settings.gradle b/client/android/settings.gradle index 87a81870fa..107b52c211 100644 --- a/client/android/settings.gradle +++ b/client/android/settings.gradle @@ -1,4 +1,6 @@ rootProject.name = 'Berty' +include ':lottie-react-native' +project(':lottie-react-native').projectDir = new File(rootProject.projectDir, '../node_modules/lottie-react-native/src/android') include ':rn-fetch-blob' project(':rn-fetch-blob').projectDir = new File(rootProject.projectDir, '../node_modules/rn-fetch-blob/android') include ':react-native-view-shot' @@ -27,8 +29,6 @@ include ':react-native-config' project(':react-native-config').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-config/android') include ':react-native-camera' project(':react-native-camera').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-camera/android') -include ':lottie-react-native' -project(':lottie-react-native').projectDir = new File(rootProject.projectDir, '../node_modules/lottie-react-native/src/android') apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings) include ':ble', ':core' include ':app' diff --git a/client/ios/Berty.xcodeproj/project.pbxproj b/client/ios/Berty.xcodeproj/project.pbxproj index 0e5bb35dcd..014c47470b 100644 --- a/client/ios/Berty.xcodeproj/project.pbxproj +++ b/client/ios/Berty.xcodeproj/project.pbxproj @@ -32,12 +32,11 @@ B4DB1353CBB3816CE8622EF6 /* libPods-Berty.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B90BBB97C99313A576609CB5 /* libPods-Berty.a */; }; EC6310FD1D945D73FCECEB85 /* libPods-Berty-tvOSTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1310D1F395AAD06A2FF70EDF /* libPods-Berty-tvOSTests.a */; }; F80F01A522F9B3780012C157 /* fontello.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 991A116D2201B169006F3200 /* fontello.ttf */; }; - F82849CB22F879120093A779 /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F82849CA22F879120093A779 /* libssl.a */; }; + F8343A9E230AEC94005FB5CB /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8D1BA427216CF8F700FEF0AE /* libssl.a */; }; F844DEC121E8C5FD00A810A1 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F844DEC021E8C5FC00A810A1 /* AppDelegate.swift */; }; F8799D7A2136F44B003B9FD7 /* CoreModule.m in Sources */ = {isa = PBXBuildFile; fileRef = F8799D752136F3C5003B9FD7 /* CoreModule.m */; }; F8799D7B2136F44E003B9FD7 /* CoreModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8799D782136F3EA003B9FD7 /* CoreModule.swift */; }; F893F14A22F88EAA00A4EB3A /* PushKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F893F12322F88EAA00A4EB3A /* PushKit.framework */; }; - F893F14B22F88EB700A4EB3A /* libRCTPushNotification.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 480E37A42190872400BE10A5 /* libRCTPushNotification.a */; }; F893F19322F8943400A4EB3A /* core.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8EF7F472136A10500FDCCB5 /* core.framework */; }; /* End PBXBuildFile section */ @@ -119,20 +118,6 @@ remoteGlobalIDString = ADD01A681E09402E00F6D226; remoteInfo = "RCTBlob-tvOS"; }; - 2D16E6831FA4F8DC00B85C8A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 3DBE0D001F3B181A0099AA32; - remoteInfo = fishhook; - }; - 2D16E6851FA4F8DC00B85C8A /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 3DBE0D0D1F3B181C0099AA32; - remoteInfo = "fishhook-tvOS"; - }; 2DF0FFDE2056DD460020B375 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; @@ -266,13 +251,6 @@ remoteGlobalIDString = 3D05745F1DE6004600184BB4; remoteInfo = "RCTPushNotification-tvOS"; }; - 4854D04D21C41C1000FB71B8 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 83CBBA2D1A601D0E00E9B192; - remoteInfo = React; - }; 5E9157321DD0AC6500FF2AA8 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */; @@ -343,6 +321,13 @@ remoteGlobalIDString = 58B5115D1A9E6B3D00147676; remoteInfo = RCTCameraRoll; }; + F8EDBEAC230ADC1A0084CCDB /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 83CBBA2D1A601D0E00E9B192; + remoteInfo = React; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -372,7 +357,6 @@ 27729C4281337B640FDBA174 /* Pods-Berty-tvOSTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Berty-tvOSTests.release.xcconfig"; path = "Target Support Files/Pods-Berty-tvOSTests/Pods-Berty-tvOSTests.release.xcconfig"; sourceTree = ""; }; 2D02E47B1E0B4A5D006451C7 /* Berty-tvOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Berty-tvOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 2D02E4901E0B4A5D006451C7 /* Berty-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Berty-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; - 2D16E6891FA4F8E400B85C8A /* libReact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libReact.a; sourceTree = BUILT_PRODUCTS_DIR; }; 3DA256C3D19CC20E03B06E65 /* Pods-Berty-tvOSTests.adhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Berty-tvOSTests.adhoc.xcconfig"; path = "Target Support Files/Pods-Berty-tvOSTests/Pods-Berty-tvOSTests.adhoc.xcconfig"; sourceTree = ""; }; 3ED3560057DF4AB2B70B81BE /* Ionicons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Ionicons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf"; sourceTree = ""; }; 3F440C0C10EB428980A58A68 /* FontAwesome.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf"; sourceTree = ""; }; @@ -420,7 +404,6 @@ DD1A20A38723EDCDB7805F1D /* Pods-Berty.house.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Berty.house.xcconfig"; path = "Target Support Files/Pods-Berty/Pods-Berty.house.xcconfig"; sourceTree = ""; }; F09B398321C02721000AA9A8 /* RCTCameraRoll.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTCameraRoll.xcodeproj; path = "../node_modules/react-native/Libraries/CameraRoll/RCTCameraRoll.xcodeproj"; sourceTree = ""; }; F0BAE21221906E73003601A0 /* Berty.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = Berty.entitlements; path = Berty/Berty.entitlements; sourceTree = ""; }; - F82849CA22F879120093A779 /* libssl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libssl.a; path = ../../core/platform/common/openssl/built/ios/libssl.a; sourceTree = ""; }; F844DEC021E8C5FC00A810A1 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = AppDelegate.swift; path = Berty/AppDelegate.swift; sourceTree = ""; }; F844DF1B21E8CDAD00A810A1 /* Berty-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "Berty-Bridging-Header.h"; path = "Berty/Berty-Bridging-Header.h"; sourceTree = ""; }; F8799D752136F3C5003B9FD7 /* CoreModule.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CoreModule.m; sourceTree = ""; }; @@ -443,13 +426,12 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + B4DB1353CBB3816CE8622EF6 /* libPods-Berty.a in Frameworks */, F893F19322F8943400A4EB3A /* core.framework in Frameworks */, - F893F14B22F88EB700A4EB3A /* libRCTPushNotification.a in Frameworks */, F893F14A22F88EAA00A4EB3A /* PushKit.framework in Frameworks */, - F82849CB22F879120093A779 /* libssl.a in Frameworks */, + F8343A9E230AEC94005FB5CB /* libssl.a in Frameworks */, 8D1BA426216CF8EA00FEF0AE /* libcrypto.a in Frameworks */, 998B6ADC2179E1B90029B33C /* CoreBluetooth.framework in Frameworks */, - B4DB1353CBB3816CE8622EF6 /* libPods-Berty.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -536,8 +518,6 @@ children = ( 139FDEF41B06529B00C62182 /* libRCTWebSocket.a */, 3DAD3E991DF850E9000B6D8A /* libRCTWebSocket-tvOS.a */, - 2D16E6841FA4F8DC00B85C8A /* libfishhook.a */, - 2D16E6861FA4F8DC00B85C8A /* libfishhook-tvOS.a */, ); name = Products; sourceTree = ""; @@ -588,13 +568,11 @@ isa = PBXGroup; children = ( F893F12322F88EAA00A4EB3A /* PushKit.framework */, - F82849CA22F879120093A779 /* libssl.a */, 99B44285224B89C0000A8A98 /* JavaScriptCore.framework */, 998B6ADB2179E1B90029B33C /* CoreBluetooth.framework */, 8D1BA427216CF8F700FEF0AE /* libssl.a */, 8D1BA425216CF8EA00FEF0AE /* libcrypto.a */, F8EF7F472136A10500FDCCB5 /* core.framework */, - 2D16E6891FA4F8E400B85C8A /* libReact.a */, B90BBB97C99313A576609CB5 /* libPods-Berty.a */, 4BC0DC72C388E02C469C54F9 /* libPods-Berty-tvOS.a */, 1310D1F395AAD06A2FF70EDF /* libPods-Berty-tvOSTests.a */, @@ -816,14 +794,11 @@ 23DF70C2AB18FB5B36E98855 /* [CP] Copy Pods Resources */, F0D1801157F17A0E49E3A320 /* Strip Frameworks */, 5619EB106AB23201612FF42A /* Upload Sourcemap */, - 70DD4A0AD26796A9521F24CB /* Upload Sourcemap */, - 24A70D89C04F761C0F7FAB6F /* Upload Sourcemap */, - B95AA5E4196F862FB0B7748E /* Upload Sourcemap */, ); buildRules = ( ); dependencies = ( - 4854D04E21C41C1000FB71B8 /* PBXTargetDependency */, + F8EDBEAD230ADC1A0084CCDB /* PBXTargetDependency */, F844BDF422E8C0110099C6FF /* PBXTargetDependency */, ); name = Berty; @@ -1054,20 +1029,6 @@ remoteRef = 2D16E6711FA4F8DC00B85C8A /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 2D16E6841FA4F8DC00B85C8A /* libfishhook.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libfishhook.a; - remoteRef = 2D16E6831FA4F8DC00B85C8A /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 2D16E6861FA4F8DC00B85C8A /* libfishhook-tvOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libfishhook-tvOS.a"; - remoteRef = 2D16E6851FA4F8DC00B85C8A /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 2DF0FFDF2056DD460020B375 /* libjsinspector.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -1368,24 +1329,6 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Berty/Pods-Berty-resources.sh\"\n"; showEnvVarsInLog = 0; }; - 24A70D89C04F761C0F7FAB6F /* Upload Sourcemap */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - ); - name = "Upload Sourcemap"; - outputFileListPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 1; - shellPath = /bin/sh; - shellScript = "export INSTABUG_APP_TOKEN=\"YOUR_APP_TOKEN\"\nbash \"../node_modules/instabug-reactnative/ios/upload_sourcemap.sh\"\n"; - }; 2D02E4CB1E0B4B27006451C7 /* Bundle React Native Code And Images */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -1476,24 +1419,6 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 70DD4A0AD26796A9521F24CB /* Upload Sourcemap */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - ); - name = "Upload Sourcemap"; - outputFileListPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 1; - shellPath = /bin/sh; - shellScript = "export INSTABUG_APP_TOKEN=\"YOUR_APP_TOKEN\"\nbash \"../node_modules/instabug-reactnative/ios/upload_sourcemap.sh\"\n"; - }; 96BF197B3F1B392ABE36815C /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -1516,24 +1441,6 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - B95AA5E4196F862FB0B7748E /* Upload Sourcemap */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - ); - name = "Upload Sourcemap"; - outputFileListPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 1; - shellPath = /bin/sh; - shellScript = "export INSTABUG_APP_TOKEN=\"YOUR_APP_TOKEN\"\nbash \"../node_modules/instabug-reactnative/ios/upload_sourcemap.sh\"\n"; - }; D08A7BDEA276BC6F011300DB /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -1650,15 +1557,15 @@ target = 2D02E47A1E0B4A5D006451C7 /* Berty-tvOS */; targetProxy = 2D02E4911E0B4A5D006451C7 /* PBXContainerItemProxy */; }; - 4854D04E21C41C1000FB71B8 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = React; - targetProxy = 4854D04D21C41C1000FB71B8 /* PBXContainerItemProxy */; - }; F844BDF422E8C0110099C6FF /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = Lottie_iOS; }; + F8EDBEAD230ADC1A0084CCDB /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = React; + targetProxy = F8EDBEAC230ADC1A0084CCDB /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ @@ -1731,8 +1638,10 @@ isa = XCBuildConfiguration; baseConfigurationReference = B98EEB46F05A623A1EB16989 /* Pods-Berty.debug.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = YES; + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + ALWAYS_SEARCH_USER_PATHS = NO; ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Debug"; + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Berty/Berty.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; @@ -1747,6 +1656,12 @@ "$(SRCROOT)", "$(PROJECT_DIR)", ); + GCC_INPUT_FILETYPE = sourcecode.c.objc; + GCC_NO_COMMON_BLOCKS = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + "COCOAPODS=1", + ); HEADER_SEARCH_PATHS = ( "$(inherited)", "$(SRCROOT)", @@ -1759,20 +1674,31 @@ "$(inherited)", "$(SRCROOT)/../../core/platform/common/openssl/built/ios", ); + OTHER_CFLAGS = ""; + OTHER_CPLUSPLUSFLAGS = ( + "$(OTHER_CFLAGS)", + "-fcxx-modules", + ); OTHER_LDFLAGS = "$(inherited)"; - OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -Xcc -fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/lottie-ios/Lottie.modulemap\" -Xcc -fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/lottie-react-native/lottie_react_native.modulemap\""; + OTHER_SWIFT_FLAGS = ""; + PODS_BUILD_DIR = "$(BUILD_DIR)"; + PODS_CONFIGURATION_BUILD_DIR = "${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)"; + PODS_PODFILE_DIR_PATH = "${SRCROOT}/."; + PODS_ROOT = "${SRCROOT}/Pods"; PRODUCT_BUNDLE_IDENTIFIER = chat.berty.ios.debug; PRODUCT_NAME = Berty; PROVISIONING_PROFILE = ""; PROVISIONING_PROFILE_SPECIFIER = ""; REACT_HEADERS_PATH = ""; - REACT_LIBRARY_PATH = ""; + REACT_LIBRARY_PATH = "\b"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = ""; + SWIFT_INCLUDE_PATHS = "$(inherited) \"${PODS_CONFIGURATION_BUILD_DIR}/lottie-ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/lottie-react-native\""; SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/Berty/Berty-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_PRECOMPILE_BRIDGING_HEADER = YES; SWIFT_VERSION = 5.0; TVOS_DEPLOYMENT_TARGET = 9.0; - USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**"; + USER_HEADER_SEARCH_PATHS = "\"${PODS_ROOT}/Headers\"/**"; VERSIONING_SYSTEM = "apple-generic"; }; name = Debug; @@ -1781,8 +1707,10 @@ isa = XCBuildConfiguration; baseConfigurationReference = 72572BA64462397140A164A5 /* Pods-Berty.release.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = YES; + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + ALWAYS_SEARCH_USER_PATHS = NO; ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Release"; + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Berty/Berty.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; @@ -1796,6 +1724,12 @@ "$(SRCROOT)", "$(PROJECT_DIR)", ); + GCC_INPUT_FILETYPE = sourcecode.c.objc; + GCC_NO_COMMON_BLOCKS = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + "COCOAPODS=1", + ); HEADER_SEARCH_PATHS = ( "$(inherited)", "$(SRCROOT)", @@ -1808,19 +1742,30 @@ "$(inherited)", "$(SRCROOT)/../../core/platform/common/openssl/built/ios", ); + OTHER_CFLAGS = ""; + OTHER_CPLUSPLUSFLAGS = ( + "$(OTHER_CFLAGS)", + "-fcxx-modules", + ); OTHER_LDFLAGS = "$(inherited)"; - OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -Xcc -fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/lottie-ios/Lottie.modulemap\" -Xcc -fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/lottie-react-native/lottie_react_native.modulemap\""; + OTHER_SWIFT_FLAGS = ""; + PODS_BUILD_DIR = "$(BUILD_DIR)"; + PODS_CONFIGURATION_BUILD_DIR = "${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)"; + PODS_PODFILE_DIR_PATH = "${SRCROOT}/."; + PODS_ROOT = "${SRCROOT}/Pods"; PRODUCT_BUNDLE_IDENTIFIER = chat.berty.ios; PRODUCT_NAME = Berty; PROVISIONING_PROFILE = "180f67c5-ba82-4ef0-ba95-228b27fcf162"; PROVISIONING_PROFILE_SPECIFIER = "match AppStore chat.berty.ios"; REACT_HEADERS_PATH = ""; - REACT_LIBRARY_PATH = ""; + REACT_LIBRARY_PATH = "\b"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = ""; + SWIFT_INCLUDE_PATHS = "$(inherited) \"${PODS_CONFIGURATION_BUILD_DIR}/lottie-ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/lottie-react-native\""; SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/Berty/Berty-Bridging-Header.h"; SWIFT_PRECOMPILE_BRIDGING_HEADER = YES; SWIFT_VERSION = 5.0; TVOS_DEPLOYMENT_TARGET = 9.0; - USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**"; + USER_HEADER_SEARCH_PATHS = "\"${PODS_ROOT}/Headers\"/**"; VERSIONING_SYSTEM = "apple-generic"; }; name = Release; @@ -1996,8 +1941,10 @@ isa = XCBuildConfiguration; baseConfigurationReference = DD1A20A38723EDCDB7805F1D /* Pods-Berty.house.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = YES; + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + ALWAYS_SEARCH_USER_PATHS = NO; ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-House"; + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Berty/Berty.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; @@ -2011,6 +1958,12 @@ "$(SRCROOT)", "$(PROJECT_DIR)", ); + GCC_INPUT_FILETYPE = sourcecode.c.objc; + GCC_NO_COMMON_BLOCKS = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + "COCOAPODS=1", + ); HEADER_SEARCH_PATHS = ( "$(inherited)", "$(SRCROOT)", @@ -2023,19 +1976,30 @@ "$(inherited)", "$(SRCROOT)/../../core/platform/common/openssl/built/ios", ); + OTHER_CFLAGS = ""; + OTHER_CPLUSPLUSFLAGS = ( + "$(OTHER_CFLAGS)", + "-fcxx-modules", + ); OTHER_LDFLAGS = "$(inherited)"; - OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -Xcc -fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/lottie-ios/Lottie.modulemap\" -Xcc -fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/lottie-react-native/lottie_react_native.modulemap\""; + OTHER_SWIFT_FLAGS = ""; + PODS_BUILD_DIR = "$(BUILD_DIR)"; + PODS_CONFIGURATION_BUILD_DIR = "${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)"; + PODS_PODFILE_DIR_PATH = "${SRCROOT}/."; + PODS_ROOT = "${SRCROOT}/Pods"; PRODUCT_BUNDLE_IDENTIFIER = chat.berty.ios.yolo; PRODUCT_NAME = Berty; PROVISIONING_PROFILE = "9fce9842-13d9-44c0-877f-f1bd4f500c5e"; PROVISIONING_PROFILE_SPECIFIER = "match InHouse chat.berty.ios.yolo"; REACT_HEADERS_PATH = "$(BUILD_DIR)/Release-$(PLATFORM_NAME)/include"; - REACT_LIBRARY_PATH = "$(BUILD_DIR)/Release-$(PLATFORM_NAME)"; + REACT_LIBRARY_PATH = "\b"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = ""; + SWIFT_INCLUDE_PATHS = "$(inherited) \"${PODS_CONFIGURATION_BUILD_DIR}/lottie-ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/lottie-react-native\""; SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/Berty/Berty-Bridging-Header.h"; SWIFT_PRECOMPILE_BRIDGING_HEADER = YES; SWIFT_VERSION = 5.0; TVOS_DEPLOYMENT_TARGET = 9.0; - USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**"; + USER_HEADER_SEARCH_PATHS = "\"${PODS_ROOT}/Headers\"/**"; VERSIONING_SYSTEM = "apple-generic"; }; name = house; @@ -2172,8 +2136,10 @@ isa = XCBuildConfiguration; baseConfigurationReference = 23BA55428718512F2D196782 /* Pods-Berty.adhoc.xcconfig */; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = YES; + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + ALWAYS_SEARCH_USER_PATHS = NO; ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-Adhoc"; + CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Berty/Berty.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; @@ -2187,6 +2153,12 @@ "$(SRCROOT)", "$(PROJECT_DIR)", ); + GCC_INPUT_FILETYPE = sourcecode.c.objc; + GCC_NO_COMMON_BLOCKS = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + "COCOAPODS=1", + ); HEADER_SEARCH_PATHS = ( "$(inherited)", "$(SRCROOT)", @@ -2199,19 +2171,30 @@ "$(inherited)", "$(SRCROOT)/../../core/platform/common/openssl/built/ios", ); + OTHER_CFLAGS = ""; + OTHER_CPLUSPLUSFLAGS = ( + "$(OTHER_CFLAGS)", + "-fcxx-modules", + ); OTHER_LDFLAGS = "$(inherited)"; - OTHER_SWIFT_FLAGS = "$(inherited) -D COCOAPODS -Xcc -fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/lottie-ios/Lottie.modulemap\" -Xcc -fmodule-map-file=\"${PODS_CONFIGURATION_BUILD_DIR}/lottie-react-native/lottie_react_native.modulemap\""; + OTHER_SWIFT_FLAGS = ""; + PODS_BUILD_DIR = "$(BUILD_DIR)"; + PODS_CONFIGURATION_BUILD_DIR = "${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)"; + PODS_PODFILE_DIR_PATH = "${SRCROOT}/."; + PODS_ROOT = "${SRCROOT}/Pods"; PRODUCT_BUNDLE_IDENTIFIER = chat.berty.ios.staff; PRODUCT_NAME = Berty; PROVISIONING_PROFILE = "a6ff975a-e522-4340-a954-fe68323f6396"; PROVISIONING_PROFILE_SPECIFIER = "match AdHoc chat.berty.ios.staff"; REACT_HEADERS_PATH = "$(BUILD_DIR)/Release-$(PLATFORM_NAME)/include"; - REACT_LIBRARY_PATH = "$(BUILD_DIR)/Release-$(PLATFORM_NAME)"; + REACT_LIBRARY_PATH = "\b"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = ""; + SWIFT_INCLUDE_PATHS = "$(inherited) \"${PODS_CONFIGURATION_BUILD_DIR}/lottie-ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/lottie-react-native\""; SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/Berty/Berty-Bridging-Header.h"; SWIFT_PRECOMPILE_BRIDGING_HEADER = YES; SWIFT_VERSION = 5.0; TVOS_DEPLOYMENT_TARGET = 9.0; - USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**"; + USER_HEADER_SEARCH_PATHS = "\"${PODS_ROOT}/Headers\"/**"; VERSIONING_SYSTEM = "apple-generic"; }; name = adhoc; diff --git a/client/ios/Podfile b/client/ios/Podfile index 00f67e9831..c8ec8ee480 100644 --- a/client/ios/Podfile +++ b/client/ios/Podfile @@ -6,7 +6,6 @@ target 'Berty' do pod 'React', :path => '../node_modules/react-native/' pod 'React-Core', :path => '../node_modules/react-native/React' pod 'React-DevSupport', :path => '../node_modules/react-native/React' - pod 'React-fishhook', :path => '../node_modules/react-native/Libraries/fishhook' pod 'React-RCTActionSheet', :path => '../node_modules/react-native/Libraries/ActionSheetIOS' pod 'React-RCTAnimation', :path => '../node_modules/react-native/Libraries/NativeAnimation' pod 'React-RCTBlob', :path => '../node_modules/react-native/Libraries/Blob' @@ -32,10 +31,6 @@ target 'Berty' do # @FIXME: https://github.com/avishayil/react-native-restart/issues/34 pod 'RCTRestart', :path => '../node_modules/react-native-restart/ios' - pod 'lottie-ios', :path => '../node_modules/lottie-ios' - - pod 'lottie-react-native', :path => '../node_modules/lottie-react-native' - pod 'react-native-camera', :path => '../node_modules/react-native-camera' pod 'RNDevMenu', :path => '../node_modules/react-native-dev-menu' @@ -64,6 +59,10 @@ target 'Berty' do pod 'react-native-config', :path => '../node_modules/react-native-config' + pod 'lottie-ios', :path => '../node_modules/lottie-ios' + + pod 'lottie-react-native', :path => '../node_modules/lottie-react-native' + target 'BertyTests' do inherit! :search_paths # Pods for testing @@ -92,11 +91,11 @@ post_install do |installer| # "Multiple commands produce ... libReact.a" # "Multiple commands produce ... libyoga.a" - targets_to_ignore = %w(React yoga) + # targets_to_ignore = %w(React yoga) - if targets_to_ignore.include? target.name - target.remove_from_project - end + # if targets_to_ignore.include? target.name + # target.remove_from_project + # end if target.name == 'react-native-config' phase = target.project.new(Xcodeproj::Project::Object::PBXShellScriptBuildPhase) diff --git a/client/ios/Podfile.lock b/client/ios/Podfile.lock index 2ba53e2796..7f69f36890 100644 --- a/client/ios/Podfile.lock +++ b/client/ios/Podfile.lock @@ -14,57 +14,56 @@ PODS: - instabug-reactnative (8.5.2): - React - lottie-ios (3.0.3) - - lottie-react-native (3.0.4): + - lottie-react-native (3.1.0): - lottie-ios (~> 3.0.3) - React - RCTRestart (0.0.9): - React - - React (0.60.4): - - React-Core (= 0.60.4) - - React-DevSupport (= 0.60.4) - - React-RCTActionSheet (= 0.60.4) - - React-RCTAnimation (= 0.60.4) - - React-RCTBlob (= 0.60.4) - - React-RCTImage (= 0.60.4) - - React-RCTLinking (= 0.60.4) - - React-RCTNetwork (= 0.60.4) - - React-RCTSettings (= 0.60.4) - - React-RCTText (= 0.60.4) - - React-RCTVibration (= 0.60.4) - - React-RCTWebSocket (= 0.60.4) - - React-Core (0.60.4): + - React (0.60.5): + - React-Core (= 0.60.5) + - React-DevSupport (= 0.60.5) + - React-RCTActionSheet (= 0.60.5) + - React-RCTAnimation (= 0.60.5) + - React-RCTBlob (= 0.60.5) + - React-RCTImage (= 0.60.5) + - React-RCTLinking (= 0.60.5) + - React-RCTNetwork (= 0.60.5) + - React-RCTSettings (= 0.60.5) + - React-RCTText (= 0.60.5) + - React-RCTVibration (= 0.60.5) + - React-RCTWebSocket (= 0.60.5) + - React-Core (0.60.5): - Folly (= 2018.10.22.00) - - React-cxxreact (= 0.60.4) - - React-jsiexecutor (= 0.60.4) - - yoga (= 0.60.4.React) - - React-cxxreact (0.60.4): + - React-cxxreact (= 0.60.5) + - React-jsiexecutor (= 0.60.5) + - yoga (= 0.60.5.React) + - React-cxxreact (0.60.5): - boost-for-react-native (= 1.63.0) - DoubleConversion - Folly (= 2018.10.22.00) - glog - - React-jsinspector (= 0.60.4) - - React-DevSupport (0.60.4): - - React-Core (= 0.60.4) - - React-RCTWebSocket (= 0.60.4) - - React-fishhook (0.60.4) - - React-jsi (0.60.4): + - React-jsinspector (= 0.60.5) + - React-DevSupport (0.60.5): + - React-Core (= 0.60.5) + - React-RCTWebSocket (= 0.60.5) + - React-jsi (0.60.5): - boost-for-react-native (= 1.63.0) - DoubleConversion - Folly (= 2018.10.22.00) - glog - - React-jsi/Default (= 0.60.4) - - React-jsi/Default (0.60.4): + - React-jsi/Default (= 0.60.5) + - React-jsi/Default (0.60.5): - boost-for-react-native (= 1.63.0) - DoubleConversion - Folly (= 2018.10.22.00) - glog - - React-jsiexecutor (0.60.4): + - React-jsiexecutor (0.60.5): - DoubleConversion - Folly (= 2018.10.22.00) - glog - - React-cxxreact (= 0.60.4) - - React-jsi (= 0.60.4) - - React-jsinspector (0.60.4) + - React-cxxreact (= 0.60.5) + - React-jsi (= 0.60.5) + - React-jsinspector (0.60.5) - react-native-camera (2.11.1): - React - react-native-camera/RCT (= 2.11.1) @@ -79,32 +78,31 @@ PODS: - React - react-native-network-info (4.0.1): - React - - React-RCTActionSheet (0.60.4): - - React-Core (= 0.60.4) - - React-RCTAnimation (0.60.4): - - React-Core (= 0.60.4) - - React-RCTBlob (0.60.4): - - React-Core (= 0.60.4) - - React-RCTNetwork (= 0.60.4) - - React-RCTWebSocket (= 0.60.4) - - React-RCTImage (0.60.4): - - React-Core (= 0.60.4) - - React-RCTNetwork (= 0.60.4) - - React-RCTLinking (0.60.4): - - React-Core (= 0.60.4) - - React-RCTNetwork (0.60.4): - - React-Core (= 0.60.4) - - React-RCTPushNotification (0.60.4): - - React-Core (= 0.60.4) - - React-RCTSettings (0.60.4): - - React-Core (= 0.60.4) - - React-RCTText (0.60.4): - - React-Core (= 0.60.4) - - React-RCTVibration (0.60.4): - - React-Core (= 0.60.4) - - React-RCTWebSocket (0.60.4): - - React-Core (= 0.60.4) - - React-fishhook (= 0.60.4) + - React-RCTActionSheet (0.60.5): + - React-Core (= 0.60.5) + - React-RCTAnimation (0.60.5): + - React-Core (= 0.60.5) + - React-RCTBlob (0.60.5): + - React-Core (= 0.60.5) + - React-RCTNetwork (= 0.60.5) + - React-RCTWebSocket (= 0.60.5) + - React-RCTImage (0.60.5): + - React-Core (= 0.60.5) + - React-RCTNetwork (= 0.60.5) + - React-RCTLinking (0.60.5): + - React-Core (= 0.60.5) + - React-RCTNetwork (0.60.5): + - React-Core (= 0.60.5) + - React-RCTPushNotification (0.60.5): + - React-Core (= 0.60.5) + - React-RCTSettings (0.60.5): + - React-Core (= 0.60.5) + - React-RCTText (0.60.5): + - React-Core (= 0.60.5) + - React-RCTVibration (0.60.5): + - React-Core (= 0.60.5) + - React-RCTWebSocket (0.60.5): + - React-Core (= 0.60.5) - ReactNativeExceptionHandler (2.10.7): - React - ReactNativePermissions (1.1.1): @@ -127,7 +125,7 @@ PODS: - React - RNViewShot (2.5.0): - React - - yoga (0.60.4.React) + - yoga (0.60.5.React) DEPENDENCIES: - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) @@ -141,7 +139,6 @@ DEPENDENCIES: - React-Core (from `../node_modules/react-native/React`) - React-cxxreact (from `../node_modules/react-native/ReactCommon/cxxreact`) - React-DevSupport (from `../node_modules/react-native/React`) - - React-fishhook (from `../node_modules/react-native/Libraries/fishhook`) - React-jsi (from `../node_modules/react-native/ReactCommon/jsi`) - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`) - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`) @@ -199,8 +196,6 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon/cxxreact" React-DevSupport: :path: "../node_modules/react-native/React" - React-fishhook: - :path: "../node_modules/react-native/Libraries/fishhook" React-jsi: :path: "../node_modules/react-native/ReactCommon/jsi" React-jsiexecutor: @@ -267,31 +262,30 @@ SPEC CHECKSUMS: glog: 1f3da668190260b06b429bb211bfbee5cd790c28 instabug-reactnative: 2aeed0c4d1dca5545ff550d60d0bd5f730120cda lottie-ios: 6037add6441183d4ffd100d2ac78724aa8d919d4 - lottie-react-native: a3405431913e5caf74ece1a17819d3e21cec000d + lottie-react-native: 86aeee2caa9250e4c8027ac75711a59c6679e532 RCTRestart: 05aa14bfc0f0f0b02769be197cbd81afa66ea627 - React: ff7ee2ae5ee1c1d9ae2183b4111045b25294bb01 - React-Core: 8e0ea421cae5609d2562850f98421b15030476fa - React-cxxreact: 326880209990151a7182a813311054e9772ba510 - React-DevSupport: e9f10e6721e78e87622fc985db695c0c0168db8a - React-fishhook: 1f0e5b08449403fa75c3fb3881a0beefbada14af - React-jsi: 21d3153b1153fbf6510a92b6b11e33e725cb7432 - React-jsiexecutor: 7549641e48bafae7bfee3f3ea19bf4901639c5de - React-jsinspector: 73f24a02fa684ed6a2b828ba116874a2191ded88 + React: 53c53c4d99097af47cf60594b8706b4e3321e722 + React-Core: ba421f6b4f4cbe2fb17c0b6fc675f87622e78a64 + React-cxxreact: 8384287780c4999351ad9b6e7a149d9ed10a2395 + React-DevSupport: 197fb409737cff2c4f9986e77c220d7452cb9f9f + React-jsi: 4d8c9efb6312a9725b18d6fc818ffc103f60fec2 + React-jsiexecutor: 90ad2f9db09513fc763bc757fdc3c4ff8bde2a30 + React-jsinspector: e08662d1bf5b129a3d556eb9ea343a3f40353ae4 react-native-camera: 96a3c81f27da57b816fbb6808dde20dc96d1431e react-native-config: 55548054279d92e0e4566ea15a8b9b81028ec342 react-native-image-picker: fd93361c666f397bdf72f9c6c23f13d2685b9173 react-native-network-info: 6c94056a2fb00c27dd759c30fee7b327a9e4c73a - React-RCTActionSheet: 9f71d7ae3e8fb10e08d162cbf14c621349dbfab3 - React-RCTAnimation: 981d8c95b0e30918a9832ccac32af83562a27fae - React-RCTBlob: 21e73d1020a302a75fed30dbaee9f15287b80baa - React-RCTImage: c0bc6ac0926517b6fb7e4c279b04843113e99d1d - React-RCTLinking: 1af3f3c59114bed3deec0107c62e7efad0932ee5 - React-RCTNetwork: 35df9de46e19cda5c56380be1a7759b9b8cb2fcd - React-RCTPushNotification: 2df79ea1c4aa1292b4a854c13bd716315ec917fe - React-RCTSettings: f580504c2cd1f44e25add10fb9ed3954f67f8ac5 - React-RCTText: e0f224898b13af9aa036ea7cb3d438daa68c1044 - React-RCTVibration: 0bea40cd51bd089bd591a8f74c86e91fdf2666c5 - React-RCTWebSocket: 163873f4cdd5f1058a9483443404fc3801581cb6 + React-RCTActionSheet: b0f1ea83f4bf75fb966eae9bfc47b78c8d3efd90 + React-RCTAnimation: 359ba1b5690b1e87cc173558a78e82d35919333e + React-RCTBlob: 5e2b55f76e9a1c7ae52b826923502ddc3238df24 + React-RCTImage: f5f1c50922164e89bdda67bcd0153952a5cfe719 + React-RCTLinking: d0ecbd791e9ddddc41fa1f66b0255de90e8ee1e9 + React-RCTNetwork: e26946300b0ab7bb6c4a6348090e93fa21f33a9d + React-RCTPushNotification: 2ae0eaa3e6ac639aae536e3608b0fc184a034645 + React-RCTSettings: d0d37cb521b7470c998595a44f05847777cc3f42 + React-RCTText: b074d89033583d4f2eb5faf7ea2db3a13c7553a2 + React-RCTVibration: 2105b2e0e2b66a6408fc69a46c8a7fb5b2fdade0 + React-RCTWebSocket: cd932a16b7214898b6b7f788c8bddb3637246ac4 ReactNativeExceptionHandler: 5e46d98b0a1f5acabeac64a3613ff1f345e71b30 ReactNativePermissions: 2e324bb3baf12702e3ec27f76c8ae1158fa69fc6 rn-fetch-blob: 651b8d076b43d0d7aa294a3d9ec16c00aab8bef9 @@ -302,8 +296,8 @@ SPEC CHECKSUMS: RNSVG: c3d27cf99f8484d3d8f8bb017b5438fd321267cf RNVectorIcons: 6607bd3a30291d0edb56f9bbe7ae411ee2b928b0 RNViewShot: 5c5b4c5540046e5fb0de4a48a311571816c43c86 - yoga: c2c050f6ae6e222534760cc82f559b89214b67e2 + yoga: 312528f5bbbba37b4dcea5ef00e8b4033fdd9411 -PODFILE CHECKSUM: d9f0db4f6bfe83c2ac38715d5347c17b41d366fe +PODFILE CHECKSUM: 7a2afc389458c64f8a30026a52ad84b27666d61f COCOAPODS: 1.7.5 diff --git a/client/package-lock.json b/client/package-lock.json index 5883e0f4c3..2dd4ca3add 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -2115,9 +2115,9 @@ } }, "graceful-fs": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.1.tgz", - "integrity": "sha512-b9usnbDGnD928gJB3LrCmxoibr3VE4U2SMo5PBuBnokWyDADTqDPXg4YpwKF1trpH+UbGp7QLicO3+aWEy0+mw==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz", + "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==", "dev": true }, "pify": { @@ -2178,9 +2178,9 @@ } }, "graceful-fs": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.1.tgz", - "integrity": "sha512-b9usnbDGnD928gJB3LrCmxoibr3VE4U2SMo5PBuBnokWyDADTqDPXg4YpwKF1trpH+UbGp7QLicO3+aWEy0+mw==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz", + "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==", "dev": true }, "pify": { @@ -2220,9 +2220,9 @@ } }, "graceful-fs": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.1.tgz", - "integrity": "sha512-b9usnbDGnD928gJB3LrCmxoibr3VE4U2SMo5PBuBnokWyDADTqDPXg4YpwKF1trpH+UbGp7QLicO3+aWEy0+mw==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz", + "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==", "dev": true } } @@ -2325,9 +2325,9 @@ } }, "graceful-fs": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.1.tgz", - "integrity": "sha512-b9usnbDGnD928gJB3LrCmxoibr3VE4U2SMo5PBuBnokWyDADTqDPXg4YpwKF1trpH+UbGp7QLicO3+aWEy0+mw==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz", + "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==", "dev": true } } @@ -2422,9 +2422,9 @@ } }, "graceful-fs": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.1.tgz", - "integrity": "sha512-b9usnbDGnD928gJB3LrCmxoibr3VE4U2SMo5PBuBnokWyDADTqDPXg4YpwKF1trpH+UbGp7QLicO3+aWEy0+mw==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz", + "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==", "dev": true } } @@ -2454,9 +2454,9 @@ } }, "graceful-fs": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.1.tgz", - "integrity": "sha512-b9usnbDGnD928gJB3LrCmxoibr3VE4U2SMo5PBuBnokWyDADTqDPXg4YpwKF1trpH+UbGp7QLicO3+aWEy0+mw==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz", + "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==", "dev": true }, "pify": { @@ -2598,9 +2598,9 @@ } }, "graceful-fs": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.1.tgz", - "integrity": "sha512-b9usnbDGnD928gJB3LrCmxoibr3VE4U2SMo5PBuBnokWyDADTqDPXg4YpwKF1trpH+UbGp7QLicO3+aWEy0+mw==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz", + "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==", "dev": true } } @@ -2634,9 +2634,9 @@ } }, "graceful-fs": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.1.tgz", - "integrity": "sha512-b9usnbDGnD928gJB3LrCmxoibr3VE4U2SMo5PBuBnokWyDADTqDPXg4YpwKF1trpH+UbGp7QLicO3+aWEy0+mw==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz", + "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==", "dev": true }, "pify": { @@ -2893,6 +2893,15 @@ "npmlog": "^4.1.2" }, "dependencies": { + "ansi-escapes": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.2.1.tgz", + "integrity": "sha512-Cg3ymMAdN10wOk/VYfLV7KCQyv7EDirJ64500sU7n9UlmioEtDuU5Gd+hj73hXSU/ex7tHJSssmyftDdkMLO8Q==", + "dev": true, + "requires": { + "type-fest": "^0.5.2" + } + }, "ansi-regex": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", @@ -2905,6 +2914,21 @@ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", "dev": true }, + "cli-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", + "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", + "dev": true, + "requires": { + "restore-cursor": "^3.1.0" + } + }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true + }, "external-editor": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", @@ -2916,33 +2940,84 @@ "tmp": "^0.0.33" } }, + "figures": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-3.0.0.tgz", + "integrity": "sha512-HKri+WoWoUgr83pehn/SIgLOMZ9nAWC6dcGj26RY2R4F50u4+RTUz0RCrUlOV3nKRAICW1UGzyb+kcX2qK1S/g==", + "dev": true, + "requires": { + "escape-string-regexp": "^1.0.5" + } + }, "inquirer": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.0.tgz", - "integrity": "sha512-scfHejeG/lVZSpvCXpsB4j/wQNPM5JC8kiElOI0OUTwmc1RTpXr4H32/HOlQHcZiYl2z2VElwuCVDRG8vFmbnA==", + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.1.tgz", + "integrity": "sha512-uxNHBeQhRXIoHWTSNYUFhQVrHYFThIt6IVo2fFmSe8aBwdR3/w6b58hJpiL/fMukFkvGzjg+hSxFtwvVmKZmXw==", "dev": true, "requires": { - "ansi-escapes": "^3.2.0", + "ansi-escapes": "^4.2.1", "chalk": "^2.4.2", - "cli-cursor": "^2.1.0", + "cli-cursor": "^3.1.0", "cli-width": "^2.0.0", "external-editor": "^3.0.3", - "figures": "^2.0.0", - "lodash": "^4.17.12", - "mute-stream": "0.0.7", + "figures": "^3.0.0", + "lodash": "^4.17.15", + "mute-stream": "0.0.8", "run-async": "^2.2.0", "rxjs": "^6.4.0", - "string-width": "^2.1.0", + "string-width": "^4.1.0", "strip-ansi": "^5.1.0", "through": "^2.3.6" } }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true + }, "lodash": { "version": "4.17.15", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", "dev": true }, + "mute-stream": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", + "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", + "dev": true + }, + "onetime": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz", + "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==", + "dev": true, + "requires": { + "mimic-fn": "^2.1.0" + } + }, + "restore-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", + "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", + "dev": true, + "requires": { + "onetime": "^5.1.0", + "signal-exit": "^3.0.2" + } + }, + "string-width": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.1.0.tgz", + "integrity": "sha512-NrX+1dVVh+6Y9dnQ19pR0pP4FiEIlUvdTGn8pw6CKTNq5sgib2nIhmUNT5TAmhWmvKr3WcxBcP3E8nWezuipuQ==", + "dev": true, + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^5.2.0" + } + }, "strip-ansi": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", @@ -2951,6 +3026,12 @@ "requires": { "ansi-regex": "^4.1.0" } + }, + "type-fest": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.5.2.tgz", + "integrity": "sha512-DWkS49EQKVX//Tbupb9TFa19c7+MK1XmzkrZUR8TAktmE/DizXoaoJV6TZ/tSIPXipqNiRI6CyAe7x69Jb6RSw==", + "dev": true } } }, @@ -3004,9 +3085,9 @@ } }, "graceful-fs": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.1.tgz", - "integrity": "sha512-b9usnbDGnD928gJB3LrCmxoibr3VE4U2SMo5PBuBnokWyDADTqDPXg4YpwKF1trpH+UbGp7QLicO3+aWEy0+mw==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz", + "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==", "dev": true }, "semver": { @@ -3059,9 +3140,9 @@ } }, "graceful-fs": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.1.tgz", - "integrity": "sha512-b9usnbDGnD928gJB3LrCmxoibr3VE4U2SMo5PBuBnokWyDADTqDPXg4YpwKF1trpH+UbGp7QLicO3+aWEy0+mw==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz", + "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==", "dev": true } } @@ -3151,9 +3232,9 @@ } }, "graceful-fs": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.1.tgz", - "integrity": "sha512-b9usnbDGnD928gJB3LrCmxoibr3VE4U2SMo5PBuBnokWyDADTqDPXg4YpwKF1trpH+UbGp7QLicO3+aWEy0+mw==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz", + "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==", "dev": true } } @@ -3185,9 +3266,9 @@ } }, "graceful-fs": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.1.tgz", - "integrity": "sha512-b9usnbDGnD928gJB3LrCmxoibr3VE4U2SMo5PBuBnokWyDADTqDPXg4YpwKF1trpH+UbGp7QLicO3+aWEy0+mw==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz", + "integrity": "sha512-IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==", "dev": true } } @@ -3692,9 +3773,9 @@ "dev": true }, "@types/node": { - "version": "12.6.9", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.6.9.tgz", - "integrity": "sha512-+YB9FtyxXGyD54p8rXwWaN1EWEyar5L58GlGWgtH2I9rGmLGBQcw63+0jw+ujqVavNuO47S1ByAjm9zdHMnskw==", + "version": "12.7.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.7.2.tgz", + "integrity": "sha512-dyYO+f6ihZEtNPDcWNR1fkoTDf3zAK3lAABDze3mz6POyIercH0lEUawUFXlG8xaQZmm1yEBON/4TsYv/laDYg==", "dev": true }, "@types/prop-types": { @@ -5381,9 +5462,9 @@ "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=" }, "cacache": { - "version": "12.0.2", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.2.tgz", - "integrity": "sha512-ifKgxH2CKhJEg6tNdAwziu6Q33EvuG26tYcda6PT3WKisZcYDXsnEdnRv67Po3yCzFfaSoMjGZzJyD2c3DT1dg==", + "version": "12.0.3", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.3.tgz", + "integrity": "sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==", "dev": true, "requires": { "bluebird": "^3.5.5", @@ -13452,9 +13533,9 @@ "integrity": "sha512-p7dx7bq+1yUX3qA9Xof7Lpa2Gfopi6bPtMfFdv9Qi6iKVSkg0FwJXc7fD2AiiW8trHVFhHgjj2ELTZrZF6uu1A==" }, "lottie-react-native": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/lottie-react-native/-/lottie-react-native-3.0.4.tgz", - "integrity": "sha512-P4+haT2ArmKdLCPOb1zLCVSFNhS5v5gGPTpz79nji/UEG8a7q2LSu6V8MUbre/DWztJr3MLwlX7gKKaKvOM8KA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/lottie-react-native/-/lottie-react-native-3.1.0.tgz", + "integrity": "sha512-8AYKHT7+vyV/dt38Z7tRyMAnX4nvNRcRBXtDw0+IXAtvyoFk4ethDnI3AtDD9m3o/vNKqeHuO6YsojGAIVQMcg==", "requires": { "invariant": "^2.2.2", "lottie-ios": "^3.0.3", @@ -15362,9 +15443,9 @@ } }, "npm-lifecycle": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-3.1.2.tgz", - "integrity": "sha512-nhfOcoTHrW1lJJlM2o77vTE2RWR4YOVyj7YzmY0y5itsMjEuoJHteio/ez0BliENEPsNxIUQgwhyEW9dShj3Ww==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/npm-lifecycle/-/npm-lifecycle-3.1.3.tgz", + "integrity": "sha512-M0QmmqbEHBXxDrmc6X3+eKjW9+F7Edg1ENau92WkYw1sox6wojHzEZJIRm1ItljEiaigZlKL8mXni/4ylAy1Dg==", "dev": true, "requires": { "byline": "^5.0.0", @@ -19013,14 +19094,14 @@ } }, "react": { - "version": "16.8.3", - "resolved": "https://registry.npmjs.org/react/-/react-16.8.3.tgz", - "integrity": "sha512-3UoSIsEq8yTJuSu0luO1QQWYbgGEILm+eJl2QN/VLDi7hL+EN18M3q3oVZwmVzzBJ3DkM7RMdRwBmZZ+b4IzSA==", + "version": "16.8.6", + "resolved": "https://registry.npmjs.org/react/-/react-16.8.6.tgz", + "integrity": "sha512-pC0uMkhLaHm11ZSJULfOBqV4tIZkx87ZLvbbQYunNixAAvjnC+snJCg0XQXn9VIsttVsbZP/H/ewzgsd5fxKXw==", "requires": { "loose-envify": "^1.1.0", "object-assign": "^4.1.1", "prop-types": "^15.6.2", - "scheduler": "^0.13.3" + "scheduler": "^0.13.6" } }, "react-chartjs-2": { @@ -19038,9 +19119,9 @@ "integrity": "sha512-WUSQJ4P/wWcusaH+zZmbECOk7H5N2pOIl0vzheeornkIMhu+qrNdGFm0bDZLCb0hSF0jf/kH1SgkNGfBdTc4wA==" }, "react-devtools-core": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-3.6.2.tgz", - "integrity": "sha512-a5r2Er0PajtlvKYBUKzB3vW5qek8TbgQWwRruDEwTm3VnqVffHmnvApRil/lfkAa8ghXcESNizrtKu/18oG55Q==", + "version": "3.6.3", + "resolved": "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-3.6.3.tgz", + "integrity": "sha512-+P+eFy/yo8Z/UH9J0DqHZuUM5+RI2wl249TNvMx3J2jpUomLQa4Zxl56GEotGfw3PIP1eI+hVf1s53FlUONStQ==", "requires": { "shell-quote": "^1.6.1", "ws": "^3.3.1" @@ -19153,14 +19234,14 @@ "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" }, "react-native": { - "version": "0.60.4", - "resolved": "https://registry.npmjs.org/react-native/-/react-native-0.60.4.tgz", - "integrity": "sha512-WE41lbGQjnzM9srIFtMDtMJkQAvk95iZwuFvAxl68s80bkYa7Ou9sGFHpeYIV6cY8yHtheCSo5q6YMxhdfkdOw==", + "version": "0.60.5", + "resolved": "https://registry.npmjs.org/react-native/-/react-native-0.60.5.tgz", + "integrity": "sha512-cZwI0XzzihACN+7an1Dy46A83FRaAe2Xyd7laCalFFAppZIYeMVphZQWrVljJk5kIZBNtYG35TY1VsghQ0Oc2Q==", "requires": { "@babel/runtime": "^7.0.0", - "@react-native-community/cli": "^2.0.1", - "@react-native-community/cli-platform-android": "^2.0.1", - "@react-native-community/cli-platform-ios": "^2.0.1", + "@react-native-community/cli": "^2.6.0", + "@react-native-community/cli-platform-android": "^2.6.0", + "@react-native-community/cli-platform-ios": "^2.4.1", "abort-controller": "^3.0.0", "art": "^0.10.0", "base64-js": "^1.1.2", @@ -19187,51 +19268,6 @@ "whatwg-fetch": "^3.0.0" }, "dependencies": { - "@react-native-community/cli": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/@react-native-community/cli/-/cli-2.7.1.tgz", - "integrity": "sha512-k/MQUqNt5FJFQ5J+syRWAmnR0Sdh+LnSsMqIq77GGj/B0sc7abNrZbycvlHzpaoOMXUbVg6Q/ePhpT2J031kUw==", - "requires": { - "@hapi/joi": "^15.0.3", - "@react-native-community/cli-platform-android": "^2.7.0", - "@react-native-community/cli-platform-ios": "^2.7.0", - "@react-native-community/cli-tools": "^2.7.0", - "chalk": "^2.4.2", - "commander": "^2.19.0", - "compression": "^1.7.1", - "connect": "^3.6.5", - "cosmiconfig": "^5.1.0", - "deepmerge": "^3.2.0", - "envinfo": "^7.1.0", - "errorhandler": "^1.5.0", - "execa": "^1.0.0", - "fs-extra": "^7.0.1", - "glob": "^7.1.1", - "graceful-fs": "^4.1.3", - "inquirer": "^3.0.6", - "lodash": "^4.17.5", - "metro": "^0.54.1", - "metro-config": "^0.54.1", - "metro-core": "^0.54.1", - "metro-react-native-babel-transformer": "^0.54.1", - "minimist": "^1.2.0", - "mkdirp": "^0.5.1", - "morgan": "^1.9.0", - "node-notifier": "^5.2.1", - "open": "^6.2.0", - "ora": "^3.4.0", - "plist": "^3.0.0", - "semver": "^5.0.3", - "serve-static": "^1.13.1", - "shell-quote": "1.6.1", - "ws": "^1.1.0" - } - }, - "deepmerge": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-3.3.0.tgz", - "integrity": "sha512-GRQOafGHwMHpjPx9iCvTgpu9NojZ49q794EEL94JVEw6VaeA8XTUyBKvAkOOjBX9oJNiV6G3P+T+tihFjo2TqA==" - }, "fbjs": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-1.0.0.tgz", @@ -19731,18 +19767,18 @@ } }, "read-cmd-shim": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz", - "integrity": "sha1-LV0Vd4ajfAVdIgd8MsU/gynpHHs=", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-1.0.3.tgz", + "integrity": "sha512-HUHb2imlZ8xBJjiZZRx0Ag9JfZ3jxQRfORMQXWCDeHE6PCCnpQrMq6LhyNqEPnMXhMDDIyq/BK7pBbhNy9zDDA==", "dev": true, "requires": { "graceful-fs": "^4.1.2" } }, "read-package-json": { - "version": "2.0.13", - "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.13.tgz", - "integrity": "sha512-/1dZ7TRZvGrYqE0UAfN6qQb5GYBsNcqS1C0tNK601CFOJmtHI7NIGXwetEPU/OtoFHZL3hDxm4rolFFVE9Bnmg==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.0.tgz", + "integrity": "sha512-KLhu8M1ZZNkMcrq1+0UJbR8Dii8KZUqB0Sha4mOx/bknfKI/fyrQVrG/YIt2UOtG667sD8+ee4EXMM91W9dC+A==", "dev": true, "requires": { "glob": "^7.1.1", diff --git a/client/package.json b/client/package.json index 74406391e6..af4c0ca99e 100644 --- a/client/package.json +++ b/client/package.json @@ -39,7 +39,7 @@ "lerna-update-wizard": "^0.16.0", "linkify-it": "^2.1.0", "lottie-ios": "^3.0.3", - "lottie-react-native": "^3.0.4", + "lottie-react-native": "^3.1.0", "markdown-it": "^8.4.2", "mobx": "^5.10.0", "mobx-react": "^5.4.3", @@ -51,13 +51,13 @@ "object-hash": "^1.3.0", "parcel-bundler": "^1.12.3", "protobufjs": "^6.8.8", - "react": "16.8.3", + "react": "16.8.6", "react-chartjs-2": "^2.7.6", "react-dom": "16.4.2", "react-i18next": "^9.0.10", "react-leaflet": "^2.4.0", "react-leaflet-heatmap-layer": "^2.0.0", - "react-native": "^0.60.4", + "react-native": "0.60.5", "react-native-actionsheet": "^2.4.2", "react-native-camera": "^2.11.1", "react-native-collapsible": "^1.3.0", diff --git a/client/packages/component/package-lock.json b/client/packages/component/package-lock.json index 998999a3d6..731a6febd6 100644 --- a/client/packages/component/package-lock.json +++ b/client/packages/component/package-lock.json @@ -4,16 +4,6 @@ "lockfileVersion": 1, "requires": true, "dependencies": { - "async-mutex": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/async-mutex/-/async-mutex-0.1.3.tgz", - "integrity": "sha1-Cq0hEjaXlas/F+M3RFVtLs9UdWY=" - }, - "initials": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/initials/-/initials-2.1.5.tgz", - "integrity": "sha1-NsyWyZhtgOEuPTTazZ+q+9g1dGI=" - }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -58,14 +48,6 @@ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz", "integrity": "sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==" }, - "react-native-user-avatar": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/react-native-user-avatar/-/react-native-user-avatar-1.0.4.tgz", - "integrity": "sha512-tP/oNsDSQy3e16arJC/neP4laG5t6enwwYZUnYnuSeUl/Z40kkjRRf+ZVo1LCTT3cC7zez8YLWCZcpRrdnAiKA==", - "requires": { - "initials": "^2.1.5" - } - }, "scheduler": { "version": "0.13.6", "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.13.6.tgz",