Fix gradle error
This commit is contained in:
@@ -98,6 +98,7 @@
|
|||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
|
||||||
@@ -107,6 +108,7 @@
|
|||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
|
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
|
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
|
||||||
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
|
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ ext {
|
|||||||
compileSdkVersion = 27
|
compileSdkVersion = 27
|
||||||
targetSdkVersion = 27
|
targetSdkVersion = 27
|
||||||
minSdkVersion = 24
|
minSdkVersion = 24
|
||||||
buildToolsVersion = "27.0.1"
|
buildToolsVersion = "26.0.2"
|
||||||
supportLibVersion = "25.3.1"
|
supportLibVersion = "25.3.1"
|
||||||
googlePlayServicesVersion = "11.8.0"
|
googlePlayServicesVersion = "11.8.0"
|
||||||
androidMapsUtilsVersion = "0.5+"
|
androidMapsUtilsVersion = "0.5+"
|
||||||
|
|||||||
@@ -976,20 +976,10 @@
|
|||||||
);
|
);
|
||||||
inputPaths = (
|
inputPaths = (
|
||||||
"${SRCROOT}/Pods/Target Support Files/Pods-DeightonAR/Pods-DeightonAR-resources.sh",
|
"${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",
|
"${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle",
|
||||||
);
|
);
|
||||||
name = "[CP] Copy Pods Resources";
|
name = "[CP] Copy Pods Resources";
|
||||||
outputPaths = (
|
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",
|
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleMaps.bundle",
|
||||||
);
|
);
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
|
|
||||||
#import "AppDelegate.h"
|
#import "AppDelegate.h"
|
||||||
|
|
||||||
#import <ViroReact/VRTBundleURLProvider.h>
|
//#import <ViroReact/VRTBundleURLProvider.h>
|
||||||
#import <React/RCTBundleURLProvider.h>
|
#import <React/RCTBundleURLProvider.h>
|
||||||
#import <React/RCTRootView.h>
|
#import <React/RCTRootView.h>
|
||||||
|
|
||||||
@@ -22,12 +22,12 @@
|
|||||||
{
|
{
|
||||||
NSURL *jsCodeLocation;
|
NSURL *jsCodeLocation;
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
VRTBundleURLProvider *bundleProvider = [[VRTBundleURLProvider alloc] init];
|
// VRTBundleURLProvider *bundleProvider = [[VRTBundleURLProvider alloc] init];
|
||||||
jsCodeLocation = [bundleProvider jsBundleURLForBundleRoot:@"index" fallbackResource:nil];
|
// jsCodeLocation = [bundleProvider jsBundleURLForBundleRoot:@"index" fallbackResource:nil];
|
||||||
|
//
|
||||||
if (jsCodeLocation == nil) {
|
// if (jsCodeLocation == nil) {
|
||||||
jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];
|
jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];
|
||||||
}
|
// }
|
||||||
#else
|
#else
|
||||||
jsCodeLocation = [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
|
jsCodeLocation = [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -31,16 +31,16 @@ target 'DeightonAR' do
|
|||||||
pod 'react-native-maps', path: '../node_modules/react-native-maps'
|
pod 'react-native-maps', path: '../node_modules/react-native-maps'
|
||||||
pod 'react-native-google-maps', path: '../node_modules/react-native-maps'
|
pod 'react-native-google-maps', path: '../node_modules/react-native-maps'
|
||||||
pod 'GoogleMaps'
|
pod 'GoogleMaps'
|
||||||
|
#
|
||||||
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/'
|
||||||
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
|
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|
|
post_install do |installer|
|
||||||
installer.pods_project.targets.each do |target|
|
installer.pods_project.targets.each do |target|
|
||||||
if target.name == 'yoga'
|
if target.name == 'yoga'
|
||||||
|
|||||||
@@ -1,7 +1,4 @@
|
|||||||
PODS:
|
PODS:
|
||||||
- AWSCore (2.6.13)
|
|
||||||
- AWSDynamoDB (2.6.13):
|
|
||||||
- AWSCore (= 2.6.13)
|
|
||||||
- boost (1.59.0):
|
- boost (1.59.0):
|
||||||
- boost/graph-includes (= 1.59.0)
|
- boost/graph-includes (= 1.59.0)
|
||||||
- boost/math-includes (= 1.59.0)
|
- boost/math-includes (= 1.59.0)
|
||||||
@@ -28,14 +25,6 @@ PODS:
|
|||||||
- GoogleMaps/Base (2.5.0)
|
- GoogleMaps/Base (2.5.0)
|
||||||
- GoogleMaps/Maps (2.5.0):
|
- GoogleMaps/Maps (2.5.0):
|
||||||
- GoogleMaps/Base
|
- 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 (0.51.1):
|
||||||
- React/Core (= 0.51.1)
|
- React/Core (= 0.51.1)
|
||||||
- react-native-google-maps (0.20.1):
|
- react-native-google-maps (0.20.1):
|
||||||
@@ -80,11 +69,6 @@ PODS:
|
|||||||
- React/RCTBlob
|
- React/RCTBlob
|
||||||
- ReactNativeNavigation (1.1.407):
|
- ReactNativeNavigation (1.1.407):
|
||||||
- React
|
- React
|
||||||
- ViroKit (1.0):
|
|
||||||
- AWSDynamoDB (~> 2.6.7)
|
|
||||||
- GVRAudioSDK (= 1.120.0)
|
|
||||||
- GVRSDK (= 1.120.0)
|
|
||||||
- ViroReact (1.0)
|
|
||||||
- yoga (0.51.1.React)
|
- yoga (0.51.1.React)
|
||||||
|
|
||||||
DEPENDENCIES:
|
DEPENDENCIES:
|
||||||
@@ -104,8 +88,6 @@ DEPENDENCIES:
|
|||||||
- React/RCTText (from `../node_modules/react-native`)
|
- React/RCTText (from `../node_modules/react-native`)
|
||||||
- React/RCTWebSocket (from `../node_modules/react-native`)
|
- React/RCTWebSocket (from `../node_modules/react-native`)
|
||||||
- ReactNativeNavigation (from `../node_modules/react-native-navigation/ios/ReactNativeNavigation.podspec`)
|
- 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`)
|
- yoga (from `../node_modules/react-native/ReactCommon/yoga`)
|
||||||
|
|
||||||
EXTERNAL SOURCES:
|
EXTERNAL SOURCES:
|
||||||
@@ -123,33 +105,21 @@ EXTERNAL SOURCES:
|
|||||||
:path: ../node_modules/react-native-maps
|
:path: ../node_modules/react-native-maps
|
||||||
ReactNativeNavigation:
|
ReactNativeNavigation:
|
||||||
:podspec: ../node_modules/react-native-navigation/ios/ReactNativeNavigation.podspec
|
: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:
|
yoga:
|
||||||
:path: ../node_modules/react-native/ReactCommon/yoga
|
:path: ../node_modules/react-native/ReactCommon/yoga
|
||||||
|
|
||||||
SPEC CHECKSUMS:
|
SPEC CHECKSUMS:
|
||||||
AWSCore: 5da797bc476188fdaf00dec134fa18d84708eca9
|
|
||||||
AWSDynamoDB: 36abff7ce93fcadad2c4dc6f729d8716c933adf2
|
|
||||||
boost: 30a15ffb6d9aa4646dd3caffc960753f4cb4ca4e
|
boost: 30a15ffb6d9aa4646dd3caffc960753f4cb4ca4e
|
||||||
DoubleConversion: ebb6747c5b66026ad4f97b789c3ceac6f18e57a6
|
DoubleConversion: ebb6747c5b66026ad4f97b789c3ceac6f18e57a6
|
||||||
Folly: b7255b29f1d693c375d642d0f04f0592181156d9
|
Folly: b7255b29f1d693c375d642d0f04f0592181156d9
|
||||||
GLog: 3e4e4ae9746ce6bf6e9420c7fc1e08ad59c8ba1a
|
GLog: 3e4e4ae9746ce6bf6e9420c7fc1e08ad59c8ba1a
|
||||||
GoogleMaps: c087b8e5dfe87ca6ebf59adb9b4894a4146bec4f
|
GoogleMaps: c087b8e5dfe87ca6ebf59adb9b4894a4146bec4f
|
||||||
GoogleToolboxForMac: 2b2596cbb7186865e98cadf2b1e262d851c2b168
|
|
||||||
GTMSessionFetcher: 6aacd0ab48ddf0c3633ab2642d792abfcad1b08a
|
|
||||||
GVRAudioSDK: 302f0a8f190d855868ea07f246ce4f9b44c392ae
|
|
||||||
GVRSDK: 0cb9d0ce06a84d698e61e3db9509766022dcf815
|
|
||||||
React: 541ba768b9855e10cdc76f55427a5cd0653ca806
|
React: 541ba768b9855e10cdc76f55427a5cd0653ca806
|
||||||
react-native-google-maps: 963fc78a5ac32dad3a726e4fa08b5307faa5cab2
|
react-native-google-maps: 963fc78a5ac32dad3a726e4fa08b5307faa5cab2
|
||||||
react-native-maps: 066c2afcc89e18726377bcc685315f989ca22449
|
react-native-maps: 066c2afcc89e18726377bcc685315f989ca22449
|
||||||
ReactNativeNavigation: 0a0de59d82ed1accc9b762037752b11d794c7a4c
|
ReactNativeNavigation: 0a0de59d82ed1accc9b762037752b11d794c7a4c
|
||||||
ViroKit: 9631f301ef6a3f56116b23d6aac5d5c2307aa368
|
|
||||||
ViroReact: 5520f26ac4654e361786c82da3b29ce0402c3c00
|
|
||||||
yoga: 17521bbb0dd54a47c0b3ac43253e78cdac7488e0
|
yoga: 17521bbb0dd54a47c0b3ac43253e78cdac7488e0
|
||||||
|
|
||||||
PODFILE CHECKSUM: 878f4f72afe6d192d823db4f9921e6514714fe82
|
PODFILE CHECKSUM: b54887d0ae243cb85ba0ecb910765421010b1d1d
|
||||||
|
|
||||||
COCOAPODS: 1.4.0
|
COCOAPODS: 1.4.0
|
||||||
|
|||||||
6
mobile/package-lock.json
generated
6
mobile/package-lock.json
generated
@@ -9398,6 +9398,12 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"react-native-navigation": {
|
||||||
|
"version": "github:jlyonsmith/react-native-navigation#7c5bd295da8c28a27af7b1fc35d50512f2441d86",
|
||||||
|
"requires": {
|
||||||
|
"lodash": "4.17.5"
|
||||||
|
}
|
||||||
|
},
|
||||||
"react-proxy": {
|
"react-proxy": {
|
||||||
"version": "1.1.8",
|
"version": "1.1.8",
|
||||||
"resolved": "https://registry.npmjs.org/react-proxy/-/react-proxy-1.1.8.tgz",
|
"resolved": "https://registry.npmjs.org/react-proxy/-/react-proxy-1.1.8.tgz",
|
||||||
|
|||||||
Reference in New Issue
Block a user