Merge branch 'releases'

cmelchior · cmelchior · commit da732419708d · 2022-01-26T16:05:46.000+01:00
# Conflicts:
#	version.txt
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,21 @@
+## 10.10.1 (2022-01-26)
+
+### Enhancements
+* [RealmApp] Add support for setting the filename on Flexible and Partition Sync configurations.
+
+### Fixed
+* [RealmApp] Creating multiple anonymous subscriptions for a Realm would throw an exception.
+
+### Compatibility
+* File format: Generates Realms with format v22. 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.6.y series.
+* Realm Studio 11.0.0-alpha.0 or above is required to open Realms created by this version.
+
+### Internal
+* Updated to Android Gradle Plugin 7.1.0
+* Updated to Gradle 7.3.3.
+
+
 ## 10.10.0 (2022-01-18)
 
 ### Enhancements
diff --git a/dependencies.list b/dependencies.list
@@ -7,13 +7,13 @@ REALM_CORE=11.6.0
 MONGODB_REALM_SERVER=2022-01-17
 
 # Common Android settings across projects
-GRADLE_BUILD_TOOLS=7.1.0-beta05
+GRADLE_BUILD_TOOLS=7.1.0
 ANDROID_BUILD_TOOLS=30.0.3
 KOTLIN=1.5.31
 KOTLIN_COROUTINES=1.5.2
 
 # Common classpath dependencies
-gradle=7.2
+gradle=7.3.3
 ndkVersion=23.1.7779620
 BUILD_INFO_EXTRACTOR_GRADLE=4.17.0
 GRADLE_NEXUS_PLUGIN=1.0.0
diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradle-plugin/gradle/wrapper/gradle-wrapper.properties b/gradle-plugin/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/library-benchmarks/gradle/wrapper/gradle-wrapper.properties b/library-benchmarks/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/library-build-transformer/gradle/wrapper/gradle-wrapper.properties b/library-build-transformer/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/realm-annotations/gradle/wrapper/gradle-wrapper.properties b/realm-annotations/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/realm-transformer/gradle/wrapper/gradle-wrapper.properties b/realm-transformer/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/realm/gradle/wrapper/gradle-wrapper.properties b/realm/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/realm/realm-library/src/androidTestObjectServer/kotlin/io/realm/mongodb/MongoClientTest.kt b/realm/realm-library/src/androidTestObjectServer/kotlin/io/realm/mongodb/MongoClientTest.kt
@@ -684,7 +684,6 @@ class MongoClientTest {
         }
     }
 
