Merge branch 'master' into support-new-datatypes

# Conflicts:
#	version.txt

Author: Eduardo López

CHANGELOG.md

@@ -1,22 +1,50 @@
-## 10.4.0 (YYYY-MM-DD)
+## 10.4.0 (2021-03-26)
+
+All releases from 10.4.0 and forward are now found on `mavenCentral()` instead of `jcenter()`. 
+
+A minimal supported setup will therefore now look like this:
+
+```
+allprojects {
+    buildscript {
+        repositories {
+            mavenCentral()
+        }
+        dependencies {
+            classpath "io.realm:realm-gradle-plugin:10.4.0"
+        }
+    }
+
+    repositories {
+        mavenCentral()
+    }
+}
+```
+
+`SNAPSHOT` releases have also been moved from `http://oss.jfrog.org/artifactory/oss-snapshot-local`
+to `https://oss.sonatype.org/content/repositories/snapshots/`. See [here](https://github.com/realm/realm-java/blob/master/README.md#using-snapshots)
+for more information.
 
 ### Enhancements
 * Added support for `java.util.UUID` as supported field in model classes.
 * Added support for `java.util.UUID` as a primary key.
 * Added support for the string-based Realm Query Language through `RealmQuery.rawPredicate(...)`. This allows many new type of queries not previously supported by the typed query API. See the Javadoc on this method for further details. (Issue [#6116](https://github.com/realm/realm-java/pull/6116))
+* Performance of sorting on more than one property has been improved. Especially important if many elements match on the first property.
 
 ### Fixes
-* None
+* Calling max/min/sum/avg on a List may give wrong results (Realm Core [#4252](https://github.com/realm/realm-core/issues/4252), since v10.0.0)
+* Fix an issue when using `RealmResults.freeze()` across threads with different transaction versions. Previously, copying the `RealmsResults`' native resource could result in a stale state or objects from a future version. (Realm Core [#4254](https://github.com/realm/realm-core/pull/4254)).
+* On 32-bit devices you may get exception with "No such object" when upgrading to v10.* ([#7314](https://github.com/realm/realm-java/issues/7314), since v10.0.0)
 
 ### 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 commit: df57de0101b5b817f8f4158cf45e11985cd640c2.
+* Updated to Realm Core 10.5.6, commit 92129110dece2cee59839e20be3a7067084a1196.
 * Updated to NDK 22.0.7026061.
-
+* Updated to ReLinker 1.4.3.
 
 ## 10.3.1 (2021-01-28)
 

Dockerfile

@@ -69,10 +69,10 @@ RUN yes | sdkmanager --licenses
 # The `yes` is for accepting all non-standard tool licenses.
 # Please keep all sections in descending order!
 RUN yes | sdkmanager \
-    'build-tools;29.0.3' \
+    'build-tools;30.0.3' \
     'emulator' \
     'extras;android;m2repository' \
-    'platforms;android-29' \
+    'platforms;android-30' \
     'platform-tools' \
     'ndk;22.0.7026061' \
     'system-images;android-29;default;x86'

Jenkinsfile

@@ -18,14 +18,15 @@ enableIntegrationTests = true
 
 // Will store whether or not this build was successful.
 buildSuccess = false
-// Will be set to `true` if this build is a full release that should be available on Bintray.
+// Will be set to `true` if this build is a full release that should be available on Maven Central.
 // This is determined by comparing the current git tag to the version number of the build.
 publishBuild = false
 mongoDbRealmContainer = null
 mongoDbRealmCommandServerContainer = null
 emulatorContainer = null
 dockerNetworkId = UUID.randomUUID().toString()
-currentBranch = env.BRANCH_NAME
+currentBranch = (env.CHANGE_BRANCH == null) ? env.BRANCH_NAME : env.CHANGE_BRANCH
+isReleaseBranch = releaseBranches.contains(currentBranch)
 // FIXME: Always used the emulator until we can enable more reliable devices
 // 'android' nodes have android devices attached and 'brix' are physical machines in Copenhagen.
 // nodeSelector = (releaseBranches.contains(currentBranch)) ? 'android' : 'docker-cph-03' // Switch to `brix` when all CPH nodes work: https://jira.mongodb.org/browse/RCI-14
@@ -50,6 +51,7 @@ try {
 
         // Check type of Build. We are treating this as a release build if we are building
         // the exact Git SHA that was tagged.
+        echo "Building from branch: $currentBranch"
         gitTag = readGitTag()
         echo "Git tag: ${gitTag ?: 'none'}"
         if (!gitTag) {
@@ -83,7 +85,7 @@ try {
         def instrumentationTestTarget = "connectedAndroidTest"
         def deviceSerial = ""
 
-        if (!releaseBranches.contains(currentBranch)) {
+        if (!isReleaseBranch) {
           // Build development branch
           useEmulator = true
           emulatorImage = "system-images;android-29;default;x86"
@@ -225,8 +227,17 @@ try {
 def runBuild(buildFlags, instrumentationTestTarget) {
 
   stage('Build') {
-    sh "chmod +x gradlew"
-    sh "./gradlew assemble ${buildFlags} --stacktrace"
+    withCredentials([
+            [$class: 'StringBinding', credentialsId: 'maven-central-java-ring-file', variable: 'SIGN_KEY'],
+            [$class: 'StringBinding', credentialsId: 'maven-central-java-ring-file-password', variable: 'SIGN_KEY_PASSWORD'],
+    ]) {
+      sh "chmod +x gradlew"
+      def signingFlags = ""
+      if (isReleaseBranch) {
+        signingFlags = "-PsignBuild=true -PsignSecretRingFile=\"${SIGN_KEY}\" -PsignPassword=${SIGN_KEY_PASSWORD}"
+      }
+      sh "./gradlew assemble ${buildFlags} ${signingFlags} --stacktrace"
+    }
   }
 
   stage('Tests') {
@@ -309,16 +320,19 @@ def runBuild(buildFlags, instrumentationTestTarget) {
 
   // TODO: add support for running monkey on the example apps
 
-  if (['master'].contains(currentBranch)) {
+  def collectMetrics = ['master'].contains(currentBranch)
+  echo "Collecting metrics: $collectMetrics"
+  if (collectMetrics) {
     stage('Collect metrics') {
       collectAarMetrics()
     }
   }
 
-  if (releaseBranches.contains(currentBranch) && !publishBuild) {
-    stage('Publish to OJO') {
-      withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'bintray', passwordVariable: 'BINTRAY_KEY', usernameVariable: 'BINTRAY_USER']]) {
-        sh "chmod +x gradlew && ./gradlew -PbintrayUser=${env.BINTRAY_USER} -PbintrayKey=${env.BINTRAY_KEY} ojoUpload ${buildFlags} --stacktrace"
+  echo "Releasing SNAPSHOT: ($isReleaseBranch, $publishBuild)"
+  if (isReleaseBranch && !publishBuild) {
+    stage('Publish SNAPSHOT') {
+      withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'maven-central-credentials', passwordVariable: 'MAVEN_CENTRAL_PASSWORD', usernameVariable: 'MAVEN_CENTRAL_USER']]) {
+        sh "chmod +x gradlew && ./gradlew mavenCentralUpload ${buildFlags} -PossrhUsername='$MAVEN_CENTRAL_USER' -PossrhPassword='$MAVEN_CENTRAL_PASSWORD' --stacktrace"
       }
     }
   }
@@ -329,13 +343,13 @@ def runPublish() {
     withCredentials([
             [$class: 'StringBinding', credentialsId: 'slack-webhook-java-ci-channel', variable: 'SLACK_URL_CI'],
             [$class: 'StringBinding', credentialsId: 'slack-webhook-releases-channel', variable: 'SLACK_URL_RELEASE'],
-            [$class: 'UsernamePasswordMultiBinding', credentialsId: 'bintray', passwordVariable: 'BINTRAY_KEY', usernameVariable: 'BINTRAY_USER'],
+            [$class: 'UsernamePasswordMultiBinding', credentialsId: 'maven-central-credentials', passwordVariable: 'MAVEN_CENTRAL_PASSWORD', usernameVariable: 'MAVEN_CENTRAL_USER'],
             [$class: 'AmazonWebServicesCredentialsBinding', accessKeyVariable: 'DOCS_S3_ACCESS_KEY', credentialsId: 'mongodb-realm-docs-s3', secretKeyVariable: 'DOCS_S3_SECRET_KEY'],
             [$class: 'AmazonWebServicesCredentialsBinding', accessKeyVariable: 'REALM_S3_ACCESS_KEY', credentialsId: 'realm-s3', secretKeyVariable: 'REALM_S3_SECRET_KEY']
     ]) {
       sh """
         set +x
-        sh tools/publish_release.sh '$BINTRAY_USER' '$BINTRAY_KEY' \
+        sh tools/publish_release.sh '$MAVEN_CENTRAL_USER' '$MAVEN_CENTRAL_PASSWORD' \
         '$REALM_S3_ACCESS_KEY' '$REALM_S3_SECRET_KEY' \
         '$DOCS_S3_ACCESS_KEY' '$DOCS_S3_SECRET_KEY' \
         '$SLACK_URL_RELEASE' \

README.md

@@ -39,11 +39,12 @@ If you want to test recent bugfixes or features that have not been packaged in a
 ```
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
         google()
         maven {
-            url 'http://oss.jfrog.org/artifactory/oss-snapshot-local'
+            url 'https://oss.sonatype.org/content/repositories/snapshots/'
         }
+        jcenter()
     }
     dependencies {
         classpath "io.realm:realm-gradle-plugin:<version>-SNAPSHOT"
@@ -52,11 +53,12 @@ buildscript {
 
 allprojects {
     repositories {
-        jcenter()
+        mavenCentral()
         google()
         maven {
-            url 'http://oss.jfrog.org/artifactory/oss-snapshot-local'
+            url 'https://oss.sonatype.org/content/repositories/snapshots/'
         }
+        jcenter()
     }
 }
 ```