Merge branch 'master' of github.com:realm/realm-core into next-major

Author: nicola-cab

.clang-format

@@ -1,5 +1,6 @@
 ---
-Language:        Cpp
+# Don't try to format any languages not described by this file
+DisableFormat: true
 AccessModifierOffset: -4
 AlignAfterOpenBracket: Align
 AlignArrayOfStructures: None
@@ -65,7 +66,6 @@ ContinuationIndentWidth: 4
 Cpp11BracedListStyle: true
 DeriveLineEnding: true
 DerivePointerAlignment: false
-DisableFormat:   false
 EmptyLineAfterAccessModifier: Never
 EmptyLineBeforeAccessModifier: LogicalBlock
 ExperimentalAutoDetectBinPacking: false
@@ -191,5 +191,11 @@ WhitespaceSensitiveMacros:
   - BOOST_PP_STRINGIZE
   - NS_SWIFT_NAME
   - CF_SWIFT_NAME
+---
+Language: Cpp
+DisableFormat:   false
+---
+Language: ObjC
+DisableFormat:   false
 ...
 

CHANGELOG.md

@@ -1,4 +1,3 @@
-
 # NEXT MAJOR RELEASE
 
 ### Enhancements
@@ -21,6 +20,45 @@
 
 ----------------------------------------------
 
