Skip to content

Upgrade example proj to rn51 #2452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DanielZlotin merged 3 commits into from
Dec 31, 2017
Merged

Upgrade example proj to rn51 #2452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c23f4ba
fix images name
Dec 31, 2017
49cfd47
upgrade example project to rn51 - ios
Dec 31, 2017
e489c3a
Merge branch 'master' into upgrade_example_proj_to_rn51
DanielZlotin Dec 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
122 changes: 121 additions & 1 deletion example/ios/example.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,62 @@
remoteGlobalIDString = 83CBBA2E1A601D0E00E9B192;
remoteInfo = React;
};
26472F051FF93DB800C4F2B0 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 3DBE0D001F3B181A0099AA32;
remoteInfo = fishhook;
};
26472F071FF93DB800C4F2B0 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 3DBE0D0D1F3B181C0099AA32;
remoteInfo = "fishhook-tvOS";
};
26472F171FF93DB800C4F2B0 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 139D7ECE1E25DB7D00323FB7;
remoteInfo = "third-party";
};
26472F191FF93DB800C4F2B0 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 3D383D3C1EBD27B6005632C8;
remoteInfo = "third-party-tvOS";
};
26472F1B1FF93DB800C4F2B0 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 139D7E881E25C6D100323FB7;
remoteInfo = "double-conversion";
};
26472F1D1FF93DB800C4F2B0 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 3D383D621EBD27B9005632C8;
remoteInfo = "double-conversion-tvOS";
};
26472F1F1FF93DB800C4F2B0 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 9936F3131F5F2E4B0010BF04;
remoteInfo = privatedata;
};
26472F211FF93DB800C4F2B0 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 9936F32F1F5F2E5B0010BF04;
remoteInfo = "privatedata-tvOS";
};
2647D65D1DB175B300B23722 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 2647D6591DB175B300B23722 /* ReactNativeNavigation.xcodeproj */;
Expand Down Expand Up @@ -347,6 +403,8 @@
children = (
139FDEF41B06529B00C62182 /* libRCTWebSocket.a */,
7B9B397F1DEB4076004A6281 /* libRCTWebSocket-tvOS.a */,
26472F061FF93DB800C4F2B0 /* libfishhook.a */,
26472F081FF93DB800C4F2B0 /* libfishhook-tvOS.a */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -376,6 +434,12 @@
7BFF942D1E5F10F20054957C /* libcxxreact.a */,
7BFF942F1E5F10F20054957C /* libjschelpers.a */,
7BFF94311E5F10F20054957C /* libjschelpers.a */,
26472F181FF93DB800C4F2B0 /* libthird-party.a */,
26472F1A1FF93DB800C4F2B0 /* libthird-party.a */,
26472F1C1FF93DB800C4F2B0 /* libdouble-conversion.a */,
26472F1E1FF93DB800C4F2B0 /* libdouble-conversion.a */,
26472F201FF93DB800C4F2B0 /* libprivatedata.a */,
26472F221FF93DB800C4F2B0 /* libprivatedata-tvOS.a */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -635,6 +699,62 @@
remoteRef = 146834031AC3E56700842450 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
26472F061FF93DB800C4F2B0 /* libfishhook.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libfishhook.a;
remoteRef = 26472F051FF93DB800C4F2B0 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
26472F081FF93DB800C4F2B0 /* libfishhook-tvOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libfishhook-tvOS.a";
remoteRef = 26472F071FF93DB800C4F2B0 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
26472F181FF93DB800C4F2B0 /* libthird-party.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libthird-party.a";
remoteRef = 26472F171FF93DB800C4F2B0 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
26472F1A1FF93DB800C4F2B0 /* libthird-party.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libthird-party.a";
remoteRef = 26472F191FF93DB800C4F2B0 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
26472F1C1FF93DB800C4F2B0 /* libdouble-conversion.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libdouble-conversion.a";
remoteRef = 26472F1B1FF93DB800C4F2B0 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
26472F1E1FF93DB800C4F2B0 /* libdouble-conversion.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libdouble-conversion.a";
remoteRef = 26472F1D1FF93DB800C4F2B0 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
26472F201FF93DB800C4F2B0 /* libprivatedata.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libprivatedata.a;
remoteRef = 26472F1F1FF93DB800C4F2B0 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
26472F221FF93DB800C4F2B0 /* libprivatedata-tvOS.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = "libprivatedata-tvOS.a";
remoteRef = 26472F211FF93DB800C4F2B0 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
2647D65E1DB175B300B23722 /* libReactNativeNavigation.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
Expand Down Expand Up @@ -795,7 +915,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "export NODE_BINARY=node\n../node_modules/react-native/packager/react-native-xcode.sh";
shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh";
};
/* End PBXShellScriptBuildPhase section */

Expand Down
4 changes: 2 additions & 2 deletions example/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"e2e-release": "detox test --configuration ios.sim.release"
},
"dependencies": {
"react": "16.0.0-alpha.12",
"react-native": "0.45.1",
"react": "16.0.0",
"react-native": "0.51.0",
"react-native-animatable": "^1.1.0",
"react-native-navigation": "latest"
},
Expand Down