From 08826d4aa4096c6751ccb48f56b2a3e391f28a36 Mon Sep 17 00:00:00 2001 From: Eric Kirkham Date: Wed, 4 Oct 2017 13:17:08 -0700 Subject: [PATCH] for #1338. enable reCAPTCHA auth flow --- ios/Podfile.lock | 4 ++-- ios/TinyRobot.xcodeproj/project.pbxproj | 6 +++--- ios/TinyRobot/Info.plist | 11 +++++++++++ .../xcshareddata/xcschemes/tinyrobotStaging.xcscheme | 2 ++ ios/tinyrobotStaging-Info.plist | 11 +++++++++++ package.json | 2 +- yarn.lock | 6 +++--- 7 files changed, 33 insertions(+), 9 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 790c6eaad..9c4e1f265 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -77,7 +77,7 @@ PODS: - RNBackgroundGeolocation (2.9.3): - CocoaLumberjack (~> 3.0) - React - - RNFirebase (3.0.0-alpha.5): + - RNFirebase (3.0.0): - React - RNXMPP (0.5.11): - React @@ -315,7 +315,7 @@ SPEC CHECKSUMS: react-native-mixpanel: bdb451e8455940a12fdd157c2146a68c5f80310d RNBackgroundFetch: 9d0b2e9640d4cb591892cb359838b0cb6210aebf RNBackgroundGeolocation: b918262fe67098c0ceb1340b9e93cc3dbae310c0 - RNFirebase: 60be8c01b94551a12e7be5431189e8ee8cefcdd3 + RNFirebase: 2ceda3aef595ea1379bf5bfcc1cd9ee7d6c05d3b RNXMPP: 9e4bd3a971b0d3df9900fe2a33180058cb390410 RSKImageCropper: 356e36fc58c57c371b5d8b23d603936d6a73df6c XMPPFramework: 33711972bcf3afd661b1f85e963d876bce869fbc diff --git a/ios/TinyRobot.xcodeproj/project.pbxproj b/ios/TinyRobot.xcodeproj/project.pbxproj index ad773a4e0..b1578f258 100644 --- a/ios/TinyRobot.xcodeproj/project.pbxproj +++ b/ios/TinyRobot.xcodeproj/project.pbxproj @@ -2077,7 +2077,7 @@ "${PODS_ROOT}/Mixpanel/Mixpanel/MPTakeoverNotificationViewController~ipad.xib", "${PODS_ROOT}/Mixpanel/Mixpanel/MPTakeoverNotificationViewController~iphonelandscape.xib", "${PODS_ROOT}/Mixpanel/Mixpanel/MPTakeoverNotificationViewController~iphoneportrait.xib", - "$PODS_CONFIGURATION_BUILD_DIR/QBImagePickerController/QBImagePicker.bundle", + $PODS_CONFIGURATION_BUILD_DIR/QBImagePickerController/QBImagePicker.bundle, "${PODS_ROOT}/RSKImageCropper/RSKImageCropper/RSKImageCropperStrings.bundle", "${PODS_ROOT}/XMPPFramework/Extensions/Roster/CoreDataStorage/XMPPRoster.xcdatamodel", "${PODS_ROOT}/XMPPFramework/Extensions/XEP-0045/CoreDataStorage/XMPPRoom.xcdatamodeld", @@ -2175,7 +2175,7 @@ "${PODS_ROOT}/Mixpanel/Mixpanel/MPTakeoverNotificationViewController~ipad.xib", "${PODS_ROOT}/Mixpanel/Mixpanel/MPTakeoverNotificationViewController~iphonelandscape.xib", "${PODS_ROOT}/Mixpanel/Mixpanel/MPTakeoverNotificationViewController~iphoneportrait.xib", - "$PODS_CONFIGURATION_BUILD_DIR/QBImagePickerController/QBImagePicker.bundle", + $PODS_CONFIGURATION_BUILD_DIR/QBImagePickerController/QBImagePicker.bundle, "${PODS_ROOT}/RSKImageCropper/RSKImageCropper/RSKImageCropperStrings.bundle", "${PODS_ROOT}/XMPPFramework/Extensions/Roster/CoreDataStorage/XMPPRoster.xcdatamodel", "${PODS_ROOT}/XMPPFramework/Extensions/XEP-0045/CoreDataStorage/XMPPRoom.xcdatamodeld", @@ -2236,7 +2236,7 @@ "${PODS_ROOT}/Mixpanel/Mixpanel/MPTakeoverNotificationViewController~ipad.xib", "${PODS_ROOT}/Mixpanel/Mixpanel/MPTakeoverNotificationViewController~iphonelandscape.xib", "${PODS_ROOT}/Mixpanel/Mixpanel/MPTakeoverNotificationViewController~iphoneportrait.xib", - "$PODS_CONFIGURATION_BUILD_DIR/QBImagePickerController/QBImagePicker.bundle", + $PODS_CONFIGURATION_BUILD_DIR/QBImagePickerController/QBImagePicker.bundle, "${PODS_ROOT}/RSKImageCropper/RSKImageCropper/RSKImageCropperStrings.bundle", "${PODS_ROOT}/XMPPFramework/Extensions/Roster/CoreDataStorage/XMPPRoster.xcdatamodel", "${PODS_ROOT}/XMPPFramework/Extensions/XEP-0045/CoreDataStorage/XMPPRoom.xcdatamodeld", diff --git a/ios/TinyRobot/Info.plist b/ios/TinyRobot/Info.plist index 3ddb97c23..c009c7ead 100644 --- a/ios/TinyRobot/Info.plist +++ b/ios/TinyRobot/Info.plist @@ -18,6 +18,17 @@ 1.50.2 CFBundleSignature ???? + CFBundleURLTypes + + + CFBundleTypeRole + Editor + CFBundleURLSchemes + + com.googleusercontent.apps.548019610697-m2bscumisrho0h8t1rjid4sh0l03oj86 + + + CFBundleVersion 16 Fabric diff --git a/ios/tinyrobot.xcodeproj/xcshareddata/xcschemes/tinyrobotStaging.xcscheme b/ios/tinyrobot.xcodeproj/xcshareddata/xcschemes/tinyrobotStaging.xcscheme index 770b2d03c..c4ddb380d 100644 --- a/ios/tinyrobot.xcodeproj/xcshareddata/xcschemes/tinyrobotStaging.xcscheme +++ b/ios/tinyrobot.xcodeproj/xcshareddata/xcschemes/tinyrobotStaging.xcscheme @@ -40,6 +40,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + language = "" shouldUseLaunchSchemeArgsEnv = "YES"> @@ -59,6 +60,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/ios/tinyrobotStaging-Info.plist b/ios/tinyrobotStaging-Info.plist index e16efc7c7..876e8c23a 100644 --- a/ios/tinyrobotStaging-Info.plist +++ b/ios/tinyrobotStaging-Info.plist @@ -20,6 +20,17 @@ 1.50.2 CFBundleSignature ???? + CFBundleURLTypes + + + CFBundleTypeRole + Editor + CFBundleURLSchemes + + com.googleusercontent.apps.548019610697-uhugcd91bvgpbbui93s57m14j97amt78 + + + CFBundleVersion 16 Fabric diff --git a/package.json b/package.json index 68d56128d..b48322ea2 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "react-native-cube-transition": "github:hippware/react-native-cube-transition#1e473754642763b9d8396c9bd463ed454c447dd7", "react-native-device-info": "^0.9.7", "react-native-fabric-digits": "^1.0.26", - "react-native-firebase": "^3.0.0-alpha.2", + "react-native-firebase": "^3.0.0", "react-native-fs": "^2.1.0-rc.1", "react-native-image-crop-picker": "^0.14.4", "react-native-invertible-flat-list": "^1.1.0", diff --git a/yarn.lock b/yarn.lock index 2362dbdb8..1289c0057 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5034,9 +5034,9 @@ react-native-fabric-digits@^1.0.26: version "1.0.28" resolved "https://registry.yarnpkg.com/react-native-fabric-digits/-/react-native-fabric-digits-1.0.28.tgz#7ee3d866ca1c318bfa4b90f5bfe9794b6cf0306f" -react-native-firebase@^3.0.0-alpha.2: - version "3.0.0-alpha.5" - resolved "https://registry.yarnpkg.com/react-native-firebase/-/react-native-firebase-3.0.0-alpha.5.tgz#a746bc2efd420c238f829c15b966449f022793ae" +react-native-firebase@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/react-native-firebase/-/react-native-firebase-3.0.0.tgz#f98dbe77530107e3ff1bf29c427db5016a515b9a" dependencies: bows "^1.6.0" prop-types "^15.5.10"