Merge pull request #5134 from realm/merge-f782c5-to-master-4.0

Fix merge from f782c5 to master-4.0

Author: beeender

CHANGELOG.md

@@ -1,3 +1,10 @@
+## 4.0.0-BETA3 (YYYY-MM-DD)
+
+### Internal
+
+* Upgraded to Realm Sync 2.0.0-rc16.
+* Upgraded to Realm Core 3.0.0-rc5.
+
 ## 4.0.0-BETA2 (2017-07-27)
 
 ### Bug Fixes
@@ -52,6 +59,7 @@ and `SyncUser#retrieveInfoForUserAsync` which returns a `SyncUserInfo` with mode
 * [ObjectServer] removed `ObjectServerUser` and its inner classes, in a step to reduce `SyncUser` complexity (#3741).
 * [ObjectServer] changed the `SyncSessionStopPolicy` to `AfterChangesUploaded` to align with other binding and to prevent use cases where the Realm might be deleted before the last changes get synchronized (#5028).
 
+* Upgraded Realm Sync to 1.10.8
 
 ## 3.5.1 (YYYY-MM-DD)
 

dependencies.list

@@ -1,7 +1,7 @@
 # Realm Sync Core release used by Realm Java
 # https://github.com/realm/realm-sync/releases
-REALM_SYNC_VERSION=2.0.0-rc12
-REALM_SYNC_SHA256=5f111903159ee2d74c5418560c72977e91a10e291e23e6a7d9999aa856858ca4
+REALM_SYNC_VERSION=2.0.0-rc16
+REALM_SYNC_SHA256=c20c4e7333f01a3a4ea350cb20b9b7feba95ad4e52d612368b6187b72d518aa1
 
 # Object Server Release used by Integration tests
 # Stable releases:  https://packagecloud.io/realm/realm?filter=debs

realm/realm-library/src/main/cpp/CMakeLists.txt

@@ -114,29 +114,25 @@ if (build_SYNC)
 endif()
 
 # Download openssl lib
-# FIXME sync packed openssl with librealm-sync-android-xxx.a.
-# Remove this check after https://github.com/realm/realm-sync/issues/1469 fixed.
-if (NOT build_SYNC)
-    #string(TOLOWER "${CMAKE_BUILD_TYPE}" openssl_build_TYPE)
-    set(openssl_build_TYPE "release")
-    # FIXME Read the openssl version from core when the core/sync release has that information.
-    set(openssl_VERSION "1.0.2k")
-    set(openssl_FILENAME "openssl-${openssl_build_TYPE}-${openssl_VERSION}-Android-${ANDROID_ABI}")
-    set(openssl_URL "http://static.realm.io/downloads/openssl/${openssl_VERSION}/Android/${ANDROID_ABI}/${openssl_FILENAME}.tar.gz")
-
-    message(STATUS "Downloading OpenSSL...")
-    file(DOWNLOAD "${openssl_URL}" "${PROJECT_BINARY_DIR}/${openssl_FILENAME}.tar.gz")
-
-    message(STATUS "Uncompressing OpenSSL...")
-    execute_process(COMMAND ${CMAKE_COMMAND} -E tar xfz "${PROJECT_BINARY_DIR}/${openssl_FILENAME}.tar.gz"
-        WORKING_DIRECTORY "${PROJECT_BINARY_DIR}")
-
-    message(STATUS "Importing OpenSSL...")
-    include(${PROJECT_BINARY_DIR}/${openssl_FILENAME}/openssl.cmake)
-    get_target_property(openssl_include_DIR crypto INTERFACE_INCLUDE_DIRECTORIES)
-    get_target_property(crypto_LIB crypto IMPORTED_LOCATION)
-    get_target_property(ssl_LIB ssl IMPORTED_LOCATION)
-endif()
+#string(TOLOWER "${CMAKE_BUILD_TYPE}" openssl_build_TYPE)
+set(openssl_build_TYPE "release")
+# FIXME Read the openssl version from core when the core/sync release has that information.
+set(openssl_VERSION "1.0.2k")
+set(openssl_FILENAME "openssl-${openssl_build_TYPE}-${openssl_VERSION}-Android-${ANDROID_ABI}")
+set(openssl_URL "http://static.realm.io/downloads/openssl/${openssl_VERSION}/Android/${ANDROID_ABI}/${openssl_FILENAME}.tar.gz")
+
+message(STATUS "Downloading OpenSSL...")
+file(DOWNLOAD "${openssl_URL}" "${PROJECT_BINARY_DIR}/${openssl_FILENAME}.tar.gz")
+
+message(STATUS "Uncompressing OpenSSL...")
+execute_process(COMMAND ${CMAKE_COMMAND} -E tar xfz "${PROJECT_BINARY_DIR}/${openssl_FILENAME}.tar.gz"
+    WORKING_DIRECTORY "${PROJECT_BINARY_DIR}")
+
+message(STATUS "Importing OpenSSL...")
+include(${PROJECT_BINARY_DIR}/${openssl_FILENAME}/openssl.cmake)
+get_target_property(openssl_include_DIR crypto INTERFACE_INCLUDE_DIRECTORIES)
+get_target_property(crypto_LIB crypto IMPORTED_LOCATION)
+get_target_property(ssl_LIB ssl IMPORTED_LOCATION)
 
 # build application's shared lib
 include_directories(${REALM_CORE_DIST_DIR}/include
@@ -225,7 +221,7 @@ add_library(realm-jni SHARED ${jni_SRC} ${objectstore_SRC} ${objectstore_sync_SR
 add_dependencies(realm-jni jni_headers)
 
 if (build_SYNC)
-    target_link_libraries(realm-jni log android lib_realm_sync)
+    target_link_libraries(realm-jni log android lib_realm_sync crypto ssl)
 else()
     target_link_libraries(realm-jni log android lib_realm_core crypto)
 endif()

realm/realm-library/src/main/cpp/io_realm_internal_SharedRealm.cpp

@@ -40,7 +40,10 @@ using namespace realm::jni_util;
 static_assert(SchemaMode::Automatic ==
                   static_cast<SchemaMode>(io_realm_internal_SharedRealm_SCHEMA_MODE_VALUE_AUTOMATIC),
               "");
-static_assert(SchemaMode::ReadOnly ==
+static_assert(SchemaMode::Immutable ==
+                  static_cast<SchemaMode>(io_realm_internal_SharedRealm_SCHEMA_MODE_VALUE_IMMUTABLE),
+              "");
+static_assert(SchemaMode::ReadOnlyAlternative ==
                   static_cast<SchemaMode>(io_realm_internal_SharedRealm_SCHEMA_MODE_VALUE_READONLY),
               "");
 static_assert(SchemaMode::ResetFile ==

realm/realm-library/src/main/cpp/object-store

@@ -83,13 +83,15 @@ public enum Durability {
     }
 
     private static final byte SCHEMA_MODE_VALUE_AUTOMATIC = 0;
-    private static final byte SCHEMA_MODE_VALUE_READONLY = 1;
-    private static final byte SCHEMA_MODE_VALUE_RESET_FILE = 2;
-    private static final byte SCHEMA_MODE_VALUE_ADDITIVE = 3;
-    private static final byte SCHEMA_MODE_VALUE_MANUAL = 4;
+    private static final byte SCHEMA_MODE_VALUE_IMMUTABLE = 1;
+    private static final byte SCHEMA_MODE_VALUE_READONLY = 2;
+    private static final byte SCHEMA_MODE_VALUE_RESET_FILE = 3;
+    private static final byte SCHEMA_MODE_VALUE_ADDITIVE = 4;
+    private static final byte SCHEMA_MODE_VALUE_MANUAL = 5;
 
     private enum SchemaMode {
         SCHEMA_MODE_AUTOMATIC(SCHEMA_MODE_VALUE_AUTOMATIC),
+        SCHEMA_MODE_IMMUTABLE(SCHEMA_MODE_VALUE_IMMUTABLE),
         SCHEMA_MODE_READONLY(SCHEMA_MODE_VALUE_READONLY),
         SCHEMA_MODE_RESET_FILE(SCHEMA_MODE_VALUE_RESET_FILE),
         SCHEMA_MODE_ADDITIVE(SCHEMA_MODE_VALUE_ADDITIVE),