Skip to content

Commit

Permalink
RCPP-60 Bump to core 14.4.0 (#184)
Browse files Browse the repository at this point in the history
  • Loading branch information
leemaguire authored Mar 25, 2024
1 parent 4cd8034 commit 15d8612
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 8 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,6 @@ Package.resolved
# Qt demo apps
examples/*.pro.user
docs/html
docs/latex
docs/latex
.idea
realm-core/src/realm/parser/generated
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ X.Y.Z Release notes (YYYY-MM-DD)
* Fileformat: Generates files with format v23. Reads and automatically upgrade from fileformat v5.

### Internals
* Upgraded to Core v14.1.0
* Upgraded to Core v14.4.1

----------------------------------------------

Expand Down
4 changes: 2 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import PackageDescription

let sdkVersion = Version("1.0.0")
let coreVersion = Version("14.1.0")
let coreVersion = Version("14.4.1")

var cxxSettings: [CXXSetting] = [
.define("REALM_ENABLE_SYNC", to: "1"),
Expand Down Expand Up @@ -61,7 +61,7 @@ let package = Package(
targets: ["realm-cpp-sdk"]),
],
dependencies: [
.package(url: "https://github.com/realm/realm-core.git", revision: "08c61e87add15b0d7fcd52c818c43fb4804e1216")
.package(url: "https://github.com/realm/realm-core.git", revision: "374dd672af357732dccc135fecc905406fec3223")
],
targets: [
cppSdkTarget,
Expand Down
2 changes: 1 addition & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def source(self):
git = Git(self)
git.clone(url="https://github.com/realm/realm-cpp", target=".")
git.folder = "."
git.checkout(commit="507162c8036ff91b5726bdd4d7efbb9d3f5539bc")
git.checkout(commit="3f125272f21ec24d8f7f2be767b1100a8ccaa88b")
git.run("submodule update --init --recursive")

def layout(self):
Expand Down
2 changes: 1 addition & 1 deletion realm-core
Submodule realm-core updated 126 files
4 changes: 2 additions & 2 deletions tests/admin_utils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,10 @@ std::string Admin::Session::create_app(bson::BsonArray queryable_fields, std::st
bson::BsonDocument mongodb_service_config;
std::string mongodb_service_type;
if (m_cluster_name) {
mongodb_service_config.append("clusterName", *m_cluster_name);
mongodb_service_config["clusterName"] = *m_cluster_name;
mongodb_service_type = "mongodb-atlas";
} else {
mongodb_service_config.append("uri", "mongodb://localhost:26000");
mongodb_service_config["uri"] = "mongodb://localhost:26000";
mongodb_service_type = "mongodb";
}

Expand Down

0 comments on commit 15d8612

Please sign in to comment.