Consume monorepo core binaries

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "realm/realm-library/src/main/cpp/object-store"]
-	path = realm/realm-library/src/main/cpp/object-store
-	url = https://github.com/realm/realm-object-store.git
+[submodule "realm/realm-library/src/main/cpp/realm-core"]
+	path = realm/realm-library/src/main/cpp/realm-core
+	url = https://github.com/realm/realm-core.git

CHANGELOG.md

@@ -1,3 +1,22 @@
+## 10.3.0 (YYYY-MM-DD)
+
+### Enhancements
+* None.
+
+### Fixes
+* [RealmApp] Integrating a remote Sync changeset into the local Realm could result on an `Index out of range error`.
+* Change notifications not fired when removing and adding an object with the same PK within a transaction (Issue [#7098](https://github.com/realm/realm-java/issues/7098)).
+
+### Compatibility
+* File format: Generates Realms with format v20. Unsynced Realms will be upgraded from Realm Java 2.0 and later. Synced Realms can only be read and upgraded if created with Realm Java v10.0.0-BETA.1.
+* APIs are backwards compatible with all previous release of realm-java in the 10.x.y series.
+* Realm Studio 10.0.0 or above is required to open Realms created by this version.
+
+### Internal
+* Updated to Realm Core: 10.3.3 (Monorepo).
+* Updated to Realm Core commit: 8af0f8d609491986b49f2c986e771d9dc445664d.
+
+
 ## 10.2.0 (2020-12-02)
 
 ### Deprecated

Dockerfile

@@ -48,6 +48,7 @@ RUN DEBIAN_FRONTEND=noninteractive \
                           virt-manager \
                           wget \
                           zip \
+                          ninja-build \
     && apt-get clean
 
 # Install the Android SDK
@@ -69,7 +70,6 @@ RUN yes | sdkmanager --licenses
 # Please keep all sections in descending order!
 RUN yes | sdkmanager \
     'build-tools;29.0.3' \
-    'cmake;3.6.4111459' \
     'emulator' \
     'extras;android;m2repository' \
     'platforms;android-29' \
@@ -79,3 +79,10 @@ RUN yes | sdkmanager \
 
 # Make the SDK universally writable
 RUN chmod -R a+rwX ${ANDROID_HOME}
+
+# Ensure a new enough version of CMake is available.
+RUN cd /opt \
+    && wget -nv https://cmake.org/files/v3.18/cmake-3.18.4-Linux-x86_64.tar.gz \
+    && tar zxf cmake-3.18.4-Linux-x86_64.tar.gz
+
+ENV PATH "/opt/cmake-3.18.4-Linux-x86_64/bin:$PATH"

Jenkinsfile

@@ -75,14 +75,14 @@ try {
         //   on an actual device.
         def useEmulator = false
         def emulatorImage = ""
-        def abiFilter = ""
+        def buildFlags = ""
         def instrumentationTestTarget = "connectedAndroidTest"
         def deviceSerial = ""
         if (!releaseBranches.contains(currentBranch)) {
           // Build development branch
           useEmulator = true
           emulatorImage = "system-images;android-29;default;x86"
-          abiFilter = "-PbuildTargetABIs=x86"
+          buildFlags = "-PbuildTargetABIs=x86 -PenableLTO=false -PbuildCore=false"
           instrumentationTestTarget = "connectedObjectServerDebugAndroidTest"
           deviceSerial = "emulator-5554"
         } else {
@@ -91,6 +91,7 @@ try {
           //  But still build all ABI's and run all types of tests. 
           useEmulator = true
           emulatorImage = "system-images;android-29;default;x86"
+          buildFlags = "-PenableLTO=true -PbuildCore=true"
           instrumentationTestTarget = "connectedAndroidTest"
           deviceSerial = "emulator-5554"
         }
@@ -151,12 +152,12 @@ try {
                 // Need to go to ANDROID_HOME due to https://askubuntu.com/questions/1005944/emulator-avd-does-not-launch-the-virtual-device
                 sh "cd \$ANDROID_HOME/tools && emulator -avd CIEmulator -no-boot-anim -no-window -wipe-data -noaudio -partition-size 4098 &"
                 try {
-                  runBuild(abiFilter, instrumentationTestTarget)
+                  runBuild(buildFlags, instrumentationTestTarget)
                 } finally {
                   sh "adb emu kill"
                 }
               } else {
-                runBuild(abiFilter, instrumentationTestTarget)
+                runBuild(buildFlags, instrumentationTestTarget)
               }
 
               // Release the library if needed
@@ -214,17 +215,17 @@ try {
 }
 
 // Runs all build steps
-def runBuild(abiFilter, instrumentationTestTarget) {
+def runBuild(buildFlags, instrumentationTestTarget) {
 
   stage('Build') {
     sh "chmod +x gradlew"
-    sh "./gradlew assemble ${abiFilter} --stacktrace"
+    sh "./gradlew assemble ${buildFlags} --stacktrace"
   }
 
   stage('Tests') {
     parallel 'JVM' : {
       try {
-        sh "chmod +x gradlew && ./gradlew check ${abiFilter} --stacktrace"
+        sh "chmod +x gradlew && ./gradlew check ${buildFlags} --stacktrace"
       } finally {
         storeJunitResults 'realm/realm-annotations-processor/build/test-results/test/TEST-*.xml'
         storeJunitResults 'examples/unitTestExample/build/test-results/**/TEST-*.xml'
@@ -241,7 +242,7 @@ def runBuild(abiFilter, instrumentationTestTarget) {
     },
     'Static code analysis' : {
       try {
-        gradle('realm', "spotbugsMain pmd checkstyle ${abiFilter}")
+        gradle('realm', "spotbugsMain pmd checkstyle ${buildFlags}")
       } finally {
         publishHTML(target: [
           allowMissing: false, 
@@ -277,7 +278,7 @@ def runBuild(abiFilter, instrumentationTestTarget) {
         try {
           backgroundPid = startLogCatCollector()
           forwardAdbPorts()
-          gradle('realm', "${instrumentationTestTarget} ${abiFilter}")
+          gradle('realm', "${instrumentationTestTarget} ${buildFlags}")
         } finally {
           stopLogCatCollector(backgroundPid)
           storeJunitResults 'realm/realm-library/build/outputs/androidTest-results/connected/**/TEST-*.xml'
@@ -295,7 +296,7 @@ def runBuild(abiFilter, instrumentationTestTarget) {
       }
     },
     'JavaDoc': {
-      sh "./gradlew javadoc ${abiFilter} --stacktrace"
+      sh "./gradlew javadoc ${buildFlags} --stacktrace"
     }
   }
 

LICENSE

@@ -1,8 +1,7 @@
 TABLE OF CONTENTS
 
 1. Apache License version 2.0
-2. Realm Components
-3. Export Compliance
+2. Export Compliance
 
 1. -------------------------------------------------------------------------------
 
@@ -183,49 +182,6 @@ TABLE OF CONTENTS
 
 2. -------------------------------------------------------------------------------
 
-REALM COMPONENTS
-
-This software contains components with separate copyright and license terms.
-Your use of these components is subject to the terms and conditions of the
-following licenses.
-
-For the Realm Platform Extensions component
-
-  Realm Platform Extensions License
-
-  Copyright (c) 2011-2017 Realm Inc All rights reserved
-
-  Redistribution and use in binary form, with or without modification, is
-  permitted provided that the following conditions are met:
-
-  1. You agree not to attempt to decompile, disassemble, reverse engineer or
-  otherwise discover the source code from which the binary code was derived.
-  You may, however, access and obtain a separate license for most of the
-  source code from which this Software was created, at
-  http://realm.io/pricing/.
-
-  2. Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-  3. Neither the name of the copyright holder nor the names of its
-  contributors may be used to endorse or promote products derived from this
-  software without specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-  POSSIBILITY OF SUCH DAMAGE.
-
-3. -------------------------------------------------------------------------------
-
 EXPORT COMPLIANCE
 
 You understand that the Software may contain cryptographic functions that may be

README.md

@@ -66,34 +66,24 @@ In case you don't want to use the precompiled version, you can build Realm yours
 ### Prerequisites
 
  * Download the [**JDK 8**](http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html) from Oracle and install it.
- * The latest stable version of Android Studio. Currently [3.6.2](https://developer.android.com/studio/).
- * Download & install the Android SDK **Build-Tools 28.0.3**, **Android Pie (API 28)** (for example through Android Studio’s **Android SDK Manager**).
- * Install CMake from SDK manager in Android Studio ("SDK Tools" -> "CMake").
- * Install the NDK (currently r21) from the SDK Manager in Android Studio or using the [website](https://developer.android.com/ndk/downloads). If downloaded 
-You may unzip the file wherever you choose.  For macOS, a suggested location is `~/Library`.  The download will unzip as the directory `android-ndk-r21`.
+ * The latest stable version of Android Studio. Currently [4.1.1](https://developer.android.com/studio/).
+ * Download & install the Android SDK **Build-Tools 29.0.3**, **Android Pie (API 29)** (for example through Android Studio’s **Android SDK Manager**).
+ * Install CMake version 3.18.2 and build Ninja.
+ * Install the NDK (Side-by-side) **21.0.6113669** from the SDK Manager in Android Studio. Remember to check `☑  Show package details` in the manager to display all available versions.
 
- * If you will be building with Android Studio, you will need to tell it to use the correct NDK.  If you installed it using the SDK Manager, it will automatically be detected. Otherwise, you need to define the variable `ndk.dir` in `realm/local.properties` and assign it the full pathname of the directory that you unzipped above.  Note that there is a `local.properites` in the root directory that is *not* the one that needs to be edited.
+ * Add the Android home environment variable to your profile:
 
     ```
-    ndk.dir=/Users/<username>/Library/android-sdk/ndk/21.0.6113669
-
-    ```
-
- * Add two environment variables to your profile (presuming you installed the NDK using the SDK Manager):
-
-    ```
-    export ANDROID_HOME=~/Library/android-sdk
-    export ANDROID_NDK_HOME=~/Library/android-sdk/ndk/21.0.6113669
+    export ANDROID_HOME=~/Library/Android/sdk
     ```
 
- * If you are launching Android Studio from the macOS Finder, you should also run the following two commands:
+ * If you are launching Android Studio from the macOS Finder, you should also run the following command:
 
     ```
     launchctl setenv ANDROID_HOME "$ANDROID_HOME"
-    launchctl setenv ANDROID_NDK_HOME "$ANDROID_NDK_HOME"
     ```
 
- * If you'd like to specify the location in which to store the archives of Realm Core, define the `REALM_CORE_DOWNLOAD_DIR` environment variable. It enables you to keep Core's archive when executing `git clean -xfd`.
+ * If you'd like to specify the location in which to store the archives of Realm Core, define the `REALM_CORE_DOWNLOAD_DIR` environment variable. It enables caching core release artifacts.
 
    ```
    export REALM_CORE_DOWNLOAD_DIR=~/.realmCore
@@ -109,7 +99,7 @@ It would be a good idea to add all of the symbol definitions (and their accompan
 
  * If you develop Realm Java with Android Studio, we recommend you to exclude some directories from indexing target by executing following steps on Android Studio. It really speeds up indexing phase after the build.
 
-    - Under `/realm/realm-library/`, select `build`, `.externalNativeBuild` and `distribution` folders in `Project` view.
+    - Under `/realm/realm-library/`, select `build`, `.cxx` and `distribution` folders in `Project` view.
     - Press `Command + Shift + A` to open `Find action` dialog. If you are not using default keymap nor using macOS, you can find your shortcut key in `Keymap` preference by searching `Find action`.
     - Search `Excluded` (not `Exclude`) action and select it. Selected folder icons should become orange (in default theme).
     - Restart Android Studio.
@@ -147,22 +137,28 @@ The full build may take an hour or more, to complete.
 
 ### Building from source
 
-It is possible to build Realm Java against a local checked out version of Realm Core. This is done by providing the following parameter when building: `-PcoreSourcePath=<path>`.
+It is possible to build Realm Java with the submodule version of Realm Core. This is done by providing the following parameter when building: `-PbuildCore=true`.
 
-E.g in the case where the `realm-java` and `realm-core` repos are checked out next to each other you can build from source using:
+```
+./gradlew assembleBase -PbuildCore=true
+```
+
+You can turn off interprocedural optimizations with the following parameter: `-PenableLTO=false`. 
 
 ```
-git clone https://github.com/realm/realm-java.git
-git clone https://github.com/realm/realm-core.git
-cd realm-java/realm
-./gradlew assembleBase -PcoreSourcePath=../../realm-core
+./gradlew assembleBase -PenableLTO=false`
 ```
 
-Note: If the `realm-core` project has already been compiled for non-Android builds and CMake files have been generated, this might conflict with `realm-java` trying to build it. Cleanup the `realm-core` project by calling `git clean -xfd` inside it (beware that all unsaved changes will be lost).
+Note: Building the `Base` variant would always build realm-core.
+
+Note: Interprocedural optimizations are enabled by default.
 
-Note: Building from source with Realm Sync is not enabled yet. Only building the `Base` variant is supported.
+Note: If you want to build from source inside Android Studio, you need to update the Gradle parameters by going into the Realm projects settings `Settings > Build, Execution, Deployment > Compiler > Command-line options` and add `-PbuildCore=true` or `-PenableLTO=false` to it. Alternatively you can add it into your `gradle.properties`:
 
-Note: If you want to build from source inside Android Studio, you need to update the Gradle parameters by going into the Realm projects settings `Settings > Build, Execution, Deployment > Compiler > Command-line options` and add `-PcoreSourcePath=<path>` to it.
+```
+buildCore=true
+enableLTO=false
+```
 
 Note: If building on OSX you might like to prevent Gatekeeper to block all NDK executables by disabling it: `sudo spctl --master-disable`. Remember to enable it afterwards: `sudo spctl --master-enable`
 

build.gradle

@@ -40,6 +40,9 @@ def copyProperties = {
     if (project.hasProperty('s3cfg')) {
         startParameter.projectProperties += [s3cfg: project.getProperty('s3cfg')]
     }
+    if (project.hasProperty('enableLTO')) {
+        startParameter.projectProperties += [enableLTO: project.getProperty('enableLTO')]
+    }
 }
 
 task assembleAnnotations(type:GradleBuild) {

dependencies.list

@@ -1,7 +1,6 @@
 # Realm Sync release used by Realm Java (This includes Realm Core)
 # https://github.com/realm/realm-sync/releases
-REALM_SYNC=10.1.4
-REALM_SYNC_SHA256=f838a27402c5b5243280102014defd844420abba66eb93c10334507d9c0fd513
+REALM_CORE=10.3.3
 
 # Version of MongoDB Realm used by integration tests
 # See https://github.com/realm/ci/packages/147854 for available versions
@@ -18,6 +17,7 @@ gradle=6.5
 ndkVersion=21.0.6113669
 BUILD_INFO_EXTRACTOR_GRADLE=4.17.0
 GRADLE_BINTRAY_PLUGIN=1.8.5
+CMAKE=3.18.4
 
 # Bson dependency version
 BSON_DEPENDENCY=3.12.1

realm-transformer/build.gradle

@@ -26,7 +26,7 @@ version = file("${projectDir}/../version.txt").text.trim()
 def properties = new Properties()
 properties.load(new FileInputStream("${projectDir}/../dependencies.list"))
 
-def syncVersion = properties.getProperty('REALM_SYNC')
+def coreVersion = properties.getProperty('REALM_CORE')
 
 sourceCompatibility = '1.8'
 targetCompatibility = '1.8'
@@ -67,7 +67,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
 task generateVersionClass(type: Copy) {
     from 'src/main/templates/Version.java'
     into 'build/generated-src/main/java/io/realm/transformer'
-    filter(ReplaceTokens, tokens: [version: version, syncVersion: syncVersion])
+    filter(ReplaceTokens, tokens: [version: version, coreVersion: coreVersion])
     outputs.upToDateWhen { false }
 }
 

realm-transformer/src/main/templates/Version.java

@@ -2,5 +2,5 @@
 
 public class Version {
     public static final String VERSION = "@version@";
-    public static final String SYNC_VERSION = "@syncVersion@";
+    public static final String SYNC_VERSION = "@coreVersion@";
 }