Upgrade to Core 13.26 (#7870)

realm · Feb 6, 2024 · 9dc73d0 · 9dc73d0
1 parent 571b9bd
commit 9dc73d0
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,7 +17,8 @@
 * Android Gradle Plugin 7.4.0 and above.
 
 ### Internal
-* None.
+* Updated to Realm Core 13.26.0, commit 5533505d18fda93a7a971d58a191db5005583c92.
+* Updated to CMake 3.27.7.
 
 
 ## 10.17.0 (2023-10-13)

diff --git a/Dockerfile b/Dockerfile
@@ -89,10 +89,10 @@ RUN chmod -R a+rwX ${ANDROID_HOME}
 
 # Ensure a new enough version of CMake is available.
 RUN cd /opt \
-    && wget -nv https://cmake.org/files/v3.22/cmake-3.22.1-linux-x86_64.tar.gz \
-    && tar zxf cmake-3.22.1-linux-x86_64.tar.gz
+    && wget -nv https://cmake.org/files/v3.22/cmake-3.27.7-linux-x86_64.tar.gz \
+    && tar zxf cmake-3.27.7-linux-x86_64.tar.gz
 
 # Workaround for https://issuetracker.google.com/issues/206099937
 RUN ln -s /usr/bin/ninja /opt/cmake-3.22.1-linux-x86_64/bin/ninja
 
-ENV PATH "/opt/cmake-3.22.1-linux-x86_64/bin:$PATH"
+ENV PATH "/opt/cmake-3.27.7-linux-x86_64/bin:$PATH"
diff --git a/dependencies.list b/dependencies.list
@@ -1,6 +1,6 @@
 # Realm Core release used by Realm Java
 # https://github.com/realm/realm-core/releases
-REALM_CORE=13.23.0
+REALM_CORE=13.26.0
 
 # Version of MongoDB Realm used by integration tests
 # See https://github.com/realm/ci/packages/147854 for available versions
@@ -25,7 +25,7 @@ gradle=7.5
 ndkVersion=23.1.7779620
 BUILD_INFO_EXTRACTOR_GRADLE=4.17.0
 GRADLE_NEXUS_PLUGIN=1.0.0
-CMAKE=3.22.1
+CMAKE=3.27.7
 
 # Bson dependency version
 BSON_DEPENDENCY=3.12.1

diff --git a/realm/realm-library/src/main/cpp/CMakeLists.txt b/realm/realm-library/src/main/cpp/CMakeLists.txt
@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 ###########################################################################
-cmake_minimum_required(VERSION 3.21.4)
+cmake_minimum_required(VERSION 3.27.7)
 project(RealmJava)
 
 # For debugging: Enable this to output all variables defined for the project

diff --git a/realm/realm-library/src/main/cpp/io_realm_internal_objectstore_OsApp.cpp b/realm/realm-library/src/main/cpp/io_realm_internal_objectstore_OsApp.cpp
@@ -178,7 +178,7 @@ JNIEXPORT jlong JNICALL Java_io_realm_internal_objectstore_OsApp_nativeCreate(JN
         static AndroidClientListener client_thread_listener(env);
         client_config.default_socket_provider_thread_observer = std::make_shared<BindingCallbackThreadObserver>(client_thread_listener);
 
-        SharedApp app = App::get_shared_app(app_config, client_config);
+        SharedApp app = App::get_app(app::App::CacheMode::Enabled, app_config, client_config);
         // Init logger. Must be called after .configure()
         app->sync_manager()->set_logger_factory(javaLoggerFactory);
 

diff --git a/realm/realm-library/src/main/cpp/io_realm_internal_objectstore_OsMongoCollection.cpp b/realm/realm-library/src/main/cpp/io_realm_internal_objectstore_OsMongoCollection.cpp
@@ -22,7 +22,7 @@
 #include "jni_util/java_method.hpp"
 #include "jni_util/jni_utils.hpp"
 #include "jni_util/bson_util.hpp"
-#include <realm/object-store/util/bson/bson.hpp>
+#include <realm/util/bson/bson.hpp>
 
 #include <realm/util/optional.hpp>
 #include <realm/object-store/sync/app.hpp>

diff --git a/realm/realm-library/src/main/cpp/io_realm_internal_objectstore_OsSyncUser.cpp b/realm/realm-library/src/main/cpp/io_realm_internal_objectstore_OsSyncUser.cpp
@@ -22,7 +22,7 @@
 #include "java_network_transport.hpp"
 
 #include <realm/object-store/sync/sync_user.hpp>
-#include <realm/object-store/util/bson/bson.hpp>
+#include <realm/util/bson/bson.hpp>
 #include <jni_util/bson_util.hpp>
 
 using namespace realm;

diff --git a/realm/realm-library/src/main/cpp/io_realm_mongodb_mongo_iterable_AggregateIterable.cpp b/realm/realm-library/src/main/cpp/io_realm_mongodb_mongo_iterable_AggregateIterable.cpp
@@ -24,7 +24,7 @@
 #include "jni_util/bson_util.hpp"
 
 #include <realm/util/optional.hpp>
-#include <realm/object-store/util/bson/bson.hpp>
+#include <realm/util/bson/bson.hpp>
 #include <realm/object-store/sync/mongo_collection.hpp>
 #include <jni_util/bson_util.hpp>
 #include <jni.h>

diff --git a/realm/realm-library/src/main/cpp/io_realm_mongodb_mongo_iterable_FindIterable.cpp b/realm/realm-library/src/main/cpp/io_realm_mongodb_mongo_iterable_FindIterable.cpp
@@ -24,7 +24,7 @@
 #include "jni_util/bson_util.hpp"
 
 #include <realm/util/optional.hpp>
-#include <realm/object-store//util/bson/bson.hpp>
+#include <realm/util/bson/bson.hpp>
 #include <realm/object-store/sync/mongo_collection.hpp>
 #include <jni_util/bson_util.hpp>
 

diff --git a/realm/realm-library/src/main/cpp/jni_util/bson_util.hpp b/realm/realm-library/src/main/cpp/jni_util/bson_util.hpp
@@ -18,7 +18,7 @@
 #define REALM_BSON_UTIL_HPP
 
 #include <jni.h>
-#include <realm/object-store/util/bson/bson.hpp>
+#include <realm/util/bson/bson.hpp>
 
 namespace realm {
 namespace jni_util {

diff --git a/realm/realm-library/src/main/cpp/realm-core b/realm/realm-library/src/main/cpp/realm-core