Fixing iPhone build issue

This commit is contained in:
John Lyon-Smith
2018-04-27 20:04:30 -07:00
parent f64c48fba6
commit a3f96bbb6c
4 changed files with 40 additions and 32 deletions

View File

@@ -204,6 +204,7 @@
"${BUILT_PRODUCTS_DIR}/GoogleToolboxForMac/GoogleToolboxForMac.framework", "${BUILT_PRODUCTS_DIR}/GoogleToolboxForMac/GoogleToolboxForMac.framework",
"${BUILT_PRODUCTS_DIR}/React/React.framework", "${BUILT_PRODUCTS_DIR}/React/React.framework",
"${PODS_ROOT}/../../node_modules/react-viro/ios/dist/ViroRenderer/ViroKit.framework", "${PODS_ROOT}/../../node_modules/react-viro/ios/dist/ViroRenderer/ViroKit.framework",
"${BUILT_PRODUCTS_DIR}/react-native-image-picker/react_native_image_picker.framework",
"${BUILT_PRODUCTS_DIR}/react-native-maps/react_native_maps.framework", "${BUILT_PRODUCTS_DIR}/react-native-maps/react_native_maps.framework",
"${BUILT_PRODUCTS_DIR}/yoga/yoga.framework", "${BUILT_PRODUCTS_DIR}/yoga/yoga.framework",
); );
@@ -218,6 +219,7 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleToolboxForMac.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleToolboxForMac.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/React.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/React.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ViroKit.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ViroKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/react_native_image_picker.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/react_native_maps.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/react_native_maps.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/yoga.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/yoga.framework",
); );

View File

@@ -33,6 +33,8 @@ target 'DeightonAR' do
pod 'ViroReact', :path => '../node_modules/react-viro/ios/' pod 'ViroReact', :path => '../node_modules/react-viro/ios/'
pod 'ViroKit', :path => '../node_modules/react-viro/ios/dist/ViroRenderer/' pod 'ViroKit', :path => '../node_modules/react-viro/ios/dist/ViroRenderer/'
pod 'react-native-image-picker', :path => '../node_modules/react-native-image-picker'
end end
pre_install do |installer| pre_install do |installer|

View File

