From fae5b8cf31f318adbb8af2751b8d22eaf8ea0431 Mon Sep 17 00:00:00 2001 From: blagoev Date: Thu, 21 Dec 2017 16:17:37 +0200 Subject: [PATCH] update core ans sync --- dependencies.list | 4 ++-- realm.gypi | 9 --------- scripts/download-realm.js | 1 + src/js_list.hpp | 4 ++-- src/js_realm_object.hpp | 1 - src/js_results.hpp | 6 +++--- src/js_schema.hpp | 2 -- src/js_types.hpp | 1 - src/object-store | 2 +- 9 files changed, 9 insertions(+), 21 deletions(-) diff --git a/dependencies.list b/dependencies.list index 91dc4769..8731ea4a 100644 --- a/dependencies.list +++ b/dependencies.list @@ -1,5 +1,5 @@ PACKAGE_NAME=realm-js VERSION=2.1.1 -REALM_CORE_VERSION=4.0.2 -REALM_SYNC_VERSION=2.2.1 +REALM_CORE_VERSION=5.0.1 +REALM_SYNC_VERSION=2.2.2 REALM_OBJECT_SERVER_VERSION=2.0.21 diff --git a/realm.gypi b/realm.gypi index eeb33271..bb7a9e51 100644 --- a/realm.gypi +++ b/realm.gypi @@ -59,9 +59,6 @@ "src/object-store/src/impl/results_notifier.cpp", "src/object-store/src/impl/transact_log_handler.cpp", "src/object-store/src/impl/weak_realm_notifier.cpp", - "src/object-store/src/parser/parser.cpp", - "src/object-store/src/parser/query_builder.cpp", - "src/object-store/src/util/format.cpp", "src/object-store/src/util/uuid.cpp", "src/object-store/src/binding_callback_thread_observer.hpp", @@ -93,8 +90,6 @@ "src/object-store/src/object_accessor.hpp", "src/object-store/src/object_schema.hpp", "src/object-store/src/object_store.hpp", - "src/object-store/src/parser/parser.hpp", - "src/object-store/src/parser/query_builder.hpp", "src/object-store/src/property.hpp", "src/object-store/src/results.hpp", "src/object-store/src/schema.hpp", @@ -114,12 +109,10 @@ "src/object-store/src/thread_safe_reference.hpp", "src/object-store/src/util/aligned_union.hpp", "src/object-store/src/util/android/event_loop_signal.hpp", - "src/object-store/src/util/any.hpp", "src/object-store/src/util/apple/event_loop_signal.hpp", "src/object-store/src/util/atomic_shared_ptr.hpp", "src/object-store/src/util/compiler.hpp", "src/object-store/src/util/event_loop_signal.hpp", - "src/object-store/src/util/format.hpp", "src/object-store/src/util/generic/event_loop_signal.hpp", "src/object-store/src/util/tagged_bool.hpp", "src/object-store/src/util/time.hpp", @@ -165,7 +158,6 @@ "src/object-store/src", "src/object-store/src/impl", "src/object-store/src/impl/apple", - "src/object-store/src/parser", "src/object-store/external/pegtl" ] }, @@ -271,7 +263,6 @@ "all_dependent_settings": { "include_dirs": [ "<(vendor_dir)/include" ], "library_dirs": [ - "<(vendor_dir)/lib", "<(vendor_dir)/osx" ] }, diff --git a/scripts/download-realm.js b/scripts/download-realm.js index 9136eaaa..b097a70e 100644 --- a/scripts/download-realm.js +++ b/scripts/download-realm.js @@ -62,6 +62,7 @@ function printProgress(input, totalBytes, archive) { function download(serverFolder, archive, destination) { const url = `https://static.realm.io/downloads/${serverFolder}/${archive}`; + console.log(`Download url: ${url}`); return fetch(url).then((response) => { if (response.status !== 200) { throw new Error(`Error downloading ${url} - received status ${response.status} ${response.statusText}`); diff --git a/src/js_list.hpp b/src/js_list.hpp index 7f65ee44..f7202fb9 100644 --- a/src/js_list.hpp +++ b/src/js_list.hpp @@ -27,8 +27,8 @@ #include "shared_realm.hpp" #include "list.hpp" -#include "parser.hpp" -#include "query_builder.hpp" +#include "realm/parser/parser.hpp" +#include "realm/parser/query_builder.hpp" namespace realm { namespace js { diff --git a/src/js_realm_object.hpp b/src/js_realm_object.hpp index f18698fb..b823d2c4 100644 --- a/src/js_realm_object.hpp +++ b/src/js_realm_object.hpp @@ -20,7 +20,6 @@ #include "object_accessor.hpp" #include "object_store.hpp" -#include "util/format.hpp" #include "js_class.hpp" #include "js_types.hpp" diff --git a/src/js_results.hpp b/src/js_results.hpp index 74daccd2..db78eb9d 100644 --- a/src/js_results.hpp +++ b/src/js_results.hpp @@ -25,8 +25,8 @@ #include "results.hpp" #include "list.hpp" #include "object_store.hpp" -#include "parser.hpp" -#include "query_builder.hpp" +#include "realm/parser/parser.hpp" +#include "realm/parser/query_builder.hpp" namespace realm { namespace js { @@ -155,7 +155,7 @@ typename T::Object ResultsClass::create_filtered(ContextType ctx, const U &co parser::Predicate predicate = parser::parse(query_string); NativeAccessor accessor(ctx, realm, object_schema); query_builder::ArgumentConverter> converter(accessor, &args.value[1], args.count - 1); - query_builder::apply_predicate(query, predicate, converter, realm->schema(), object_schema.name); + query_builder::apply_predicate(query, predicate, converter); return create_instance(ctx, collection.filter(std::move(query))); } diff --git a/src/js_schema.hpp b/src/js_schema.hpp index e3464de9..3a5cf3d2 100644 --- a/src/js_schema.hpp +++ b/src/js_schema.hpp @@ -23,8 +23,6 @@ #include "js_types.hpp" #include "schema.hpp" -#include "util/format.hpp" - namespace realm { namespace js { diff --git a/src/js_types.hpp b/src/js_types.hpp index 0c7e5309..ce1fd1f7 100644 --- a/src/js_types.hpp +++ b/src/js_types.hpp @@ -20,7 +20,6 @@ #include "execution_context_id.hpp" #include "property.hpp" -#include "util/format.hpp" #include #include diff --git a/src/object-store b/src/object-store index d681b1fb..21e671a1 160000 --- a/src/object-store +++ b/src/object-store @@ -1 +1 @@ -Subproject commit d681b1fb8a8ca7a8db1ab1edc25771d984795ebe +Subproject commit 21e671a155989f4e34e279fc8a7ace5817495de0