From 692d1c43b2d9946bb57ecb7ea17d0dd1a34e5b3e Mon Sep 17 00:00:00 2001 From: Kenneth Geisshirt Date: Wed, 14 Jun 2023 14:08:23 +0200 Subject: [PATCH] [v11] Upgrade to Realm Core v13.14.0 (#5870) * Upgrade to Realm Core v13.14.0 * Simply how to build for Linux --- .github/workflows/pr-realm-js.yml | 10 ++++------ CHANGELOG.md | 8 +++++--- CMakeLists.txt | 6 ++++-- dependencies.list | 2 +- vendor/realm-core | 2 +- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.github/workflows/pr-realm-js.yml b/.github/workflows/pr-realm-js.yml index 6fc6939964..c0b39ab83c 100644 --- a/.github/workflows/pr-realm-js.yml +++ b/.github/workflows/pr-realm-js.yml @@ -13,8 +13,6 @@ jobs: build: name: Build for ${{ matrix.variant.os }} ${{ matrix.variant.arch }} runs-on: ${{ matrix.variant.runner }} - # if container is not set for a variant, this is a noop - container: ${{ matrix.variant.container }} env: REALM_DISABLE_ANALYTICS: 1 NDK_VERSION: 23.2.8568313 @@ -22,9 +20,9 @@ jobs: fail-fast: false matrix: variant: - - { os: linux, runner: ubuntu-latest, arch: x64, artifact-path: prebuilds, test-node: true, test-electron: true, container: "ghcr.io/${{ github.repository }}/linux-x64:master" } - - { os: linux, runner: ubuntu-latest, arch: arm, artifact-path: prebuilds, container: "ghcr.io/${{ github.repository }}/linux-arm:master" } - - { os: linux, runner: ubuntu-latest, arch: arm64, artifact-path: prebuilds, container: "ghcr.io/${{ github.repository }}/linux-arm:master" } + - { os: linux, runner: ubuntu-latest, arch: x64, artifact-path: prebuilds, test-node: true, test-electron: true } + - { os: linux, runner: ubuntu-latest, arch: arm, artifact-path: prebuilds } + - { os: linux, runner: ubuntu-latest, arch: arm64, artifact-path: prebuilds } - { os: windows, runner: windows-latest, arch: x64, artifact-path: prebuilds, test-node: true, test-electron: true } - { os: windows, runner: windows-2019, arch: ia32, artifact-path: prebuilds } - { os: android, runner: ubuntu-latest, arch: x86_64, artifact-path: react-native/android/src/main/jniLibs } @@ -71,7 +69,7 @@ jobs: # On linux, electron requires a connected display. We fake this by giving it a headless environment using xvfb # Relevant issue: https://github.com/juliangruber/browser-run/issues/147 - name: Linux Environment setup - if: ${{ (matrix.variant.runner == 'ubuntu-latest') && (matrix.variant.container == '') }} + if: ${{ (matrix.variant.runner == 'ubuntu-latest') }} run: sudo apt-get install ccache ninja-build - name: Setup Java diff --git a/CHANGELOG.md b/CHANGELOG.md index e2b0b258b4..60619cf56f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,19 +4,21 @@ * None ### Enhancements -* None +* Support sort/distinct based on values from a dictionary e.g. `TRUEPREDICATE SORT(meta['age'])`. ([realm/realm-core#5311](https://github.com/realm/realm-core/pull/5311)) ### Fixed * Partition-Based to Flexible Sync Migration for migrating a client app that uses partition based sync to use flexible sync under the hood if the server has been migrated to flexible sync is officially supported with this release. Any clients using an older version of Realm will receive a "switch to flexible sync" error message when trying to sync with the app. ([realm/realm-core#6554](https://github.com/realm/realm-core/issues/6554), since v11.9.0) * Calling `snapshot()` on a Realm list of primitive types is not supported and now throws. - +* Fixed a potential crash when opening the realm after failing to download a fresh FLX realm during an automatic client reset. ([realm/realm-core#6494](https://github.com/realm/realm-core/issues/6494), since v10.19.5) +* Changing parameters for a query after initialization could lead to a crash. ([realm/realm-core#6674](https://github.com/realm/realm-core/pull/6674), since v10.20.0) +* ### Compatibility * React Native >= v0.71.3 * Realm Studio v14.0.0. * File format: generates Realms with format v23 (reads and upgrades file format v5 or later for non-synced Realm, upgrades file format v10 or later for synced Realms). ### Internal -* Upgraded Realm Core from v13.10.1 to v13.12.0. ([#5811](https://github.com/realm/realm-js/issues/5811) and [#5833](https://github.com/realm/realm-js/issues/5833)) +* Upgraded Realm Core from v13.10.1 to v13.14.0. ([#5811](https://github.com/realm/realm-js/issues/5811), [#5833](https://github.com/realm/realm-js/issues/5833), and [#5868](https://github.com/realm/realm-js/issues/5868)) * Bump sync protocol to v9 to indicate client has fix for client reset error during async open. ([realm/realm-core#6609](https://github.com/realm/realm-core/issues/6609)) * The sync client's user agent has been changed and has now the form `RealmJS/ ( )` where * `sdk version` is the version of Realm JavaScript diff --git a/CMakeLists.txt b/CMakeLists.txt index b76fa36f66..daa10c51aa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,12 +19,14 @@ if(DEFINED CMAKE_JS_VERSION) endif() elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") if(NODE_ARCH STREQUAL "arm") - set(CMAKE_TOOLCHAIN_FILE "${CMAKE_SOURCE_DIR}/vendor/realm-core/tools/cmake/armhf.toolchain.cmake") + set(CMAKE_TOOLCHAIN_FILE "${CMAKE_SOURCE_DIR}/vendor/realm-core/tools/cmake/armv7-linux-gnueabihf.toolchain.cmake") # due to how multiarch works in debian this is needed to link to the correct system libraries set(CMAKE_IGNORE_PATH "/usr/lib/x86_64-linux-gnu") elseif(NODE_ARCH STREQUAL "arm64") - set(CMAKE_TOOLCHAIN_FILE "${CMAKE_SOURCE_DIR}/vendor/realm-core/tools/cmake/aarch64.toolchain.cmake") + set(CMAKE_TOOLCHAIN_FILE "${CMAKE_SOURCE_DIR}/vendor/realm-core/tools/cmake/aarch64-linux-gnu.toolchain.cmake") set(CMAKE_IGNORE_PATH "/usr/lib/x86_64-linux-gnu") + elseif(NODE_ARCH STREQUAL "x86_64") + set(CMAKE_TOOLCHAIN_FILE "${CMAKE_SOURCE_DIR}/vendor/realm-core/tools/cmake/x86_64-linux-gnu.toolchain.cmake") endif() add_link_options(-fuse-ld=gold) add_link_options(-Wl,-z,noexecstack) diff --git a/dependencies.list b/dependencies.list index da816e25ba..2474c093d6 100644 --- a/dependencies.list +++ b/dependencies.list @@ -1,5 +1,5 @@ PACKAGE_NAME=realm-js VERSION=11.9.0 -REALM_CORE_VERSION=13.12.0 +REALM_CORE_VERSION=13.14.0 NAPI_VERSION=5 MDBREALM_TEST_SERVER_TAG=2023-02-23 diff --git a/vendor/realm-core b/vendor/realm-core index 096d9ba1ef..95eb5fc5ad 160000 --- a/vendor/realm-core +++ b/vendor/realm-core @@ -1 +1 @@ -Subproject commit 096d9ba1ef0465fc4e6991a3b99cb99bb75014d7 +Subproject commit 95eb5fc5ad79f066dcb7e624f8e57808d0c15b14