From 8aee244830a748395acf6437dae3553db6ec72a7 Mon Sep 17 00:00:00 2001
From: Nabil Hachicha <nabil.hachicha@gmail.com>
Date: Wed, 12 Jun 2024 14:12:46 +0100
Subject: [PATCH 1/5] avoid exporting Core's symbols to allow mixing multiple
 SDKs to build statically in the same app

---
 .github/workflows/pr.yml           | 2 ++
 CHANGELOG.md                       | 2 +-
 packages/cinterop/build.gradle.kts | 5 +++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index cf1ec975d8..5274750531 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -149,6 +149,7 @@ jobs:
             -DREALM_ENABLE_SYNC=1 \
             -DREALM_NO_TESTS=1 \
             -DREALM_BUILD_LIB_ONLY=true \
+            -DCMAKE_CXX_VISIBILITY_PRESET=hidden \
             ../../src/jvm
             make -j8
 
@@ -218,6 +219,7 @@ jobs:
           -DCMAKE_BUILD_TYPE=Release `
           -DREALM_ENABLE_SYNC=ON `
           -DREALM_NO_TESTS=1 `
+          -DCMAKE_CXX_VISIBILITY_PRESET=hidden `
           -DVCPKG_TARGET_TRIPLET=x64-windows-static
           cmake --build . --config Release
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e3631ecee3..284d7d7142 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@
 - None.
 
 ### Enhancements
-- None.
+- Avoid exporting Core's symbols so we can build statically Kotlin SDK with other SDKs like Swift in the same project [RKOTLIN-877](https://jira.mongodb.org/browse/RKOTLIN-877).
 
 ### Fixed
 - None.
diff --git a/packages/cinterop/build.gradle.kts b/packages/cinterop/build.gradle.kts
index e3fe1b6f0b..568fc13956 100644
--- a/packages/cinterop/build.gradle.kts
+++ b/packages/cinterop/build.gradle.kts
@@ -470,6 +470,11 @@ fun getSharedCMakeFlags(buildType: BuildType, ccache: Boolean = true): Array<Str
         add("-DREALM_NO_TESTS=1")
         add("-DREALM_BUILD_LIB_ONLY=true")
         add("-DREALM_CORE_SUBMODULE_BUILD=true")
+        // This will prevent exporting Core's symbols. which is useful when combining for example Swift SDK and Kotlin Multiplatform
+        // in the same app. The generated dynamically linked shared Framework from Kotlin/Native can then be linked dynamically into the iOS app (!use_frameworks in Cocoapods)
+        // or statically. This will also reduce the binary size a little bit (avoid storing metadata about exported symbols)
+        // TODO update on Linux as well
+        add("-DCMAKE_CXX_VISIBILITY_PRESET=hidden")
     }
     return args.toTypedArray()
 }

From 5e95b7cbaaa407b1e34364310a8331ef5a43e260 Mon Sep 17 00:00:00 2001
From: Nabil Hachicha <nabil.hachicha@mongodb.com>
Date: Thu, 4 Jul 2024 10:03:21 +0100
Subject: [PATCH 2/5] Update CHANGELOG.md

Co-authored-by: LJ <81748770+elle-j@users.noreply.github.com>
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 284d7d7142..199a9363fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@
 - None.
 
 ### Enhancements
-- Avoid exporting Core's symbols so we can build statically Kotlin SDK with other SDKs like Swift in the same project [RKOTLIN-877](https://jira.mongodb.org/browse/RKOTLIN-877).
+- Avoid exporting Core's symbols so we can statically build the Kotlin SDK with other SDKs like Swift in the same project. (Issue [JIRA](https://jira.mongodb.org/browse/RKOTLIN-877))
 
 ### Fixed
 - None.

From d8514e9fece9eab0ed10ed9629aca0de2cec5ca2 Mon Sep 17 00:00:00 2001
From: Nabil Hachicha <nabil.hachicha@mongodb.com>
Date: Thu, 4 Jul 2024 10:03:30 +0100
Subject: [PATCH 3/5] Update packages/cinterop/build.gradle.kts

Co-authored-by: LJ <81748770+elle-j@users.noreply.github.com>
---
 packages/cinterop/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cinterop/build.gradle.kts b/packages/cinterop/build.gradle.kts
index 568fc13956..2421a226fd 100644
--- a/packages/cinterop/build.gradle.kts
+++ b/packages/cinterop/build.gradle.kts
@@ -470,7 +470,7 @@ fun getSharedCMakeFlags(buildType: BuildType, ccache: Boolean = true): Array<Str
         add("-DREALM_NO_TESTS=1")
         add("-DREALM_BUILD_LIB_ONLY=true")
         add("-DREALM_CORE_SUBMODULE_BUILD=true")
-        // This will prevent exporting Core's symbols. which is useful when combining for example Swift SDK and Kotlin Multiplatform
+        // This will prevent exporting Core's symbols which is useful when combining for example the Swift SDK and Kotlin Multiplatform
         // in the same app. The generated dynamically linked shared Framework from Kotlin/Native can then be linked dynamically into the iOS app (!use_frameworks in Cocoapods)
         // or statically. This will also reduce the binary size a little bit (avoid storing metadata about exported symbols)
         // TODO update on Linux as well

From 4fe2e25167d2a2f010c71c9621fca3626aacf9f4 Mon Sep 17 00:00:00 2001
From: Nabil Hachicha <nabil.hachicha@gmail.com>
Date: Thu, 4 Jul 2024 10:10:45 +0100
Subject: [PATCH 4/5] Remove TODO

---
 packages/cinterop/build.gradle.kts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/cinterop/build.gradle.kts b/packages/cinterop/build.gradle.kts
index 2421a226fd..b18b60f3b5 100644
--- a/packages/cinterop/build.gradle.kts
+++ b/packages/cinterop/build.gradle.kts
@@ -473,7 +473,6 @@ fun getSharedCMakeFlags(buildType: BuildType, ccache: Boolean = true): Array<Str
         // This will prevent exporting Core's symbols which is useful when combining for example the Swift SDK and Kotlin Multiplatform
         // in the same app. The generated dynamically linked shared Framework from Kotlin/Native can then be linked dynamically into the iOS app (!use_frameworks in Cocoapods)
         // or statically. This will also reduce the binary size a little bit (avoid storing metadata about exported symbols)
-        // TODO update on Linux as well
         add("-DCMAKE_CXX_VISIBILITY_PRESET=hidden")
     }
     return args.toTypedArray()

From 91a43d6129710ec44ca3883d091e19bb8ee01e8b Mon Sep 17 00:00:00 2001
From: Nabil Hachicha <nabil.hachicha@gmail.com>
Date: Thu, 4 Jul 2024 10:24:29 +0100
Subject: [PATCH 5/5] revert Core version

---
 packages/external/core | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/external/core b/packages/external/core
index 71f94d75e2..c280bdb175 160000
--- a/packages/external/core
+++ b/packages/external/core
@@ -1 +1 @@
-Subproject commit 71f94d75e25bfc8913fcd93ae8de550b57577a4a
+Subproject commit c280bdb17522323d5c30dc32a2b9efc9dc80ca3b