Merge remote-tracking branch 'origin/main' into nh/kotlin_2_0_20

realm · Sep 14, 2024 · 1d658ef · 1d658ef
2 parents a77f281 + 326139a
commit 1d658ef
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,10 @@
-## 2.2.0-SNAPSHOT (YYYY-MM-DD)
+## 2.3.0-SNAPSHOT (YYYY-MM-DD)
 
 ### Breaking Changes
 * None.
 
 ### Enhancements
+* Support Android 15 page size 16 KB. (Issue [#1787](https://github.com/realm/realm-kotlin/issues/1787) [JIRA](https://jira.mongodb.org/browse/RKOTLIN-1105)).
 * Reduce the size of the local transaction log produced by creating objects, improving the performance of insertion-heavy transactions (Core issue [realm/realm-core#7734](https://github.com/realm/realm-core/pull/7734)).
 * Performance has been improved for range queries on integers and timestamps. Requires that you use the "BETWEEN" operation in RQL or the Query::between() method when you build the query. (Core issue [realm/realm-core#7785](https://github.com/realm/realm-core/pull/7785))
 * Updated bundled OpenSSL version to 3.3.1 (Core issue [realm/realm-core#7947](https://github.com/realm/realm-core/pull/7947)).

diff --git a/README.md b/README.md
@@ -1,11 +1,3 @@
-
-> [!WARNING]
-We announced the deprecation of Atlas Device Sync + Realm SDKs in September 2024. For more information please see:
-> - [SDK Deprecation](https://www.mongodb.com/docs/atlas/device-sdks/device-sdk-deprecation)
-> - [Device Sync Deprecation](https://www.mongodb.com/docs/atlas/app-services/sync/device-sync-deprecation)
->
-> For a version of `realm-kotlin` without sync features, install version 3.0.0 or see the `community` branch.
-
 <picture>
     <source srcset="./images/logo-dark.svg" media="(prefers-color-scheme: dark)" alt="realm by MongoDB">
     <img src="./images/logo.svg" alt="realm by MongoDB">

diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt
@@ -62,7 +62,7 @@ val HOST_OS: OperatingSystem = findHostOs()
 
 object Realm {
     val ciBuild = (System.getenv("CI") != null)
-    const val version = "2.2.0-SNAPSHOT"
+    const val version = "2.2.0"
     const val group = "io.realm.kotlin"
     const val projectUrl = "https://realm.io"
     const val pluginPortalId = "io.realm.kotlin"

diff --git a/packages/cinterop/src/jvm/CMakeLists.txt b/packages/cinterop/src/jvm/CMakeLists.txt
@@ -40,6 +40,7 @@ if(ANDROID)
     if (CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
         set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-gc-sections -Wl,--exclude-libs,ALL")
     endif()
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,max-page-size=16384")
 endif()
 
 file(GLOB jni_SRC

diff --git a/packages/library-base/build.gradle.kts b/packages/library-base/build.gradle.kts
@@ -178,6 +178,12 @@ android {
     buildFeatures {
         buildConfig = false
     }
+
+    packagingOptions {
+        jniLibs {
+            useLegacyPackaging = true
+        }
+    }
 }
 
 realmPublish {

diff --git a/packages/library-sync/build.gradle.kts b/packages/library-sync/build.gradle.kts
@@ -165,6 +165,12 @@ android {
     buildFeatures {
         buildConfig = false
     }
+
+    packagingOptions {
+        jniLibs {
+            useLegacyPackaging = true
+        }
+    }
 }
 
 realmPublish {