Commit 51260fac authored by 消失的旅人's avatar 消失的旅人

Merge branch 'upstream/master'

parents 0021bb10 00783a11
......@@ -46,7 +46,7 @@ In XCode, in the project navigator:
In XCode, in the project navigator, select your project.
- Add the `libRNDeviceInfo.a` from the _deviceinfo_ project to your project's _Build Phases ➜ Link Binary With Libraries_
- Click `.xcodeproj` file you added before in the project navigator and go the _Build Settings_ tab. Make sure _All_ is toggled on (instead of _Basic_).
- Look for _Header Search Paths_ and make sure it contains both `$(SRCROOT)/../react-native/React` and `$(SRCROOT)/../../React`
- Look for _Header Search Paths_ and make sure it contains both `$(SRCROOT)/../react-native/React` and `$(SRCROOT)/../../React`
- Mark both as recursive (should be OK by default).
Run your project (Cmd+R)
......@@ -55,6 +55,25 @@ Run your project (Cmd+R)
### Android
- in `android/app/build.gradle`:
```diff
dependencies {
...
compile "com.facebook.react:react-native:+" // From node_modules
+ compile project(':react-native-device-info')
}
```
- in `android/settings.gradle`:
```diff
...
include ':app'
+ include ':react-native-device-info'
+ project(':react-native-device-info').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-device-info/android')
```
#### With React Native 0.29+
- in `MainApplication.java`:
......@@ -72,7 +91,7 @@ Run your project (Cmd+R)
new MainReactPackage()
);
}
......
}
```
......
......@@ -157,7 +157,6 @@ RCT_EXPORT_MODULE()
{
UIDevice *currentDevice = [UIDevice currentDevice];
NSUUID *identifierForVendor = [currentDevice identifierForVendor];
NSString *uniqueId = [DeviceUID uid];
return @{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment