From 9dc73d0713f587563db89c9c297e02b6c88b748b Mon Sep 17 00:00:00 2001 From: Nabil Hachicha Date: Tue, 6 Feb 2024 13:48:55 +0000 Subject: [PATCH] Upgrade to Core 13.26 (#7870) --- CHANGELOG.md | 3 ++- Dockerfile | 6 +++--- dependencies.list | 4 ++-- realm/realm-library/src/main/cpp/CMakeLists.txt | 2 +- .../src/main/cpp/io_realm_internal_objectstore_OsApp.cpp | 2 +- .../cpp/io_realm_internal_objectstore_OsMongoCollection.cpp | 2 +- .../main/cpp/io_realm_internal_objectstore_OsSyncUser.cpp | 2 +- .../io_realm_mongodb_mongo_iterable_AggregateIterable.cpp | 2 +- .../cpp/io_realm_mongodb_mongo_iterable_FindIterable.cpp | 2 +- realm/realm-library/src/main/cpp/jni_util/bson_util.hpp | 2 +- realm/realm-library/src/main/cpp/realm-core | 2 +- 11 files changed, 15 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 59659ec12b..4f83620796 100644 --- 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 index 9f9cdfe21d..cb899402b4 100644 --- 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 index eb50f9418e..165e8be946 100644 --- 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 index 6b0988b978..552d8efa2f 100644 --- 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 index a4d1067904..60c22e1d7d 100644 --- 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(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 index b171a7627a..07b179ea5d 100644 --- 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 +#include #include #include 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 index 0c7de9617f..5ace501f99 100644 --- 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 -#include +#include #include 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 index f33ef60a3f..716f2a3f6d 100644 --- 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 -#include +#include #include #include #include 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 index 3fee3c8805..17ed811bd3 100644 --- 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 -#include +#include #include #include 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 index fb0d822903..1858d5a1c7 100644 --- 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 -#include +#include 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 index 5abbf7f10f..5533505d18 160000 --- a/realm/realm-library/src/main/cpp/realm-core +++ b/realm/realm-library/src/main/cpp/realm-core @@ -1 +1 @@ -Subproject commit 5abbf7f10fb3ef6bd622877cc840ada804bccb89 +Subproject commit 5533505d18fda93a7a971d58a191db5005583c92