From 857369f5a42442c9a0c4516cabcc70e7d6b0f145 Mon Sep 17 00:00:00 2001 From: Ari Lazier Date: Tue, 4 Oct 2016 17:27:09 -0700 Subject: [PATCH] download core and sync and get the test app running on sync --- .../ios/RealmReact.xcodeproj/project.pbxproj | 6 +- .../xcschemes/RealmReact.xcscheme | 2 +- scripts/download-core.sh | 94 +++++--- src/RealmJS.xcodeproj/project.pbxproj | 222 ++++++++++-------- .../xcschemes/GCDWebServers.xcscheme | 2 +- .../xcshareddata/xcschemes/RealmJS.xcscheme | 2 +- .../xcshareddata/xcschemes/RealmNode.xcscheme | 2 +- src/js_sync.hpp | 10 +- src/object-store | 2 +- .../ios/ReactTests.xcodeproj/project.pbxproj | 27 ++- .../xcschemes/ReactTestApp.xcscheme | 2 +- 11 files changed, 230 insertions(+), 141 deletions(-) diff --git a/react-native/ios/RealmReact.xcodeproj/project.pbxproj b/react-native/ios/RealmReact.xcodeproj/project.pbxproj index 91604d5c..1818e93b 100644 --- a/react-native/ios/RealmReact.xcodeproj/project.pbxproj +++ b/react-native/ios/RealmReact.xcodeproj/project.pbxproj @@ -341,11 +341,12 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", "$(SRCROOT)/../../src/**", - "$(SRCROOT)/../../vendor", + "$(SRCROOT)/../../vendor/core/include", "$(SRCROOT)/../../vendor/GCDWebServer/GCDWebServer/**", "$(SRCROOT)/../../../react-native/React/**", "$(SRCROOT)/../../tests/react-test-app/node_modules/react-native/React/**", "$(SRCROOT)/../../examples/ReactExample/node_modules/react-native/React/**", + "$(SRCROOT)/../../vendor", ); OTHER_LIBTOOLFLAGS = "$(BUILT_PRODUCTS_DIR)/libRealmJS.a $(BUILT_PRODUCTS_DIR)/libGCDWebServers.a"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -359,11 +360,12 @@ HEADER_SEARCH_PATHS = ( "$(inherited)", "$(SRCROOT)/../../src/**", - "$(SRCROOT)/../../vendor", + "$(SRCROOT)/../../vendor/core/include", "$(SRCROOT)/../../vendor/GCDWebServer/GCDWebServer/**", "$(SRCROOT)/../../../react-native/React/**", "$(SRCROOT)/../../tests/react-test-app/node_modules/react-native/React/**", "$(SRCROOT)/../../examples/ReactExample/node_modules/react-native/React/**", + "$(SRCROOT)/../../vendor", ); OTHER_LIBTOOLFLAGS = "$(BUILT_PRODUCTS_DIR)/libRealmJS.a"; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/react-native/ios/RealmReact.xcodeproj/xcshareddata/xcschemes/RealmReact.xcscheme b/react-native/ios/RealmReact.xcodeproj/xcshareddata/xcschemes/RealmReact.xcscheme index 3a668563..d884d069 100644 --- a/react-native/ios/RealmReact.xcodeproj/xcshareddata/xcschemes/RealmReact.xcscheme +++ b/react-native/ios/RealmReact.xcodeproj/xcshareddata/xcschemes/RealmReact.xcscheme @@ -1,6 +1,6 @@ ::create_constructor(ContextType ctx) { }); #endif -#if !REALM_DEVELOPER_EDITION +#if REALM_ENTERPRISE_EDITION SyncEnterpriseClass::add_methods(ctx, sync_constructor); #endif @@ -215,10 +215,10 @@ void SyncClass::populate_sync_config(ContextType ctx, ObjectType config_objec template void SyncClass::get_is_developer_edition(ContextType ctx, ObjectType object, ReturnValue &return_value) { -#if REALM_DEVELOPER_EDITION - return_value.set(true); -#else +#if REALM_ENTERPRISE_EDITION return_value.set(false); +#else + return_value.set(true); #endif } diff --git a/src/object-store b/src/object-store index c3e4be6d..8d891030 160000 --- a/src/object-store +++ b/src/object-store @@ -1 +1 @@ -Subproject commit c3e4be6d6cd0bf3e010e169b9793087e60eb52bb +Subproject commit 8d8910304befb991331fda8c2aa286415fa38cee diff --git a/tests/react-test-app/ios/ReactTests.xcodeproj/project.pbxproj b/tests/react-test-app/ios/ReactTests.xcodeproj/project.pbxproj index 7f3be991..83846488 100644 --- a/tests/react-test-app/ios/ReactTests.xcodeproj/project.pbxproj +++ b/tests/react-test-app/ios/ReactTests.xcodeproj/project.pbxproj @@ -73,6 +73,13 @@ remoteGlobalIDString = 13B07F861A680F5B00A75B9A; remoteInfo = ReactTests; }; + 02022A7E1DA47F06000F0C4F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = F60690521CA2831E0003FB26 /* RealmReact.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = F60690121CA2766F0003FB26; + remoteInfo = RealmReact; + }; 139105C01AF99BAD00B5F7CC /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */; @@ -378,6 +385,7 @@ buildRules = ( ); dependencies = ( + 02022A7F1DA47F06000F0C4F /* PBXTargetDependency */, ); name = ReactTestApp; productName = "Hello World"; @@ -390,7 +398,7 @@ 83CBB9F71A601CBA00E9B192 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0710; + LastUpgradeCheck = 0800; ORGANIZATIONNAME = Realm; TargetAttributes = { 00E356ED1AD99517003FC87E = { @@ -578,7 +586,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "[ -s \"${HOME}/.nvm/nvm.sh\" ] && . \"${HOME}/.nvm/nvm.sh\" \nif [ -z \"$TEST_SCRIPT\" ]; then\n npm install realm realm-tests\nfi\ncp ../../../src/object-store/tests/query.json ../node_modules/realm-tests/query-tests.json\n"; + shellScript = "[ -s \"${HOME}/.nvm/nvm.sh\" ] && . \"${HOME}/.nvm/nvm.sh\" \nif [ -z \"$TEST_SCRIPT\" ]; then\n #npm install realm realm-tests\n echo a\nfi\ncp ../../../src/object-store/tests/query.json ../node_modules/realm-tests/query-tests.json\n"; }; F6EDE5BF1C49007200B1085F /* Bundle React Native code and images */ = { isa = PBXShellScriptBuildPhase; @@ -623,6 +631,11 @@ target = 13B07F861A680F5B00A75B9A /* ReactTestApp */; targetProxy = 00E356F41AD99517003FC87E /* PBXContainerItemProxy */; }; + 02022A7F1DA47F06000F0C4F /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = RealmReact; + targetProxy = 02022A7E1DA47F06000F0C4F /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ @@ -713,8 +726,10 @@ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; @@ -723,6 +738,7 @@ ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", @@ -741,7 +757,7 @@ "$(SRCROOT)/../node_modules/react-native/React/Base/**", "$(SRCROOT)/../node_modules/react-native/React/Modules", ); - IPHONEOS_DEPLOYMENT_TARGET = 7.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = "io.realm.$(PRODUCT_NAME:rfc1034identifier)"; @@ -762,8 +778,10 @@ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; @@ -771,6 +789,7 @@ ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; @@ -783,7 +802,7 @@ "$(SRCROOT)/../node_modules/react-native/React/Base/**", "$(SRCROOT)/../node_modules/react-native/React/Modules", ); - IPHONEOS_DEPLOYMENT_TARGET = 7.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = "io.realm.$(PRODUCT_NAME:rfc1034identifier)"; SDKROOT = iphoneos; diff --git a/tests/react-test-app/ios/ReactTests.xcodeproj/xcshareddata/xcschemes/ReactTestApp.xcscheme b/tests/react-test-app/ios/ReactTests.xcodeproj/xcshareddata/xcschemes/ReactTestApp.xcscheme index c3a683d9..8b4f45ce 100644 --- a/tests/react-test-app/ios/ReactTests.xcodeproj/xcshareddata/xcschemes/ReactTestApp.xcscheme +++ b/tests/react-test-app/ios/ReactTests.xcodeproj/xcshareddata/xcschemes/ReactTestApp.xcscheme @@ -1,6 +1,6 @@