From 934af5e69d9d6f2c7e6f1790924b4ee672580e02 Mon Sep 17 00:00:00 2001 From: Nabil Hachicha Date: Fri, 13 Sep 2024 12:48:33 +0100 Subject: [PATCH 1/3] Support Android 15 new page size 16kb (#1834) --- CHANGELOG.md | 1 + packages/cinterop/src/jvm/CMakeLists.txt | 1 + packages/library-base/build.gradle.kts | 6 ++++++ packages/library-sync/build.gradle.kts | 6 ++++++ 4 files changed, 14 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fe5a8254f3..e9c30a0954 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ * 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/packages/cinterop/src/jvm/CMakeLists.txt b/packages/cinterop/src/jvm/CMakeLists.txt index 874f7226d8..34b38838e5 100644 --- 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 index f45b9dec9a..9c75f1a6c8 100644 --- 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 index 9b0410eca7..779a76db52 100644 --- 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 { From 35e46e50b862d12b4e990eb767893f25ca8ab6e3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2024 16:25:30 +0100 Subject: [PATCH 2/3] Release 2.2.0 (#1835) Co-authored-by: Nabil Hachicha --- CHANGELOG.md | 2 +- buildSrc/src/main/kotlin/Config.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e9c30a0954..ddc4f44200 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 2.2.0-SNAPSHOT (YYYY-MM-DD) +## 2.2.0 (2024-09-13) ### Breaking Changes * None. diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt index 3489ef96ad..bc894e6954 100644 --- 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" From 326139a8aa37c971da3ae8ccf2784d35d4fb0793 Mon Sep 17 00:00:00 2001 From: Nabil Hachicha Date: Sat, 14 Sep 2024 10:56:09 +0100 Subject: [PATCH 3/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d9c00250bb..f6bce16713 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [![Gradle Plugin Portal](https://img.shields.io/maven-metadata/v/https/plugins.gradle.org/m2/io/realm/kotlin/io.realm.kotlin.gradle.plugin/maven-metadata.xml.svg?colorB=ff6b00&label=Gradle%20Plugin%20Portal)](https://plugins.gradle.org/plugin/io.realm.kotlin) [![Maven Central](https://img.shields.io/maven-central/v/io.realm.kotlin/gradle-plugin?colorB=4dc427&label=Maven%20Central)](https://search.maven.org/artifact/io.realm.kotlin/gradle-plugin) -[![Kotlin](https://img.shields.io/badge/kotlin-1.8.0-blue.svg?logo=kotlin)](http://kotlinlang.org) +[![Kotlin](https://img.shields.io/badge/kotlin-2.0.0-blue.svg?logo=kotlin)](http://kotlinlang.org) [![License](https://img.shields.io/badge/License-Apache-blue.svg)](https://github.com/realm/realm-kotlin/blob/master/LICENSE)