Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 4 additions & 1 deletion HACKING.md
Original file line number Diff line number Diff line change
Expand Up @@ -292,14 +292,17 @@ 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
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.
Expand Down
4 changes: 3 additions & 1 deletion android-test-app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion lib/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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.")
Expand Down
Loading