From 743feafd4809d81fd904ce5d8b6a13d7b2fd3375 Mon Sep 17 00:00:00 2001 From: Ralf Kistner Date: Mon, 29 Jan 2024 14:01:23 +0200 Subject: [PATCH 1/6] Add MinimumOSVersion=11.0 --- Cargo.lock | 8 ++++---- build-pod.sh | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2d74af01..31790c7f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -205,7 +205,7 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "powersync_core" -version = "0.1.4" +version = "0.1.5" dependencies = [ "bytes", "num-derive", @@ -218,7 +218,7 @@ dependencies = [ [[package]] name = "powersync_loadable" -version = "0.1.4" +version = "0.1.5" dependencies = [ "powersync_core", "sqlite_nostd", @@ -226,7 +226,7 @@ dependencies = [ [[package]] name = "powersync_sqlite" -version = "0.1.4" +version = "0.1.5" dependencies = [ "cc", "powersync_core", @@ -331,7 +331,7 @@ checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" [[package]] name = "sqlite3" -version = "0.1.4" +version = "0.1.5" dependencies = [ "cc", ] diff --git a/build-pod.sh b/build-pod.sh index d88efe8d..e8ce2c05 100755 --- a/build-pod.sh +++ b/build-pod.sh @@ -25,6 +25,8 @@ function createXcframework() { FMWK CFBundleSignature ???? + MinimumOSVersion + 11.0 EOF From 828d27db69ff2c85c14d95e82989fd6f9985c2a8 Mon Sep 17 00:00:00 2001 From: Ralf Kistner Date: Tue, 30 Jan 2024 09:27:35 +0200 Subject: [PATCH 2/6] Add more required properties. --- RELEASING.md | 2 ++ build-pod.sh | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/RELEASING.md b/RELEASING.md index ded33002..d8870476 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -5,6 +5,8 @@ Bump the version number in these places: 1. Cargo.toml 2. powersync-sqlite-core.podspec. 3. android/build.gradle.kts +4. build-pod.sh - CFBundleVersion and CFBundleShortVersionString. +5. `cargo build` to update Cargo.lock Create a tag: diff --git a/build-pod.sh b/build-pod.sh index e8ce2c05..1a5868af 100755 --- a/build-pod.sh +++ b/build-pod.sh @@ -27,6 +27,10 @@ function createXcframework() { ???? MinimumOSVersion 11.0 + CFBundleVersion + 0.1.5 + CFBundleShortVersionString + 0.1.5 EOF From fb73541db31733194336449a0312ef12bcfa7f16 Mon Sep 17 00:00:00 2001 From: Ralf Kistner Date: Tue, 30 Jan 2024 10:07:50 +0200 Subject: [PATCH 3/6] Update repo URL. --- android/build.gradle.kts | 8 ++++---- powersync-sqlite-core.podspec | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/android/build.gradle.kts b/android/build.gradle.kts index b4b756a6..07f41a80 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -84,7 +84,7 @@ publishing { pom { name.set(project.name) description.set(project.description) - url.set("https://github.com/journeyapps/powersync-sqlite-core") + url.set("https://github.com/powersync-ja/powersync-sqlite-core") developers { developer { @@ -102,9 +102,9 @@ publishing { } scm { - connection.set("scm:git:github.com/journeyapps/powersync-sqlite-core.git") - developerConnection.set("scm:git:ssh://github.com/journeyapps/powersync-sqlite-core.git") - url.set("https://github.com/journeyapps/powersync-sqlite-core") + connection.set("scm:git:github.com/powersync-ja/powersync-sqlite-core.git") + developerConnection.set("scm:git:ssh://github.com/powersync-ja/powersync-sqlite-core.git") + url.set("https://github.com/powersync-ja/powersync-sqlite-core") } } } diff --git a/powersync-sqlite-core.podspec b/powersync-sqlite-core.podspec index 862a24c3..5218e59c 100644 --- a/powersync-sqlite-core.podspec +++ b/powersync-sqlite-core.podspec @@ -6,11 +6,11 @@ Pod::Spec.new do |s| PowerSync extension for SQLite. DESC - s.homepage = 'https://github.com/journeyapps/powersync-sqlite-core' + s.homepage = 'https://github.com/powersync-ja/powersync-sqlite-core' s.license = 'Apache License, Version 2.0' s.author = 'Journey Mobile, Inc.' - s.source = { :http => "https://github.com/journeyapps/powersync-sqlite-core/releases/download/v#{s.version}/powersync-sqlite-core.xcframework.tar.xz" } + s.source = { :http => "https://github.com/powersync-ja/powersync-sqlite-core/releases/download/v#{s.version}/powersync-sqlite-core.xcframework.tar.xz" } s.vendored_frameworks = 'powersync-sqlite-core.xcframework' From da8707f68e970f501e7ab6dcf02675743c6bf430 Mon Sep 17 00:00:00 2001 From: Ralf Kistner Date: Tue, 30 Jan 2024 10:12:46 +0200 Subject: [PATCH 4/6] Update the release instructions. --- RELEASING.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/RELEASING.md b/RELEASING.md index d8870476..025eb53c 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -27,8 +27,7 @@ The above does the following: 1. Create a draft GitHub release. 2. Build the xcframework for iOS and macOS, and upload to GitHub (attached to the above release). -3. Publish the cocoapod for iOS and macOS. -4. Build and publish an Android aar to Sonatype staging. +3. Build and publish an Android aar to Sonatype staging. Once that is done, go to the Maven staging repository, and "Close", wait, and "Release" the repository: @@ -38,3 +37,9 @@ https://s01.oss.sonatype.org/#stagingRepositories Docs: https://central.sonatype.org/publish/release/ Go to GitHub Releases on the repository, update the description, then "Publish Release". + +Publish the cocoapod: + +```sh +pod trunk push powersync-sqlite-core.podspec +``` From 6b150ed47a100d7196c0f18d842821d8b92f9b86 Mon Sep 17 00:00:00 2001 From: Ralf Kistner Date: Tue, 30 Jan 2024 10:15:56 +0200 Subject: [PATCH 5/6] Update another repo reference. --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 445910f5..30997276 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,7 +31,7 @@ authors = ["JourneyApps"] keywords = ["sqlite", "powersync"] license = "Apache-2.0" homepage = "https://powersync.co" -repository = "https://github.com/journeyapps/powersync-sqlite-core" +repository = "https://github.com/powersync-ja/powersync-sqlite-core" [workspace.dependencies] sqlite_nostd = { path="./sqlite-rs-embedded/sqlite_nostd" } From 565d30d5778f50085fb0d3a28b2a53e01e0adc74 Mon Sep 17 00:00:00 2001 From: Ralf Kistner Date: Tue, 30 Jan 2024 10:42:17 +0200 Subject: [PATCH 6/6] And another one. --- android/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle.kts b/android/build.gradle.kts index 07f41a80..e33e2b7f 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -125,7 +125,7 @@ publishing { if (System.getenv("GITHUB_ACTOR") != null) { maven { name = "GitHubPackages" - url = uri("https://maven.pkg.github.com/journeyapps/powersync-sqlite-core") + url = uri("https://maven.pkg.github.com/powersync-ja/powersync-sqlite-core") credentials { username = System.getenv("GITHUB_ACTOR") password = System.getenv("GITHUB_TOKEN")