diff --git a/mobile/android/app/app.iml b/mobile/android/app/app.iml index 31c52f7..806d427 100644 --- a/mobile/android/app/app.iml +++ b/mobile/android/app/app.iml @@ -98,6 +98,7 @@ + @@ -107,6 +108,7 @@ + diff --git a/mobile/android/build.gradle b/mobile/android/build.gradle index 3cdc9bb..e0d0df7 100644 --- a/mobile/android/build.gradle +++ b/mobile/android/build.gradle @@ -27,7 +27,7 @@ ext { compileSdkVersion = 27 targetSdkVersion = 27 minSdkVersion = 24 - buildToolsVersion = "27.0.1" + buildToolsVersion = "26.0.2" supportLibVersion = "25.3.1" googlePlayServicesVersion = "11.8.0" androidMapsUtilsVersion = "0.5+" diff --git a/mobile/ios/DeightonAR.xcodeproj/project.pbxproj b/mobile/ios/DeightonAR.xcodeproj/project.pbxproj index 18165b8..04e9bc8 100644 --- a/mobile/ios/DeightonAR.xcodeproj/project.pbxproj +++ b/mobile/ios/DeightonAR.xcodeproj/project.pbxproj @@ -976,20 +976,10 @@ ); inputPaths = ( "${SRCROOT}/Pods/Target Support Files/Pods-DeightonAR/Pods-DeightonAR-resources.sh", - "${PODS_ROOT}/GVRSDK/Resources/CardboardSDK.bundle", - "${PODS_ROOT}/GVRSDK/Resources/GoogleKitCore.bundle", - "${PODS_ROOT}/GVRSDK/Resources/GoogleKitDialogs.bundle", - "${PODS_ROOT}/GVRSDK/Resources/GoogleKitHUD.bundle", - "${PODS_ROOT}/GVRSDK/Resources/MaterialRobotoFontLoader.bundle", "${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CardboardSDK.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleKitCore.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleKitDialogs.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleKitHUD.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MaterialRobotoFontLoader.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleMaps.bundle", ); runOnlyForDeploymentPostprocessing = 0; diff --git a/mobile/ios/DeightonAR/AppDelegate.m b/mobile/ios/DeightonAR/AppDelegate.m index a26b6ce..9931411 100644 --- a/mobile/ios/DeightonAR/AppDelegate.m +++ b/mobile/ios/DeightonAR/AppDelegate.m @@ -9,7 +9,7 @@ #import "AppDelegate.h" -#import +//#import #import #import @@ -22,12 +22,12 @@ { NSURL *jsCodeLocation; #ifdef DEBUG - VRTBundleURLProvider *bundleProvider = [[VRTBundleURLProvider alloc] init]; - jsCodeLocation = [bundleProvider jsBundleURLForBundleRoot:@"index" fallbackResource:nil]; - - if (jsCodeLocation == nil) { +// VRTBundleURLProvider *bundleProvider = [[VRTBundleURLProvider alloc] init]; +// jsCodeLocation = [bundleProvider jsBundleURLForBundleRoot:@"index" fallbackResource:nil]; +// +// if (jsCodeLocation == nil) { jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil]; - } +// } #else jsCodeLocation = [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"]; #endif diff --git a/mobile/ios/Podfile b/mobile/ios/Podfile index 327aeaf..0901201 100644 --- a/mobile/ios/Podfile +++ b/mobile/ios/Podfile @@ -31,16 +31,16 @@ target 'DeightonAR' do pod 'react-native-maps', path: '../node_modules/react-native-maps' pod 'react-native-google-maps', path: '../node_modules/react-native-maps' pod 'GoogleMaps' - - pod 'ViroReact', :path => '../node_modules/react-viro/ios/' - pod 'ViroKit', :path => '../node_modules/react-viro/ios/dist/ViroRenderer/' -end - -pre_install do |installer| - # workaround for https://github.com/CocoaPods/CocoaPods/issues/3289 - Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {} + # + # pod 'ViroReact', :path => '../node_modules/react-viro/ios/' + # pod 'ViroKit', :path => '../node_modules/react-viro/ios/dist/ViroRenderer/' end +# pre_install do |installer| +# # workaround for https://github.com/CocoaPods/CocoaPods/issues/3289 +# Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {} +# end +# post_install do |installer| installer.pods_project.targets.each do |target| if target.name == 'yoga' diff --git a/mobile/ios/Podfile.lock b/mobile/ios/Podfile.lock index 4712b32..1e04628 100644 --- a/mobile/ios/Podfile.lock +++ b/mobile/ios/Podfile.lock @@ -1,7 +1,4 @@ PODS: - - AWSCore (2.6.13) - - AWSDynamoDB (2.6.13): - - AWSCore (= 2.6.13) - boost (1.59.0): - boost/graph-includes (= 1.59.0) - boost/math-includes (= 1.59.0) @@ -28,14 +25,6 @@ PODS: - GoogleMaps/Base (2.5.0) - GoogleMaps/Maps (2.5.0): - GoogleMaps/Base - - GoogleToolboxForMac/Defines (2.1.0) - - GoogleToolboxForMac/Logger (2.1.0): - - GoogleToolboxForMac/Defines (= 2.1.0) - - GTMSessionFetcher/Core (1.1.6) - - GVRAudioSDK (1.120.0) - - GVRSDK (1.120.0): - - GoogleToolboxForMac/Logger (= 2.1.0) - - GTMSessionFetcher/Core (= 1.1.6) - React (0.51.1): - React/Core (= 0.51.1) - react-native-google-maps (0.20.1): @@ -80,11 +69,6 @@ PODS: - React/RCTBlob - ReactNativeNavigation (1.1.407): - React - - ViroKit (1.0): - - AWSDynamoDB (~> 2.6.7) - - GVRAudioSDK (= 1.120.0) - - GVRSDK (= 1.120.0) - - ViroReact (1.0) - yoga (0.51.1.React) DEPENDENCIES: @@ -104,8 +88,6 @@ DEPENDENCIES: - React/RCTText (from `../node_modules/react-native`) - React/RCTWebSocket (from `../node_modules/react-native`) - ReactNativeNavigation (from `../node_modules/react-native-navigation/ios/ReactNativeNavigation.podspec`) - - ViroKit (from `../node_modules/react-viro/ios/dist/ViroRenderer/`) - - ViroReact (from `../node_modules/react-viro/ios/`) - yoga (from `../node_modules/react-native/ReactCommon/yoga`) EXTERNAL SOURCES: @@ -123,33 +105,21 @@ EXTERNAL SOURCES: :path: ../node_modules/react-native-maps ReactNativeNavigation: :podspec: ../node_modules/react-native-navigation/ios/ReactNativeNavigation.podspec - ViroKit: - :path: ../node_modules/react-viro/ios/dist/ViroRenderer/ - ViroReact: - :path: ../node_modules/react-viro/ios/ yoga: :path: ../node_modules/react-native/ReactCommon/yoga SPEC CHECKSUMS: - AWSCore: 5da797bc476188fdaf00dec134fa18d84708eca9 - AWSDynamoDB: 36abff7ce93fcadad2c4dc6f729d8716c933adf2 boost: 30a15ffb6d9aa4646dd3caffc960753f4cb4ca4e DoubleConversion: ebb6747c5b66026ad4f97b789c3ceac6f18e57a6 Folly: b7255b29f1d693c375d642d0f04f0592181156d9 GLog: 3e4e4ae9746ce6bf6e9420c7fc1e08ad59c8ba1a GoogleMaps: c087b8e5dfe87ca6ebf59adb9b4894a4146bec4f - GoogleToolboxForMac: 2b2596cbb7186865e98cadf2b1e262d851c2b168 - GTMSessionFetcher: 6aacd0ab48ddf0c3633ab2642d792abfcad1b08a - GVRAudioSDK: 302f0a8f190d855868ea07f246ce4f9b44c392ae - GVRSDK: 0cb9d0ce06a84d698e61e3db9509766022dcf815 React: 541ba768b9855e10cdc76f55427a5cd0653ca806 react-native-google-maps: 963fc78a5ac32dad3a726e4fa08b5307faa5cab2 react-native-maps: 066c2afcc89e18726377bcc685315f989ca22449 ReactNativeNavigation: 0a0de59d82ed1accc9b762037752b11d794c7a4c - ViroKit: 9631f301ef6a3f56116b23d6aac5d5c2307aa368 - ViroReact: 5520f26ac4654e361786c82da3b29ce0402c3c00 yoga: 17521bbb0dd54a47c0b3ac43253e78cdac7488e0 -PODFILE CHECKSUM: 878f4f72afe6d192d823db4f9921e6514714fe82 +PODFILE CHECKSUM: b54887d0ae243cb85ba0ecb910765421010b1d1d COCOAPODS: 1.4.0 diff --git a/mobile/package-lock.json b/mobile/package-lock.json index 47551a3..79e581c 100644 --- a/mobile/package-lock.json +++ b/mobile/package-lock.json @@ -9398,6 +9398,12 @@ } } }, + "react-native-navigation": { + "version": "github:jlyonsmith/react-native-navigation#7c5bd295da8c28a27af7b1fc35d50512f2441d86", + "requires": { + "lodash": "4.17.5" + } + }, "react-proxy": { "version": "1.1.8", "resolved": "https://registry.npmjs.org/react-proxy/-/react-proxy-1.1.8.tgz",