@@ -31,42 +31,42 @@ PODS:
- GVRSDK (1.120.0): - GVRSDK (1.120.0):
- GoogleToolboxForMac/Logger (= 2.1.0) - GoogleToolboxForMac/Logger (= 2.1.0)
- GTMSessionFetcher/Core (= 1.1.6) - GTMSessionFetcher/Core (= 1.1.6)
- React (0.51.1): - React (0.49.5):
- React/Core (= 0.51.1) - React/Core (= 0.49.5)
- react-native-image-picker (0.14.3):
- React
- react-native-maps (0.20.1): - react-native-maps (0.20.1):
- React - React
- React/Core (0.51.1): - React/Core (0.49.5):
- yoga (= 0.51.1.React) - yoga (= 0.49.5.React)
- React/CxxBridge (0.51.1): - React/CxxBridge (0.49.5):
- Folly (= 2016.09.26.00) - Folly (= 2016.09.26.00)
- React/Core - React/Core
- React/cxxreact - React/cxxreact
- React/cxxreact (0.51.1): - React/cxxreact (0.49.5):
- boost - boost
- Folly (= 2016.09.26.00) - Folly (= 2016.09.26.00)
- React/jschelpers - React/jschelpers
- React/DevSupport (0.51.1): - React/DevSupport (0.49.5):
- React/Core - React/Core
- React/RCTWebSocket - React/RCTWebSocket
- React/fishhook (0.51.1) - React/fishhook (0.49.5)
- React/jschelpers (0.51.1): - React/jschelpers (0.49.5):
- Folly (= 2016.09.26.00) - Folly (= 2016.09.26.00)
- React/PrivateDatabase - React/RCTAnimation (0.49.5):
- React/PrivateDatabase (0.51.1)
- React/RCTAnimation (0.51.1):
- React/Core - React/Core
- React/RCTBlob (0.51.1): - React/RCTBlob (0.49.5):
- React/Core - React/Core
- React/RCTGeolocation (0.51.1): - React/RCTGeolocation (0.49.5):
- React/Core - React/Core
- React/RCTImage (0.51.1): - React/RCTImage (0.49.5):
- React/Core - React/Core
- React/RCTNetwork - React/RCTNetwork
- React/RCTNetwork (0.51.1): - React/RCTNetwork (0.49.5):
- React/Core - React/Core
- React/RCTText (0.51.1): - React/RCTText (0.49.5):
- React/Core - React/Core
- React/RCTWebSocket (0.51.1): - React/RCTWebSocket (0.49.5):
- React/Core - React/Core
- React/fishhook - React/fishhook
- React/RCTBlob - React/RCTBlob
@@ -75,12 +75,13 @@ PODS:
- GVRAudioSDK (= 1.120.0) - GVRAudioSDK (= 1.120.0)
- GVRSDK (= 1.120.0) - GVRSDK (= 1.120.0)
- ViroReact (1.0) - ViroReact (1.0)
- yoga (0.51.1.React) - yoga (0.49.5.React)
DEPENDENCIES: DEPENDENCIES:
- DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
- Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`) - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`)
- GLog (from `../node_modules/react-native/third-party-podspecs/GLog.podspec`) - GLog (from `../node_modules/react-native/third-party-podspecs/GLog.podspec`)
- react-native-image-picker (from `../node_modules/react-native-image-picker`)
- react-native-maps (from `../node_modules/react-native-maps`) - react-native-maps (from `../node_modules/react-native-maps`)
- React/Core (from `../node_modules/react-native`) - React/Core (from `../node_modules/react-native`)
- React/CxxBridge (from `../node_modules/react-native`) - React/CxxBridge (from `../node_modules/react-native`)
@@ -114,6 +115,8 @@ EXTERNAL SOURCES:
:podspec: "../node_modules/react-native/third-party-podspecs/GLog.podspec" :podspec: "../node_modules/react-native/third-party-podspecs/GLog.podspec"
React: React:
:path: "../node_modules/react-native" :path: "../node_modules/react-native"
react-native-image-picker:
:path: "../node_modules/react-native-image-picker"
react-native-maps: react-native-maps:
:path: "../node_modules/react-native-maps" :path: "../node_modules/react-native-maps"
ViroKit: ViroKit:
@@ -134,12 +137,13 @@ SPEC CHECKSUMS:
GTMSessionFetcher: 6aacd0ab48ddf0c3633ab2642d792abfcad1b08a GTMSessionFetcher: 6aacd0ab48ddf0c3633ab2642d792abfcad1b08a
GVRAudioSDK: 302f0a8f190d855868ea07f246ce4f9b44c392ae GVRAudioSDK: 302f0a8f190d855868ea07f246ce4f9b44c392ae
GVRSDK: 0cb9d0ce06a84d698e61e3db9509766022dcf815 GVRSDK: 0cb9d0ce06a84d698e61e3db9509766022dcf815
React: 541ba768b9855e10cdc76f55427a5cd0653ca806 React: bfd693e2d08a61bf1dc056bba3f5c01a13a3cc31
react-native-image-picker: 42cfe2c8435d893414f8714a81e480313cb1412b
react-native-maps: 066c2afcc89e18726377bcc685315f989ca22449 react-native-maps: 066c2afcc89e18726377bcc685315f989ca22449
ViroKit: 9631f301ef6a3f56116b23d6aac5d5c2307aa368 ViroKit: 9631f301ef6a3f56116b23d6aac5d5c2307aa368
ViroReact: 5520f26ac4654e361786c82da3b29ce0402c3c00 ViroReact: 5520f26ac4654e361786c82da3b29ce0402c3c00
yoga: 17521bbb0dd54a47c0b3ac43253e78cdac7488e0 yoga: 17521bbb0dd54a47c0b3ac43253e78cdac7488e0
PODFILE CHECKSUM: 1de520fb7d323b83502ffda9c5bf993f7545cfa9 PODFILE CHECKSUM: 6a4957d8115688cbb9e33db130bb6936259d12be
COCOAPODS: 1.5.0.beta.1 COCOAPODS: 1.5.0.beta.1

View File

@@ -7,25 +7,25 @@ export const config = {
googleGeocodeAPIKey: "AIzaSyCs4JVT6gysnY5dAJ7KjVJYeykLv_xz1GI", googleGeocodeAPIKey: "AIzaSyCs4JVT6gysnY5dAJ7KjVJYeykLv_xz1GI",
googleGeocodeURL: "https://maps.googleapis.com/maps/api/geocode/json", googleGeocodeURL: "https://maps.googleapis.com/maps/api/geocode/json",
refererURL: "https://dar.kss.us.com", refererURL: "https://dar.kss.us.com",
defaultUser: "john@lyon-smith.org", //defaultUser: "john@lyon-smith.org",
//defaultUser: "", defaultUser: "",
minGPSAccuracy: 100, minGPSAccuracy: 100,
//minGPSAccuracy: 20, //minGPSAccuracy: 20,
minDistanceToItem: 10, minDistanceToItem: 10,
geocodeDelayMilliseconds: 500, geocodeDelayMilliseconds: 500,
// This region is downtown Toronto // This region is downtown Toronto
// initialRegion: {
// latitude: 43.653908,
// longitude: -79.384293,
// latitudeDelta: 0.0922,
// longitudeDelta: 0.0421,
// },
// This region is Bainbridge Island
initialRegion: { initialRegion: {
latitude: 47.629536, latitude: 43.653908,
longitude: -122.524162, longitude: -79.384293,
latitudeDelta: 0.0922, latitudeDelta: 0.0922,
longitudeDelta: 0.0421, longitudeDelta: 0.0421,
}, },
// This region is Bainbridge Island
// initialRegion: {
// latitude: 47.629536,
// longitude: -122.524162,
// latitudeDelta: 0.0922,
// longitudeDelta: 0.0421,
// },
alwaysShowWorkItemInAR: true, alwaysShowWorkItemInAR: true,
} }