From 290a59525986e5d2d424558d5a726d202091f64b Mon Sep 17 00:00:00 2001 From: Ari Lazier Date: Wed, 21 Oct 2015 19:12:36 -0700 Subject: [PATCH] update to latest core --- RealmJS.xcodeproj/project.pbxproj | 8 ++++---- src/RJSUtil.mm | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/RealmJS.xcodeproj/project.pbxproj b/RealmJS.xcodeproj/project.pbxproj index 1abb8a9c..e4b0e238 100644 --- a/RealmJS.xcodeproj/project.pbxproj +++ b/RealmJS.xcodeproj/project.pbxproj @@ -574,7 +574,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = ": ${REALM_CORE_VERSION:=0.92.1.1} # set to \"current\" to always use the current build\n\necho \"Downloading dependency: core ${REALM_CORE_VERSION}\"\nTMP_DIR=\"$TMPDIR/core_bin\"\nmkdir -p \"${TMP_DIR}\"\nCORE_TMP_TAR=\"${TMP_DIR}/core-${REALM_CORE_VERSION}.tar.bz2.tmp\"\nCORE_TAR=\"${TMP_DIR}/core-${REALM_CORE_VERSION}.tar.bz2\"\nif [ ! -f \"${CORE_TAR}\" ]; then\ncurl -f -L -s \"http://static.realm.io/downloads/core/realm-core-${REALM_CORE_VERSION}.tar.bz2\" -o \"${CORE_TMP_TAR}\" ||\n(echo \"Downloading core failed. Please try again once you have an Internet connection.\" && exit 1)\nmv \"${CORE_TMP_TAR}\" \"${CORE_TAR}\"\nfi\n\n(\ncd \"${TMP_DIR}\"\nrm -rf core\ntar xjf \"${CORE_TAR}\"\nmv core core-${REALM_CORE_VERSION}\n)\n\nrm -rf core-${REALM_CORE_VERSION} core\nmv ${TMP_DIR}/core-${REALM_CORE_VERSION} .\nln -s core-${REALM_CORE_VERSION} core"; + shellScript = ": ${REALM_CORE_VERSION:=0.94.3} # set to \"current\" to always use the current build\n\necho \"Downloading dependency: core ${REALM_CORE_VERSION}\"\nTMP_DIR=\"$TMPDIR/core_bin\"\nmkdir -p \"${TMP_DIR}\"\nCORE_TMP_TAR=\"${TMP_DIR}/core-${REALM_CORE_VERSION}.tar.bz2.tmp\"\nCORE_TAR=\"${TMP_DIR}/core-${REALM_CORE_VERSION}.tar.bz2\"\nif [ ! -f \"${CORE_TAR}\" ]; then\ncurl -f -L -s \"http://static.realm.io/downloads/core/realm-core-${REALM_CORE_VERSION}.tar.bz2\" -o \"${CORE_TMP_TAR}\" ||\n(echo \"Downloading core failed. Please try again once you have an Internet connection.\" && exit 1)\nmv \"${CORE_TMP_TAR}\" \"${CORE_TAR}\"\nfi\n\n(\ncd \"${TMP_DIR}\"\nrm -rf core\ntar xjf \"${CORE_TAR}\"\nmv core core-${REALM_CORE_VERSION}\n)\n\nrm -rf core-${REALM_CORE_VERSION} core\nmv ${TMP_DIR}/core-${REALM_CORE_VERSION} .\nln -s core-${REALM_CORE_VERSION} core"; }; /* End PBXShellScriptBuildPhase section */ @@ -870,7 +870,7 @@ "-isystem", core/include, ); - OTHER_LDFLAGS = "-lrealm-ios"; + OTHER_LDFLAGS = "-lrealm-ios-bitcode"; OTHER_LIBTOOLFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "io.realm.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -903,7 +903,7 @@ "-isystem", core/include, ); - OTHER_LDFLAGS = "-lrealm-ios"; + OTHER_LDFLAGS = "-lrealm-ios-bitcode"; OTHER_LIBTOOLFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "io.realm.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1036,7 +1036,7 @@ "-isystem", core/include, ); - OTHER_LDFLAGS = "-lrealm-ios"; + OTHER_LDFLAGS = "-lrealm-ios-bitcode"; OTHER_LIBTOOLFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "io.realm.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/src/RJSUtil.mm b/src/RJSUtil.mm index 6429cf3d..c64a3f34 100644 --- a/src/RJSUtil.mm +++ b/src/RJSUtil.mm @@ -150,13 +150,13 @@ struct TrueExpression : realm::Expression { return realm::not_found; } void set_table() override {} - const realm::Table* get_table() override { return nullptr; } + const realm::Table* get_table() const override { return nullptr; } }; struct FalseExpression : realm::Expression { size_t find_first(size_t, size_t) const override { return realm::not_found; } void set_table() override {} - const realm::Table* get_table() override { return nullptr; } + const realm::Table* get_table() const override { return nullptr; } }; NSString *operatorName(NSPredicateOperatorType operatorType) @@ -338,7 +338,7 @@ void process_or_group(realm::Query &query, id array, Func&& func) { // Queries can't be empty, so if there's zero things in the OR group // validation will fail. Work around this by adding an expression which // will never find any rows in a table. - query.expression(new FalseExpression); + query.and_query(new FalseExpression); } query.end_group(); @@ -565,7 +565,7 @@ void update_query_with_predicate(NSPredicate *predicate, realm::Schema &schema, query.end_group(); } else { // NSCompoundPredicate's documentation states that an AND predicate with no subpredicates evaluates to TRUE. - query.expression(new TrueExpression); + query.and_query(new TrueExpression); } break; @@ -634,9 +634,9 @@ void update_query_with_predicate(NSPredicate *predicate, realm::Schema &schema, } } else if ([predicate isEqual:[NSPredicate predicateWithValue:YES]]) { - query.expression(new TrueExpression); + query.and_query(new TrueExpression); } else if ([predicate isEqual:[NSPredicate predicateWithValue:NO]]) { - query.expression(new FalseExpression); + query.and_query(new FalseExpression); } else { // invalid predicate type