Skip to content

Commit

Permalink
Merge branch 'main' into cr/core-update
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG.md
  • Loading branch information
Christian Melchior committed Oct 2, 2023
2 parents b85f0e0 + a5a0dd3 commit d8353a0
Show file tree
Hide file tree
Showing 9 changed files with 34 additions and 25 deletions.
24 changes: 1 addition & 23 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,6 @@
### Enhancements
* None.

### Fixed
* None.

### Compatibility
* File format: Generates Realms with format v23. Unsynced Realms will be upgraded from Realm Java 2.0 and later. Synced Realms can only be read and upgraded if created with Realm Java v10.0.0-BETA.1.
* APIs are backwards compatible with all previous release of realm-java in the 10.6.y series.
* Realm Studio 13.0.0 or above is required to open Realms created by this version.
* Gradle 7.5 and above.
* Android Gradle Plugin 7.4.0 and above.

### Internal
* Updated to Realm Core 13.22.0, commit 0b19887b5b25746afaf474fe298e38f450f0486e.


## 10.16.2 (YYYY-MM-DD)

### Breaking Changes
* None.

### Enhancements
* None.

### Fixed
* Rare corruption causing 'Invalid streaming format cookie'-exception. Typically following compact, convert or copying to a new file. (Issue [#7775](https://github.com/realm/realm-java/issues/7775), since v10.13.0 (Core v12.12.0))
* [RealmApp] Crash when opening a Realm with a proxy enabled. (Issue [#7828](https://github.com/realm/realm-java/issues/7828))
Expand All @@ -40,7 +18,7 @@
* Android Gradle Plugin 7.4.0 and above.

### Internal
* Updated to Realm Core 13.17.1, commit 59e874a45bce0217bb7d37abe78ed04cebfba5a0.
* Updated to Realm Core 13.22.0, commit 0b19887b5b25746afaf474fe298e38f450f0486e.


## 10.16.1 (2023-06-26)
Expand Down
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
![Realm](logo.png)
<picture>
<source srcset="./media/logo-dark.svg" media="(prefers-color-scheme: dark)" alt="realm by MongoDB">
<img src="./media/logo.svg" alt="realm by MongoDB">
</picture>

[![Maven Central](https://img.shields.io/maven-central/v/io.realm/realm-gradle-plugin?colorB=4dc427&label=Maven%20Central)](https://search.maven.org/artifact/io.realm/realm-gradle-plugin)
[![License](https://img.shields.io/badge/License-Apache-blue.svg)](https://github.com/realm/realm-java/blob/master/LICENSE)
Expand All @@ -16,6 +19,7 @@ The [Realm Kotlin SDK](https://github.com/realm/realm-kotlin) is now GA and can
* **Simple:** Data is directly exposed as objects and queryable by code, removing the need for ORM's riddled with performance & maintenance issues. Plus, we've worked hard to [keep our API down to very few classes](https://realm.io/docs/java/): most of our users pick it up intuitively, getting simple apps up & running in minutes.
* **Modern:** Realm supports easy thread-safety, relationships & encryption.
* **Fast:** Realm is faster than even raw SQLite on common operations while maintaining an extremely rich feature set.
* **[Device Sync](https://www.mongodb.com/atlas/app-services/device-sync)**: Makes it simple to keep data in sync across users, devices, and your backend in real-time. Get started for free with [a template application](https://github.com/mongodb/template-app-react-native-todo) and [create the cloud backend](http://mongodb.com/realm/register?utm_medium=github_atlas_CTA&utm_source=realm_js_github).

## Getting Started

Expand Down
Binary file removed logo.png
Binary file not shown.
Binary file added media/favicon.ico
Binary file not shown.
1 change: 1 addition & 0 deletions media/logo-dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions media/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 24 additions & 0 deletions tools/fix-h1s.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/bin/bash -ex

usage() {
cat <<EOF
Usage: $0 <javadoc-root-dir>
EOF
}

if [ "$#" -ne 1 ] ; then
usage
exit 1
fi

# Assume Dokka has been run
pushd $1

find . -name "*.html" | while read ln
do
# Make the output SEO friendly by converting the "h2" title to the proper "h1"
sed -i -e 's|<h2\(.* class="title".*\)</h2>|<h1\1</h1>|' "$ln"
done
find . -iname "*.html-e" | xargs rm

popd
1 change: 1 addition & 0 deletions tools/publish_release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ create_javadoc() {
echo "Creating JavaDoc..."
cd $REALM_JAVA_PATH
eval "./gradlew javadoc $GRADLE_BUILD_PARAMS --stacktrace"
eval "./tools/fix-h1s.sh realm/realm-library/build/docs/javadoc/"
cd $HERE
}

Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.16.2-SNAPSHOT
10.17.0-SNAPSHOT

0 comments on commit d8353a0

Please sign in to comment.