Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
NEXT-RELEASE Release notes (YYYY-MM-DD)
2.2.0 Release notes (2024-07-22)
=============================================================

### Fixed
Expand Down Expand Up @@ -34,7 +34,7 @@ NEXT-RELEASE Release notes (YYYY-MM-DD)
* Fileformat: Generates files with format v24. Reads and automatically upgrade from fileformat v10.

### Internals
* Upgraded to Core v14.10.4
* Upgraded to Core v14.11.0

2.1.0 Release notes (2024-06-27)
=============================================================
Expand Down
4 changes: 2 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import PackageDescription

let sdkVersion = Version("2.1.0")
let coreVersion = Version("14.10.4")
let sdkVersion = Version("2.2.0")
let coreVersion = Version("14.11.0")

var cxxSettings: [CXXSetting] = [
.define("REALM_ENABLE_SYNC", to: "1"),
Expand Down
2 changes: 1 addition & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

class cpprealmRecipe(ConanFile):
name = "cpprealm"
version = "2.1.0"
version = "2.2.0"

# Optional metadata
license = "Apache-2.0"
Expand Down
2 changes: 1 addition & 1 deletion dependencies.list
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VERSION=2.1.0
VERSION=2.2.0
2 changes: 1 addition & 1 deletion ports/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cpprealm",
"version": "2.1.0",
"version": "2.2.0",
"description": "Realm is a mobile database that runs directly inside phones, tablets or wearables.",
"homepage": "https://github.com/realm/realm-cpp",
"license": "Apache-2.0",
Expand Down
2 changes: 1 addition & 1 deletion realm-core
Submodule realm-core updated 37 files
+10 −5 CHANGELOG.md
+1 −1 Package.swift
+2 −1 dependencies.yml
+2 −1 evergreen/config.yml
+19 −3 src/realm.h
+5 −0 src/realm/object-store/c_api/app.cpp
+17 −0 src/realm/object-store/c_api/schema.cpp
+2 −0 src/realm/object-store/c_api/sync.cpp
+12 −0 src/realm/object-store/c_api/types.hpp
+19 −0 src/realm/object-store/sync/async_open_task.cpp
+9 −0 src/realm/object-store/sync/async_open_task.hpp
+3 −1 src/realm/object-store/sync/sync_session.hpp
+55 −67 src/realm/sync/client.cpp
+21 −11 src/realm/sync/config.hpp
+12 −0 src/realm/sync/noinst/client_history_impl.cpp
+9 −0 src/realm/sync/noinst/client_history_impl.hpp
+40 −28 src/realm/sync/noinst/client_impl_base.cpp
+15 −12 src/realm/sync/noinst/client_impl_base.hpp
+13 −5 src/realm/sync/noinst/pending_bootstrap_store.cpp
+2 −1 src/realm/sync/noinst/pending_bootstrap_store.hpp
+10 −5 src/realm/sync/noinst/protocol_codec.hpp
+22 −6 src/realm/sync/protocol.hpp
+1 −3 src/realm/sync/tools/apply_to_state_command.cpp
+1 −0 test/object-store/CMakeLists.txt
+72 −32 test/object-store/c_api/c_api.cpp
+1 −16 test/object-store/sync/app.cpp
+109 −19 test/object-store/sync/client_reset.cpp
+1,223 −0 test/object-store/sync/flx_role_change.cpp
+74 −77 test/object-store/sync/flx_sync.cpp
+280 −18 test/object-store/sync/session/progress_notifications.cpp
+84 −36 test/object-store/util/sync/baas_admin_api.cpp
+12 −5 test/object-store/util/sync/baas_admin_api.hpp
+1 −1 test/object-store/util/sync/flx_sync_harness.hpp
+23 −17 test/object-store/util/sync/sync_test_utils.cpp
+12 −0 test/object-store/util/sync/sync_test_utils.hpp
+14 −2 test/object-store/util/test_utils.hpp
+3 −3 test/test_sync_pending_bootstraps.cpp