Skip to content

Commit 1cf4042

Browse files
Merge remote-tracking branch 'origin/main' into attachmentshelper
2 parents bdf5444 + e20880a commit 1cf4042

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
# Changelog
22

3-
# 1.0.0-Beta.11
3+
# 1.0.0-Beta.12
44

55
- Added attachment sync helpers
66

7+
# 1.0.0-beta.11
8+
9+
- Fix deadlock when `connect()` is called immediately after opening a database.
10+
711
# 1.0.0-Beta.10
812

913
- Added the ability to specify a custom logging implementation

Package.resolved

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"kind" : "remoteSourceControl",
66
"location" : "https://github.com/powersync-ja/powersync-kotlin.git",
77
"state" : {
8-
"revision" : "f306c059580b4c4ee2b36eec3c68f4d5326a454c",
9-
"version" : "1.0.0-BETA29.0"
8+
"revision" : "633a2924f7893f7ebeb064cbcd9c202937673633",
9+
"version" : "1.0.0-BETA30.0"
1010
}
1111
},
1212
{

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ let package = Package(
1717
targets: ["PowerSync"]),
1818
],
1919
dependencies: [
20-
.package(url: "https://github.com/powersync-ja/powersync-kotlin.git", exact: "1.0.0-BETA29.0"),
20+
.package(url: "https://github.com/powersync-ja/powersync-kotlin.git", exact: "1.0.0-BETA30.0"),
2121
.package(url: "https://github.com/powersync-ja/powersync-sqlite-core-swift.git", "0.3.12"..<"0.4.0")
2222
],
2323
targets: [

docs/Release.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@
55
* Confirm every PR you want in the release has been merged into `main`.
66
* Update `CHANGELOG.md` with the changes.
77
* In GitHub actions on GitHub manually run the `Release PowerSync` action. You will be required to update the version and add release notes.
8+
The version string should have the form `1.0.0-beta.x` for beta releases, there should not be a `v` prefix on the tag name.
89
* If the release notes are complicated and don't fit on a single line it is easier to rather update those after the release is completed by updating the release notes in the new release.

0 commit comments

Comments
 (0)