mirror of
https://github.com/status-im/realm-js.git
synced 2025-01-10 14:25:58 +00:00
Update Object Store Submodule (#797)
* Update OS * Use the latest sync * Update objectstore * Use realm-sync 7.2 * Add files to project * Use OS submodule with fix * Fix object store includes in xcode project * add missing object store file to binding.gyp * Update OS with fix for the GlobalNotifier * Add OS files to Android jni * Use master@ObjectStore
This commit is contained in:
Radu Tutueanu
GitHub
parent
12bde1ed35
commit
fa8088348d
@ -46,6 +46,7 @@
|
||||
"src/object-store/src/collection_notifications.cpp",
|
||||
"src/object-store/src/index_set.cpp",
|
||||
"src/object-store/src/list.cpp",
|
||||
"src/object-store/src/object.cpp",
|
||||
"src/object-store/src/object_schema.cpp",
|
||||
"src/object-store/src/object_store.cpp",
|
||||
"src/object-store/src/results.cpp",
|
||||
@ -55,6 +56,7 @@
|
||||
"src/object-store/src/impl/collection_change_builder.cpp",
|
||||
"src/object-store/src/impl/collection_notifier.cpp",
|
||||
"src/object-store/src/impl/list_notifier.cpp",
|
||||
"src/object-store/src/impl/object_notifier.cpp",
|
||||
"src/object-store/src/impl/realm_coordinator.cpp",
|
||||
"src/object-store/src/impl/results_notifier.cpp",
|
||||
"src/object-store/src/impl/transact_log_handler.cpp",
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
PACKAGE_NAME=realm-js
|
||||
VERSION=0.15.4
|
||||
REALM_CORE_VERSION=2.2.0
|
||||
REALM_SYNC_VERSION=1.0.0-BETA-6.3
|
||||
REALM_OBJECT_SERVER_VERSION=1.0.0-BETA-4.8
|
||||
REALM_CORE_VERSION=2.3.0
|
||||
REALM_SYNC_VERSION=1.0.0-BETA-7.2
|
||||
REALM_OBJECT_SERVER_VERSION=1.0.0-BETA-5.1
|
||||
|
||||
@ -32,6 +32,7 @@ LOCAL_SRC_FILES += src/android/platform.cpp
|
||||
LOCAL_SRC_FILES += src/object-store/src/impl/collection_change_builder.cpp
|
||||
LOCAL_SRC_FILES += src/object-store/src/impl/collection_notifier.cpp
|
||||
LOCAL_SRC_FILES += src/object-store/src/impl/list_notifier.cpp
|
||||
LOCAL_SRC_FILES += src/object-store/src/impl/object_notifier.cpp
|
||||
LOCAL_SRC_FILES += src/object-store/src/impl/realm_coordinator.cpp
|
||||
LOCAL_SRC_FILES += src/object-store/src/impl/results_notifier.cpp
|
||||
LOCAL_SRC_FILES += src/object-store/src/impl/transact_log_handler.cpp
|
||||
@ -45,7 +46,7 @@ LOCAL_SRC_FILES += src/object-store/src/index_set.cpp
|
||||
LOCAL_SRC_FILES += src/object-store/src/list.cpp
|
||||
LOCAL_SRC_FILES += src/object-store/src/object_schema.cpp
|
||||
LOCAL_SRC_FILES += src/object-store/src/object_store.cpp
|
||||
LOCAL_SRC_FILES += src/object-store/src/placeholder.cpp
|
||||
LOCAL_SRC_FILES += src/object-store/src/object.cpp
|
||||
LOCAL_SRC_FILES += src/object-store/src/results.cpp
|
||||
LOCAL_SRC_FILES += src/object-store/src/schema.cpp
|
||||
LOCAL_SRC_FILES += src/object-store/src/shared_realm.cpp
|
||||
|
||||
@ -39,8 +39,10 @@
|
||||
02F59EC51C88F17D007F774C /* shared_realm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02F59EBD1C88F17D007F774C /* shared_realm.cpp */; };
|
||||
02F59EE21C88F2BB007F774C /* realm_coordinator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02F59EDB1C88F2BA007F774C /* realm_coordinator.cpp */; };
|
||||
02F59EE31C88F2BB007F774C /* transact_log_handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02F59EDD1C88F2BB007F774C /* transact_log_handler.cpp */; };
|
||||
502B07E41E2CD201007A84ED /* object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 502B07E31E2CD1FA007A84ED /* object.cpp */; };
|
||||
50C671001E1D2D31003CB63C /* thread_safe_reference.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5D02C7791E1C83650048C13E /* thread_safe_reference.cpp */; };
|
||||
5D25F5A11D6284FD00EBBB30 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = F63FF3301C16434400B3B8E0 /* libz.tbd */; };
|
||||
8507156E1E2CFCD000E548DB /* object_notifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8507156B1E2CFC0100E548DB /* object_notifier.cpp */; };
|
||||
F61378791C18EAC5008BFC51 /* js in Resources */ = {isa = PBXBuildFile; fileRef = F61378781C18EAAC008BFC51 /* js */; };
|
||||
F63FF2C61C12469E00B3B8E0 /* jsc_init.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 029048011C0428DF00ABDED4 /* jsc_init.cpp */; };
|
||||
F63FF2C91C12469E00B3B8E0 /* js_realm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 029048071C0428DF00ABDED4 /* js_realm.cpp */; };
|
||||
@ -167,9 +169,13 @@
|
||||
02F59EDC1C88F2BB007F774C /* realm_coordinator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = realm_coordinator.hpp; sourceTree = "<group>"; };
|
||||
02F59EDD1C88F2BB007F774C /* transact_log_handler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = transact_log_handler.cpp; sourceTree = "<group>"; };
|
||||
02F59EDE1C88F2BB007F774C /* transact_log_handler.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = transact_log_handler.hpp; sourceTree = "<group>"; };
|
||||
502B07E31E2CD1FA007A84ED /* object.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = object.cpp; path = src/object.cpp; sourceTree = "<group>"; };
|
||||
502B07E51E2CD20D007A84ED /* object.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = object.hpp; path = src/object.hpp; sourceTree = "<group>"; };
|
||||
5D02C7781E1C83650048C13E /* execution_context_id.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = execution_context_id.hpp; path = src/execution_context_id.hpp; sourceTree = "<group>"; };
|
||||
5D02C7791E1C83650048C13E /* thread_safe_reference.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = thread_safe_reference.cpp; path = src/thread_safe_reference.cpp; sourceTree = "<group>"; };
|
||||
5D02C77A1E1C83650048C13E /* thread_safe_reference.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = thread_safe_reference.hpp; path = src/thread_safe_reference.hpp; sourceTree = "<group>"; };
|
||||
8507156B1E2CFC0100E548DB /* object_notifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = object_notifier.cpp; sourceTree = "<group>"; };
|
||||
8507156C1E2CFC0100E548DB /* object_notifier.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = object_notifier.hpp; sourceTree = "<group>"; };
|
||||
F60102CF1CBB814A00EC01BA /* node_init.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = node_init.hpp; sourceTree = "<group>"; };
|
||||
F60102D11CBB865A00EC01BA /* jsc_init.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = jsc_init.hpp; sourceTree = "<group>"; };
|
||||
F60102E31CBBB19700EC01BA /* node_object_accessor.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = node_object_accessor.hpp; sourceTree = "<group>"; };
|
||||
@ -456,6 +462,8 @@
|
||||
02F59EB01C88F17D007F774C /* index_set.hpp */,
|
||||
02F59EB11C88F17D007F774C /* list.cpp */,
|
||||
02F59EB21C88F17D007F774C /* list.hpp */,
|
||||
502B07E31E2CD1FA007A84ED /* object.cpp */,
|
||||
502B07E51E2CD20D007A84ED /* object.hpp */,
|
||||
02F59EB31C88F17D007F774C /* object_accessor.hpp */,
|
||||
02F59EB41C88F17D007F774C /* object_schema.cpp */,
|
||||
02F59EB51C88F17D007F774C /* object_schema.hpp */,
|
||||
@ -511,6 +519,8 @@
|
||||
02414B9C1CE6AAEF00A8669F /* collection_notifier.hpp */,
|
||||
02414B9D1CE6AAEF00A8669F /* list_notifier.cpp */,
|
||||
02414B9E1CE6AAEF00A8669F /* list_notifier.hpp */,
|
||||
8507156B1E2CFC0100E548DB /* object_notifier.cpp */,
|
||||
8507156C1E2CFC0100E548DB /* object_notifier.hpp */,
|
||||
02414B9F1CE6AAEF00A8669F /* results_notifier.cpp */,
|
||||
02414BA01CE6AAEF00A8669F /* results_notifier.hpp */,
|
||||
02F59EDA1C88F2BA007F774C /* external_commit_helper.hpp */,
|
||||
@ -820,6 +830,7 @@
|
||||
02022A581DA476CD000F0C4F /* external_commit_helper.cpp in Sources */,
|
||||
02022A5A1DA476CD000F0C4F /* weak_realm_notifier.cpp in Sources */,
|
||||
02022A5B1DA476CD000F0C4F /* placeholder.cpp in Sources */,
|
||||
502B07E41E2CD201007A84ED /* object.cpp in Sources */,
|
||||
02414BA51CE6ABCF00A8669F /* collection_change_builder.cpp in Sources */,
|
||||
02414BA61CE6ABCF00A8669F /* collection_notifier.cpp in Sources */,
|
||||
02414BA71CE6ABCF00A8669F /* list_notifier.cpp in Sources */,
|
||||
@ -828,6 +839,7 @@
|
||||
02F59EE31C88F2BB007F774C /* transact_log_handler.cpp in Sources */,
|
||||
F63FF2E81C159C4B00B3B8E0 /* platform.mm in Sources */,
|
||||
50C671001E1D2D31003CB63C /* thread_safe_reference.cpp in Sources */,
|
||||
8507156E1E2CFCD000E548DB /* object_notifier.cpp in Sources */,
|
||||
02E315CA1DB80DDD00555337 /* sync_session.cpp in Sources */,
|
||||
02F59EC31C88F17D007F774C /* results.cpp in Sources */,
|
||||
F63FF2E21C15921A00B3B8E0 /* base64.cpp in Sources */,
|
||||
|
||||
@ -1 +1 @@
|
||||
Subproject commit ea7df44e2ffc4854fd4657a8b4c7ec53c8bfed15
|
||||
Subproject commit e43cc96d2cc7a41cb3d9f51d9b42bcba4eb91e9a
|
||||
Loading…
x
Reference in New Issue
Block a user