+# 14.6.2 Release notes
+
+### Enhancements
+* None.
+
+### Fixed
+* Fixed a bug when running a IN query on a String/Int/UUID/ObjectId property that was indexed. ([7642](https://github.com/realm/realm-core/issues/7642) since v14.6.0)
+* Fixed a bug when running a IN query on a integer property where double/float parameters were ignored. ([7642](https://github.com/realm/realm-core/issues/7642) since v14.6.0)
+* Having links in a nested collections would leave the file inconsistent if the top object is removed. ([#7657](https://github.com/realm/realm-core/issues/7657), since 14.0.0)
+
+### Breaking changes
+* None.
+
+### Compatibility
+* Fileformat: Generates files with format v24. Reads and automatically upgrade from fileformat v10. If you want to upgrade from an earlier file format version you will have to use RealmCore v13.x.y or earlier.
+
+----------------------------------------------
+
+# 14.6.1 Release notes
+
+### Enhancements
+* None.
+
+### Fixed
+
+### Breaking changes
+* None.
+
+### Compatibility
+* Fileformat: Generates files with format v24. Reads and automatically upgrade from fileformat v10. If you want to upgrade from an earlier file format version you will have to use RealmCore v13.x.y or earlier.
+
+-----------
+
+### Internals
+* None.
+* Build with -Werror on CI to ensure that new warnings don't slip in. ([PR #7646](https://github.com/realm/realm-core/pull/7646))
+
+----------------------------------------------
+
 # 14.6.0 Release notes
 
 ### Enhancements

Package.swift

@@ -3,7 +3,7 @@
 import PackageDescription
 import Foundation
 
-let versionStr = "14.6.0"
+let versionStr = "14.6.2"
 let versionPieces = versionStr.split(separator: "-")
 let versionCompontents = versionPieces[0].split(separator: ".")
 let versionExtra = versionPieces.count > 1 ? versionPieces[1] : ""

bindgen/spec.yml

@@ -740,6 +740,7 @@ classes:
       make_ssl_verify_callback: '(callback: (server_address: const std::string&, server_port: int, pem_data: std::string_view, preverify_ok: int, depth: int) off_thread -> bool) -> SSLVerifyCallback'
       needs_file_format_upgrade: '(config: const RealmConfig&) -> bool'
       sync_user_as_app_user: '(sync_user: Nullable<std::shared_ptr<SyncUser>>) -> Nullable<std::shared_ptr<User>>'
+      app_user_as_sync_user: '(sync_user: Nullable<std::shared_ptr<User>>) -> Nullable<std::shared_ptr<SyncUser>>'
 
   LogCategoryRef:
     cppName: util::LogCategoryRef
@@ -1208,13 +1209,13 @@ classes:
   SyncUser:
     cppName: SyncUser
     sharedPtrWrapped: SharedSyncUser
+    properties:
+      is_logged_in: bool
 
   User:
-    base: SyncUser
     cppName: app::User
     sharedPtrWrapped: SharedUser
     properties:
-      is_logged_in: bool
       user_id: std::string
       app_id: std::string
       legacy_identities: std::vector<std::string>
@@ -1295,7 +1296,7 @@ classes:
       unsubscribe: '(token: AppSubscriptionToken)'
       call_function: '(user: const SharedUser&, name: std::string, args: EJsonArray, service_name: std::optional<std::string>, cb: AsyncCallback<(result: Nullable<const EJson*>, err: std::optional<AppError>)>)'
       make_streaming_request: '(user: SharedUser, name: std::string, args: bson::BsonArray, service_name: std::optional<std::string>) -> Request'
-      update_base_url: '(base_url: std::optional<std::string>, cb: AsyncCallback<(err: std::optional<AppError>)>&&)'
+      update_base_url: '(base_url: std::string_view, cb: AsyncCallback<(err: std::optional<AppError>)>&&)'
       get_base_url: '() const -> std::string'
       immediately_run_file_actions: '(realm_path: std::string) -> bool'
 

bindgen/src/realm_helpers.h

@@ -290,6 +290,11 @@ struct Helpers {
     {
         return std::dynamic_pointer_cast<app::User>(sync_user);
     }
+
+    static std::shared_ptr<SyncUser> app_user_as_sync_user(std::shared_ptr<app::User> app_user)
+    {
+        return std::dynamic_pointer_cast<SyncUser>(app_user);
+    }
 };
 
 struct ObjectChangeSet {

dependencies.yml

@@ -1,7 +1,7 @@
 PACKAGE_NAME: realm-core
-VERSION: 14.6.0
+VERSION: 14.6.2
 OPENSSL_VERSION: 3.2.0
 ZLIB_VERSION: 1.2.13
 # https://github.com/10gen/baas/commits
-# 5138f5c is 2024 Apr 19
-BAAS_VERSION: 5138f5c924f9f376d31cbc2b1819e1d934600277
+# 9d1b4d6 is 2024 May 8
+BAAS_VERSION: 9d1b4d628babadfb606ebcadb93b1e5cae3c9565

evergreen/config.yml

@@ -172,6 +172,7 @@ functions:
           fi
 
           set_cmake_var realm_vars REALM_NO_TESTS BOOL ${no_tests|Off}
+          set_cmake_var realm_vars CMAKE_COMPILE_WARNING_AS_ERROR BOOL On
 
           echo "Running cmake with these vars:"
           cat cmake_vars/*.txt | tee cmake_vars.txt

src/external/IntelRDFPMathLib20U2/CMakeLists.txt

@@ -32,4 +32,6 @@ if(HAVE-Wunused-but-set-variable)
     target_compile_options(Bid PRIVATE -Wno-unused-but-set-variable)
 endif()
 
-set_target_properties(Bid PROPERTIES CXX_VISIBILITY_PRESET hidden)
+set_target_properties(Bid PROPERTIES
+    CXX_VISIBILITY_PRESET hidden
+    COMPILE_WARNING_AS_ERROR Off)

src/external/bson/CMakeLists.txt

@@ -53,3 +53,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
 endif()
 target_include_directories(Bson PUBLIC .. ${PROJECT_BINARY_DIR}/src/external)
 target_compile_definitions(Bson INTERFACE BSON_STATIC)
+
+set_target_properties(Bson PROPERTIES
+    CXX_VISIBILITY_PRESET hidden
+    COMPILE_WARNING_AS_ERROR Off)

src/external/bson/bson-macros.h

@@ -173,8 +173,8 @@
 #endif
 #else
 #if defined(_MSC_VER)
-#define BSON_ALIGNED_BEGIN(_N) __declspec (align (BSON_ALIGN_OF_PTR))
-#define BSON_ALIGNED_END(_N)
+#define BSON_ALIGNED_BEGIN(_N) _Pragma("warning(push)") _Pragma("warning(disable: 4359)") __declspec (align (BSON_ALIGN_OF_PTR))
+#define BSON_ALIGNED_END(_N) _Pragma("warning(pop)")
 #else
 #define BSON_ALIGNED_BEGIN(_N)
 #define BSON_ALIGNED_END(_N) \