Merge releases in main

Author: clementetb

CHANGELOG.md

@@ -27,6 +27,38 @@
 * None.
 
 
+## 1.10.2 (2023-07-21)
+
+### Breaking Changes
+* None.
+
+### Enhancements
+* None.
+
+### Fixed
+* `RealmInstant` could be instantiated with invalid arguments. (Issue [#1443](https://github.com/realm/realm-kotlin/issues/1443))
+* `equals` and `hashCode` on unmanaged `RealmList` and `RealmSet` resulted in incorrect values. (Issue [#1454](https://github.com/realm/realm-kotlin/pull/1454))
+* [Sync] HTTP requests were not logged when the log level was set in `RealmLog.level`. (Issue [#1456](https://github.com/realm/realm-kotlin/pull/1456))
+* [Sync] `RealmLog.level` is set to `WARN` after creating an `App` or `Realm` configuration. (Issue [#1456](https://github.com/realm/realm-kotlin/pull/1459))
+
+### Compatibility
+* File format: Generates Realms with file format v23.
+* Realm Studio 13.0.0 or above is required to open Realms created by this version.
+* This release is compatible with the following Kotlin releases:
+  * Kotlin 1.8.0 and above. The K2 compiler is not supported yet.
+  * Ktor 2.1.2 and above.
+  * Coroutines 1.7.0 and above.
+  * AtomicFu 0.18.3 and above.
+  * The new memory model only. See https://github.com/realm/realm-kotlin#kotlin-memory-model-and-coroutine-compatibility
+* Minimum Kbson 0.3.0.
+* Minimum Gradle version: 6.8.3.
+* Minimum Android Gradle Plugin version: 4.1.3.
+* Minimum Android SDK: 16.
+
+### Internal
+* Updated to Realm Core 13.17.0, commit f1e962cd447f8b69f8f7cf46a188b1c6246923c5.
+
+
 ## 1.10.1 (2023-06-30)
 
 ### Breaking Changes

buildSrc/src/main/kotlin/Config.kt

@@ -62,7 +62,7 @@ val HOST_OS: OperatingSystem = findHostOs()
 
 object Realm {
     val ciBuild = (System.getenv("JENKINS_HOME") != null)
-    const val version = "1.11.0-SNAPSHOT"
+    const val version = "1.10.3-SNAPSHOT"
     const val group = "io.realm.kotlin"
     const val projectUrl = "https://realm.io"
     const val pluginPortalId = "io.realm.kotlin"

packages/external/core

@@ -22,6 +22,7 @@ import io.realm.kotlin.internal.REALM_FILE_EXTENSION
 import io.realm.kotlin.internal.platform.PATH_SEPARATOR
 import io.realm.kotlin.internal.realmObjectCompanionOrNull
 import io.realm.kotlin.log.LogLevel
+import io.realm.kotlin.log.RealmLog
 import io.realm.kotlin.log.RealmLogger
 import io.realm.kotlin.types.BaseRealmObject
 import kotlinx.coroutines.CoroutineDispatcher
@@ -225,7 +226,7 @@ public interface Configuration {
 
         // 'name' must be nullable as it is optional when getting SyncClient's default path!
         protected abstract var name: String?
-        protected var logLevel: LogLevel = LogLevel.WARN
+        protected var logLevel: LogLevel = RealmLog.level
         protected var appConfigLoggers: List<RealmLogger> = listOf()
         protected var realmConfigLoggers: List<RealmLogger> = listOf()
         protected var maxNumberOfActiveVersions: Long = Long.MAX_VALUE

packages/library-base/src/commonMain/kotlin/io/realm/kotlin/Configuration.kt

@@ -46,13 +46,21 @@ import kotlin.reflect.KClass
 /**
  * Implementation for unmanaged lists, backed by a [MutableList].
  */
-internal class UnmanagedRealmList<E> : RealmList<E>, InternalDeleteable, MutableList<E> by mutableListOf() {
+internal class UnmanagedRealmList<E>(
+    private val backingList: MutableList<E> = mutableListOf()
+) : RealmList<E>, InternalDeleteable, MutableList<E> by backingList {
     override fun asFlow(): Flow<ListChange<E>> =
         throw UnsupportedOperationException("Unmanaged lists cannot be observed.")
 
     override fun delete() {
         throw UnsupportedOperationException("Unmanaged lists cannot be deleted.")
     }
+
+    override fun toString(): String = "UnmanagedRealmList{${joinToString()}}"
+
+    override fun equals(other: Any?): Boolean = backingList == other
+
+    override fun hashCode(): Int = backingList.hashCode()
 }
 
 /**

packages/library-base/src/commonMain/kotlin/io/realm/kotlin/internal/RealmListInternal.kt

@@ -46,14 +46,22 @@ import kotlin.reflect.KClass
 /**
  * Implementation for unmanaged sets, backed by a [MutableSet].
  */
-internal class UnmanagedRealmSet<E> : RealmSet<E>, InternalDeleteable, MutableSet<E> by mutableSetOf() {
+internal class UnmanagedRealmSet<E>(
+    private val backingSet: MutableSet<E> = mutableSetOf()
+) : RealmSet<E>, InternalDeleteable, MutableSet<E> by backingSet {
     override fun asFlow(): Flow<SetChange<E>> {
         throw UnsupportedOperationException("Unmanaged sets cannot be observed.")
     }
 
     override fun delete() {
         throw UnsupportedOperationException("Unmanaged sets cannot be deleted.")
     }
+
+    override fun toString(): String = "UnmanagedRealmSet{${joinToString()}}"
+
+    override fun equals(other: Any?): Boolean = backingSet == other
+
+    override fun hashCode(): Int = backingSet.hashCode()
 }
 
 /**

packages/library-base/src/commonMain/kotlin/io/realm/kotlin/internal/RealmSetInternal.kt

@@ -65,10 +65,14 @@ public interface RealmInstant : Comparable<RealmInstant> {
          * to either [MIN] or [MAX].
          */
         public fun from(epochSeconds: Long, nanosecondAdjustment: Int): RealmInstant {
+            @Suppress("ComplexCondition")
+            if ((epochSeconds > 0 && nanosecondAdjustment < 0) || (epochSeconds < 0 && nanosecondAdjustment > 0)) {
+                throw IllegalArgumentException("Arguments must be both positive or negative.")
+            }
             val secAdjustment: Long = (nanosecondAdjustment / SEC_AS_NANOSECOND).toLong()
             val nsAdjustment: Int = nanosecondAdjustment % SEC_AS_NANOSECOND
-            var s: Long = epochSeconds + secAdjustment
-            var ns: Int = nsAdjustment
+            val s: Long = epochSeconds + secAdjustment
+            val ns: Int = nsAdjustment
             if (((epochSeconds.xor(s)).and(secAdjustment.xor(s))) < 0) {
                 return if (epochSeconds < 0) MIN else MAX
             }

packages/library-base/src/commonMain/kotlin/io/realm/kotlin/types/RealmInstant.kt

@@ -125,7 +125,7 @@ public interface AppConfiguration {
         private var baseUrl: String = DEFAULT_BASE_URL
         private var dispatcher: CoroutineDispatcher? = null
         private var encryptionKey: ByteArray? = null
-        private var logLevel: LogLevel = LogLevel.WARN
+        private var logLevel: LogLevel? = null
         private var syncRootDirectory: String = appFilesDirectory()
         private var userLoggers: List<RealmLogger> = listOf()
         private var networkTransport: NetworkTransport? = null
@@ -309,8 +309,12 @@ public interface AppConfiguration {
             // configuring logging. This should be removed when `LogConfiguration` is removed.
             val allLoggers = mutableListOf<RealmLogger>()
             allLoggers.addAll(userLoggers)
-            val logConfig = LogConfiguration(this.logLevel, allLoggers)
-            RealmLog.level = logLevel
+
+            val logConfig = this.logLevel?.let {
+                RealmLog.level = it
+                LogConfiguration(it, allLoggers)
+            }
+
             userLoggers.forEach { RealmLog.add(it) }
 
             val appNetworkDispatcherFactory = if (dispatcher != null) {
@@ -324,15 +328,11 @@ public interface AppConfiguration {
 
             val appLogger = ContextLogger("Sdk")
             val networkTransport: (dispatcher: DispatcherHolder) -> NetworkTransport = { dispatcherHolder ->
-                val logger: Logger? = if (logLevel <= LogLevel.DEBUG) {
-                    object : Logger {
-                        override fun log(message: String) {
-                            val obfuscatedMessage = httpLogObfuscator?.obfuscate(message)
-                            appLogger.debug(obfuscatedMessage ?: message)
-                        }
+                val logger: Logger = object : Logger {
+                    override fun log(message: String) {
+                        val obfuscatedMessage = httpLogObfuscator?.obfuscate(message)
+                        appLogger.debug(obfuscatedMessage ?: message)
                     }
-                } else {
-                    null
                 }
                 networkTransport ?: KtorNetworkTransport(
                     // FIXME Add AppConfiguration.Builder option to set timeout as a Duration with default \

packages/library-sync/src/commonMain/kotlin/io/realm/kotlin/mongodb/AppConfiguration.kt

@@ -48,7 +48,7 @@ public class AppConfigurationImpl @OptIn(ExperimentalKBsonSerializerApi::class)
     internal val networkTransportFactory: (dispatcher: DispatcherHolder) -> NetworkTransport,
     override val metadataMode: MetadataMode,
     override val syncRootDirectory: String,
-    public val logger: LogConfiguration,
+    public val logger: LogConfiguration?,
     override val appName: String?,
     override val appVersion: String?,
     internal val bundleId: String,

packages/library-sync/src/commonMain/kotlin/io/realm/kotlin/mongodb/internal/AppConfigurationImpl.kt

@@ -30,7 +30,7 @@ internal fun createClient(timeoutMs: Long, customLogger: Logger?): HttpClient {
         customLogger?.let {
             install(Logging) {
                 logger = customLogger
-                level = LogLevel.BODY
+                level = LogLevel.ALL
             }
         }