diff --git a/CHANGELOG.md b/CHANGELOG.md index de38780..31cc4fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +## 0.0.8 + +* Update the rust `automerge` library to `0.7.1`. This dramatically improves + memory use as well as containing many bug fixes. +* Add support for windows ARM +* Fix bug where ARM libraries for Linux were not loaded correctly +* Fix a bug where some methods would return nonsensical results on windows +* Support Java 8 +* Fix a bug where generating patches which contained conflicts could crash + ## 0.0.7 * Update the rust `automerge` library to 0.5.7. This introduces some performance diff --git a/HACKING.md b/HACKING.md index 1057ca0..490abfd 100644 --- a/HACKING.md +++ b/HACKING.md @@ -292,7 +292,7 @@ Both `lib/build.gradle.kts` and `android/build.gradle.kts` use the `publish-on-c #### 1. Prepare the Release -Update version in both Gradle build files: +Update version in the Gradle build files: ```bash # lib/build.gradle.kts @@ -300,6 +300,9 @@ version = "0.0.8" # android/build.gradle.kts version = "0.0.8" + +# android-test-app/build.gradle.kts +var projectVersion = "0.0.8" ``` Note: The Rust `Cargo.toml` version is only used for the native library filename suffix and doesn't need to match the Maven version. diff --git a/android-test-app/build.gradle.kts b/android-test-app/build.gradle.kts index 75664e7..3c750b8 100644 --- a/android-test-app/build.gradle.kts +++ b/android-test-app/build.gradle.kts @@ -2,6 +2,8 @@ plugins { id("com.android.application") version "8.13.0" } +var projectVersion = "0.0.8" + android { namespace = "org.automerge.testapp" compileSdkVersion = "android-26" @@ -43,7 +45,7 @@ dependencies { if (useBuiltArtifacts) { // CI mode: Use built JAR and AAR as file dependencies // This tests the actual artifacts that would be published - implementation(files("../lib/build/libs/automerge-0.0.7.jar")) + implementation(files("../lib/build/libs/automerge-${projectVersion}.jar")) implementation(files("../android/build/outputs/aar/android-release.aar")) } else { // Local dev mode: Use project dependencies diff --git a/android/build.gradle.kts b/android/build.gradle.kts index 63ab812..3aec048 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -51,7 +51,7 @@ repositories { } group = "org.automerge" -version = "0.0.7" +version = "0.0.8" publishOnCentral { projectDescription.set("Shared libraries for automerge on android") diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts index 830a4f6..2c60d29 100644 --- a/lib/build.gradle.kts +++ b/lib/build.gradle.kts @@ -72,7 +72,7 @@ spotless { } group = "org.automerge" -version = "0.0.7" +version = "0.0.8" publishOnCentral { projectDescription.set("Automerge is a JSON-like data structure that can be modified concurrently by different users, and merged again automatically.")