From bc33e958af14eefb0e95c861a81770e360407265 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Fri, 8 Sep 2017 11:33:07 -0700 Subject: [PATCH 1/4] Define minimum supported Windows version as Vista Libuv makes this default to XP if it's not explicitly set, which makes the condition variable functionality that core now uses unavailable. --- target_defaults.gypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target_defaults.gypi b/target_defaults.gypi index 6b2136e1..356564ed 100644 --- a/target_defaults.gypi +++ b/target_defaults.gypi @@ -24,7 +24,7 @@ ], "conditions": [ ["OS=='win'", { - "defines": [ "_UNICODE", "UNICODE", "WIN32=1", "_HAS_EXCEPTIONS=1", "WIN32_LEAN_AND_MEAN" ] + "defines": [ "_UNICODE", "UNICODE", "WIN32=1", "_HAS_EXCEPTIONS=1", "WIN32_LEAN_AND_MEAN", "_WIN32_WINNT=0x600" ] }], ["OS=='mac'", { "xcode_settings": { From 6c1748b62291082cc0d1bc61aaff881f1a50bc2d Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Fri, 1 Sep 2017 11:07:46 -0700 Subject: [PATCH 2/4] Add the js files to the ReactExample xcode project --- .../ReactExample.xcodeproj/project.pbxproj | 62 ++++++++++++------- 1 file changed, 40 insertions(+), 22 deletions(-) diff --git a/examples/ReactExample/ios/ReactExample.xcodeproj/project.pbxproj b/examples/ReactExample/ios/ReactExample.xcodeproj/project.pbxproj index 7be28c51..e16e57b5 100644 --- a/examples/ReactExample/ios/ReactExample.xcodeproj/project.pbxproj +++ b/examples/ReactExample/ios/ReactExample.xcodeproj/project.pbxproj @@ -21,6 +21,7 @@ 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 140ED2AC1D01E1AD002B40FF /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; }; 146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; }; + 3F2C205B1F59D921005D67C0 /* components in Resources */ = {isa = PBXBuildFile; fileRef = 3F2C20571F59D921005D67C0 /* components */; }; 5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; }; 70C063557D0D491D8F4D348F /* libRealmReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 253640AFA04D4F7C8864C95C /* libRealmReact.a */; }; 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; }; @@ -242,6 +243,10 @@ 146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native/React/React.xcodeproj"; sourceTree = ""; }; 253640AFA04D4F7C8864C95C /* libRealmReact.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRealmReact.a; sourceTree = ""; }; 3C4594A7EF1647D68ADF0ED0 /* libz.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; + 3F2C20571F59D921005D67C0 /* components */ = {isa = PBXFileReference; lastKnownFileType = folder; name = components; path = ../components; sourceTree = ""; }; + 3F2C20581F59D921005D67C0 /* index.android.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = index.android.js; path = ../index.android.js; sourceTree = ""; }; + 3F2C20591F59D921005D67C0 /* index.ios.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = index.ios.js; path = ../index.ios.js; sourceTree = ""; }; + 3F2C205A1F59D921005D67C0 /* main.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = main.js; path = ../main.js; sourceTree = ""; }; 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = ""; }; 73AD103601A44EB291AC2117 /* RealmReact.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RealmReact.xcodeproj; path = "../node_modules/realm/react-native/ios/RealmReact.xcodeproj"; sourceTree = ""; }; 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = ""; }; @@ -263,9 +268,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */, - 146834051AC3E58100842450 /* libReact.a in Frameworks */, + EF9CDEC26BA64438B1A9F856 /* libc++.tbd in Frameworks */, 00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */, + 5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */, 00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */, 00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */, 133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */, @@ -274,8 +279,8 @@ 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */, 00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */, 139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */, + 146834051AC3E58100842450 /* libReact.a in Frameworks */, 70C063557D0D491D8F4D348F /* libRealmReact.a in Frameworks */, - EF9CDEC26BA64438B1A9F856 /* libc++.tbd in Frameworks */, B06E5AD59A024665BD24C8C7 /* libz.tbd in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -302,8 +307,8 @@ 00C302BC1ABCB91800DB3ED1 /* Products */ = { isa = PBXGroup; children = ( - 00C302C01ABCB91800DB3ED1 /* libRCTImage.a */, 3DAD3E841DF850E9000B6D8A /* libRCTImage-tvOS.a */, + 00C302C01ABCB91800DB3ED1 /* libRCTImage.a */, ); name = Products; sourceTree = ""; @@ -311,8 +316,8 @@ 00C302D41ABCB9D200DB3ED1 /* Products */ = { isa = PBXGroup; children = ( - 00C302DC1ABCB9D200DB3ED1 /* libRCTNetwork.a */, 3DAD3E8C1DF850E9000B6D8A /* libRCTNetwork-tvOS.a */, + 00C302DC1ABCB9D200DB3ED1 /* libRCTNetwork.a */, ); name = Products; sourceTree = ""; @@ -328,8 +333,8 @@ 00E356EF1AD99517003FC87E /* ReactExampleTests */ = { isa = PBXGroup; children = ( - 8573DE501E23DDA700914396 /* ReactExampleTests.m */, 00E356F01AD99517003FC87E /* Supporting Files */, + 8573DE501E23DDA700914396 /* ReactExampleTests.m */, ); path = ReactExampleTests; sourceTree = ""; @@ -345,8 +350,8 @@ 139105B71AF99BAD00B5F7CC /* Products */ = { isa = PBXGroup; children = ( - 139105C11AF99BAD00B5F7CC /* libRCTSettings.a */, 3DAD3E901DF850E9000B6D8A /* libRCTSettings-tvOS.a */, + 139105C11AF99BAD00B5F7CC /* libRCTSettings.a */, ); name = Products; sourceTree = ""; @@ -354,8 +359,8 @@ 139FDEE71B06529A00C62182 /* Products */ = { isa = PBXGroup; children = ( - 139FDEF41B06529B00C62182 /* libRCTWebSocket.a */, 3DAD3E991DF850E9000B6D8A /* libRCTWebSocket-tvOS.a */, + 139FDEF41B06529B00C62182 /* libRCTWebSocket.a */, ); name = Products; sourceTree = ""; @@ -363,12 +368,12 @@ 13B07FAE1A68108700A75B9A /* ReactExample */ = { isa = PBXGroup; children = ( - 008F07F21AC5B25A0029DE68 /* main.jsbundle */, 13B07FAF1A68108700A75B9A /* AppDelegate.h */, 13B07FB01A68108700A75B9A /* AppDelegate.m */, 13B07FB51A68108700A75B9A /* Images.xcassets */, 13B07FB61A68108700A75B9A /* Info.plist */, 13B07FB11A68108700A75B9A /* LaunchScreen.xib */, + 008F07F21AC5B25A0029DE68 /* main.jsbundle */, 13B07FB71A68108700A75B9A /* main.m */, ); name = ReactExample; @@ -377,14 +382,14 @@ 146834001AC3E56700842450 /* Products */ = { isa = PBXGroup; children = ( - 146834041AC3E56700842450 /* libReact.a */, - 3DAD3EA31DF850E9000B6D8A /* libReact.a */, - 3DAD3EA51DF850E9000B6D8A /* libyoga.a */, - 3DAD3EA71DF850E9000B6D8A /* libyoga.a */, 3DAD3EA91DF850E9000B6D8A /* libcxxreact.a */, 3DAD3EAB1DF850E9000B6D8A /* libcxxreact.a */, 3DAD3EAD1DF850E9000B6D8A /* libjschelpers.a */, 3DAD3EAF1DF850E9000B6D8A /* libjschelpers.a */, + 146834041AC3E56700842450 /* libReact.a */, + 3DAD3EA31DF850E9000B6D8A /* libReact.a */, + 3DAD3EA51DF850E9000B6D8A /* libyoga.a */, + 3DAD3EA71DF850E9000B6D8A /* libyoga.a */, ); name = Products; sourceTree = ""; @@ -398,11 +403,22 @@ name = Frameworks; sourceTree = ""; }; + 3F2C20791F59D929005D67C0 /* js */ = { + isa = PBXGroup; + children = ( + 3F2C20571F59D921005D67C0 /* components */, + 3F2C20581F59D921005D67C0 /* index.android.js */, + 3F2C20591F59D921005D67C0 /* index.ios.js */, + 3F2C205A1F59D921005D67C0 /* main.js */, + ); + name = js; + sourceTree = ""; + }; 5E91572E1DD0AC6500FF2AA8 /* Products */ = { isa = PBXGroup; children = ( - 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */, 5E9157351DD0AC6500FF2AA8 /* libRCTAnimation-tvOS.a */, + 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */, ); name = Products; sourceTree = ""; @@ -410,8 +426,8 @@ 78C398B11ACF4ADC00677621 /* Products */ = { isa = PBXGroup; children = ( - 78C398B91ACF4ADC00677621 /* libRCTLinking.a */, 3DAD3E881DF850E9000B6D8A /* libRCTLinking-tvOS.a */, + 78C398B91ACF4ADC00677621 /* libRCTLinking.a */, ); name = Products; sourceTree = ""; @@ -419,9 +435,8 @@ 832341AE1AAA6A7D00B99B32 /* Libraries */ = { isa = PBXGroup; children = ( - 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */, - 146833FF1AC3E56700842450 /* React.xcodeproj */, 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */, + 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */, 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */, 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */, 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */, @@ -430,6 +445,7 @@ 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */, 00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */, 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */, + 146833FF1AC3E56700842450 /* React.xcodeproj */, 73AD103601A44EB291AC2117 /* RealmReact.xcodeproj */, ); name = Libraries; @@ -438,8 +454,8 @@ 832341B11AAA6A8300B99B32 /* Products */ = { isa = PBXGroup; children = ( - 832341B51AAA6A8300B99B32 /* libRCTText.a */, 3DAD3E941DF850E9000B6D8A /* libRCTText-tvOS.a */, + 832341B51AAA6A8300B99B32 /* libRCTText.a */, ); name = Products; sourceTree = ""; @@ -447,11 +463,12 @@ 83CBB9F61A601CBA00E9B192 = { isa = PBXGroup; children = ( - 13B07FAE1A68108700A75B9A /* ReactExample */, - 832341AE1AAA6A7D00B99B32 /* Libraries */, - 00E356EF1AD99517003FC87E /* ReactExampleTests */, - 83CBBA001A601CBA00E9B192 /* Products */, 23F67594C0FF4976851184CE /* Frameworks */, + 3F2C20791F59D929005D67C0 /* js */, + 832341AE1AAA6A7D00B99B32 /* Libraries */, + 83CBBA001A601CBA00E9B192 /* Products */, + 13B07FAE1A68108700A75B9A /* ReactExample */, + 00E356EF1AD99517003FC87E /* ReactExampleTests */, ); indentWidth = 2; sourceTree = ""; @@ -794,6 +811,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 3F2C205B1F59D921005D67C0 /* components in Resources */, 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */, 13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */, ); From 942643911d761b7dba573b848f1044db22772656 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Fri, 8 Sep 2017 11:40:56 -0700 Subject: [PATCH 3/4] Ensure node 6.5.0 is installed for react-native tests --- scripts/test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/test.sh b/scripts/test.sh index 840deb68..7810cbc5 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -237,7 +237,7 @@ elif [ -x "$(command -v brew)" ] && [ -f "$(brew --prefix nvm)/nvm.sh" ]; then # TODO: change the mac slaves to use manual nvm installation . "$(brew --prefix nvm)/nvm.sh" fi -[[ "$(command -v nvm)" ]] && nvm use 6.5.0 || true +[[ "$(command -v nvm)" ]] && nvm install 6.5.0 && nvm use 6.5.0 || true # Remove cached packages rm -rf ~/.yarn-cache/npm-realm-* From 186b3d56c4dd668db66697a16f3220540e88dec8 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Fri, 8 Sep 2017 11:42:26 -0700 Subject: [PATCH 4/4] Remove the sha_win32.lib import Core bundles this library into the main Realm library. --- realm.gypi | 5 ----- 1 file changed, 5 deletions(-) diff --git a/realm.gypi b/realm.gypi index 154e47b9..a06e1708 100644 --- a/realm.gypi +++ b/realm.gypi @@ -48,11 +48,6 @@ }, { "dependencies": [ "vendored-realm" ] }], - ["OS=='win'", { - "direct_dependent_settings": { - "libraries": [ "-lsha_win32<(debug_library_suffix)" ] - } - }] ] }, {