-    @Ignore("https://github.com/realm/realm-java/issues/7238")
     @Test
     fun findOneAndUpdate_emptyCollection() {
         with(getCollectionInternal()) {
@@ -693,7 +692,6 @@ class MongoClientTest {
         }
     }
 
-    @Ignore("https://github.com/realm/realm-java/issues/7238")
     @Test
     fun findOneAndUpdate_noUpdates() {
         with(getCollectionInternal()) {
@@ -702,7 +700,6 @@ class MongoClientTest {
         }
     }
 
-    @Ignore("https://github.com/realm/realm-java/issues/7238")
     @Test
     fun findOneAndUpdate_noUpsert() {
         with(getCollectionInternal()) {
@@ -848,7 +845,6 @@ class MongoClientTest {
         }
     }
 
-    @Ignore("https://github.com/realm/realm-java/issues/7238")
     @Test
     fun findOneAndReplace_noUpdates() {
         with(getCollectionInternal()) {
@@ -860,7 +856,6 @@ class MongoClientTest {
         }
     }
 
-    @Ignore("https://github.com/realm/realm-java/issues/7238")
     @Test
     fun findOneAndReplace_noUpsert() {
         with(getCollectionInternal()) {
diff --git a/realm/realm-library/src/androidTestObjectServer/kotlin/io/realm/mongodb/sync/FlexibleSyncConfigurationTests.kt b/realm/realm-library/src/androidTestObjectServer/kotlin/io/realm/mongodb/sync/FlexibleSyncConfigurationTests.kt
@@ -158,4 +158,13 @@ class FlexibleSyncConfigurationTests {
         val config: SyncConfiguration = SyncConfiguration.defaultConfig(user)
         assertTrue(config.syncClientResetStrategy is ManuallyRecoverUnsyncedChangesStrategy)
     }
+
+    @Test
+    fun overrideDefaultPath() {
+        val user: User = createTestUser(app)
+        val config: SyncConfiguration = SyncConfiguration.Builder(user)
+            .name("custom.realm")
+            .build()
+        assertTrue("Path is: ${config.path}", config.path.endsWith("${app.configuration.appId}/${user.id}/custom.realm"))
+    }
 }
diff --git a/realm/realm-library/src/androidTestObjectServer/kotlin/io/realm/mongodb/sync/MutableSubscriptionSetTests.kt b/realm/realm-library/src/androidTestObjectServer/kotlin/io/realm/mongodb/sync/MutableSubscriptionSetTests.kt
@@ -117,6 +117,18 @@ class MutableSubscriptionSetTests {
         assertTrue(sub.updatedAt == sub.createdAt)
     }
 
+    @Test
+    fun add_multiple_anonymous() {
+        realm.subscriptions.update { mutableSubs ->
+            mutableSubs.add(Subscription.create(realm.where<FlexSyncColor>()))
+            mutableSubs.add(Subscription.create(realm.where<FlexSyncColor>().equalTo("section", 10L)))
+            mutableSubs.add(Subscription.create(realm.where<FlexSyncColor>().equalTo("section", 5L)))
+            mutableSubs.add(Subscription.create(realm.where<FlexSyncColor>().equalTo("section", 1L)))
+        }.also { subscriptionSet ->
+            assertEquals(4, subscriptionSet.count())
+        }
+    }
+
     @Test
     fun addExistingAnonymous_throws() {
         realm.subscriptions.update { mutableSubs ->
diff --git a/realm/realm-library/src/androidTestObjectServer/kotlin/io/realm/mongodb/sync/SyncConfigurationTests.kt b/realm/realm-library/src/androidTestObjectServer/kotlin/io/realm/mongodb/sync/SyncConfigurationTests.kt
@@ -711,4 +711,13 @@ class SyncConfigurationTests {
             .inMemory()
         assertFailsWith<IllegalStateException> { builder.assetFile("foo.bar") }
     }
+
+    @Test
+    fun overrideDefaultPath() {
+        val user: User = createTestUser(app)
+        val config: SyncConfiguration = SyncConfiguration.Builder(user, DEFAULT_PARTITION)
+            .name("custom.realm")
+            .build()
+        assertTrue("Path is: ${config.path}", config.path.endsWith("${app.configuration.appId}/${user.id}/custom.realm"))
+    }
 }
diff --git a/realm/realm-library/src/main/cpp/io_realm_internal_objectstore_OsMutableSubscriptionSet.cpp b/realm/realm-library/src/main/cpp/io_realm_internal_objectstore_OsMutableSubscriptionSet.cpp
@@ -45,7 +45,8 @@ JNIEXPORT jlong JNICALL Java_io_realm_internal_objectstore_OsMutableSubscription
         auto subscriptions = reinterpret_cast<sync::MutableSubscriptionSet*>(j_subscription_set_ptr);
         JStringAccessor name(env, j_name);
         auto query = reinterpret_cast<Query*>(j_query);
-        std::pair<sync::SubscriptionSet::iterator, bool> result = subscriptions->insert_or_assign(name, *query);
+        std::pair<sync::SubscriptionSet::iterator, bool> result = name.is_null() ? subscriptions->insert_or_assign(*query) : subscriptions->insert_or_assign(name, *query);
+
         if (j_throw_on_update && !result.second) {
             ThrowException(env, ExceptionKind::IllegalArgument, "Subscription could not be added because it already existed");
             return -1;
diff --git a/realm/realm-library/src/objectServer/java/io/realm/mongodb/sync/SyncConfiguration.java b/realm/realm-library/src/objectServer/java/io/realm/mongodb/sync/SyncConfiguration.java
@@ -729,11 +729,11 @@ private void validateAndSet(URL baseUrl ) {
         }
 
         /**
-         * FIXME: Make public once https://github.com/realm/realm-object-store/pull/1049 is merged.
-         *
          * Sets the filename for the Realm file on this device.
+         *
+         * @param filename name for the Realm file.
          */
-        Builder name(String filename) {
+        public Builder name(String filename) {
             //noinspection ConstantConditions
             if (filename == null || filename.isEmpty()) {
                 throw new IllegalArgumentException("A non-empty filename must be provided");
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-10.11.0-SNAPSHOT
+10.11.0-SNAPSHOT
