Merge pull request #24 from powersync-ja/android-prefab

rkistner · web-flow · commit 4aeb73257263 · 2024-09-02T09:56:53.000+02:00
Custom prefab build for Android
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -52,3 +52,26 @@ rustflags = [
     "-C", "link-arg=-mmacosx-version-min=10.13",
 ]
 
+
+# For Android, it is important to set the soname.
+# Otherwise, the linker hardcodes the path in the lib,
+# which breaks loading.
+[target.aarch64-linux-android]
+rustflags = [
+    "-C", "link-arg=-Wl,-soname,libpowersync.so",
+]
+
+[target.armv7-linux-androideabi]
+rustflags = [
+    "-C", "link-arg=-Wl,-soname,libpowersync.so",
+]
+
+[target.x86_64-linux-android]
+rustflags = [
+    "-C", "link-arg=-Wl,-soname,libpowersync.so",
+]
+
+[target.i686-linux-android]
+rustflags = [
+    "-C", "link-arg=-Wl,-soname,libpowersync.so",
+]
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -1,7 +1,5 @@
 on:
   push:
-    tags:
-      - "*"
 name: "android"
 jobs:
   build:
@@ -17,10 +15,6 @@ jobs:
           distribution: "temurin"
           java-version: "17"
 
-      - uses: nttld/setup-ndk@v1
-        with:
-          ndk-version: r26
-
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@ccb4328a959376b642e027874838f60f8e596de3
 
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -1,7 +1,5 @@
 on:
   push:
-    tags:
-      - "*"
 name: "ios"
 jobs:
   build:
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -1,7 +1,5 @@
 on:
   push:
-    tags:
-      - "*"
   workflow_dispatch:
 name: "linux"
 jobs:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -45,10 +45,6 @@ jobs:
           distribution: "temurin"
           java-version: "17"
 
-      - uses: nttld/setup-ndk@v1
-        with:
-          ndk-version: r26
-
       - name: Setup
         run: |
           rustup toolchain install nightly-2024-05-18-x86_64-unknown-linux-gnu
diff --git a/.github/workflows/wasm.yml b/.github/workflows/wasm.yml
@@ -0,0 +1,20 @@
+on:
+  push:
+name: "linux"
+jobs:
+  build_wasm:
+    name: Basic WASM build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: true
+
+      - name: Install Rust Nightly
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: nightly-2024-05-18
+          components: rust-src
+
+      - name: Build WASM bytecode
+        run: RUSTFLAGS="--emit=llvm-bc -C linker=/bin/true" cargo build -p powersync_loadable --profile wasm --no-default-features --features "powersync_core/static powersync_core/omit_load_extension sqlite_nostd/static sqlite_nostd/omit_load_extension" -Z build-std=panic_abort,core,alloc --target wasm32-unknown-emscripten
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -1,7 +1,5 @@
 on:
   push:
-    tags:
-      - "*"
 name: "windows"
 jobs:
   build_windows:
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -25,7 +25,7 @@ inherits = "release"
 lto = false
 
 [workspace.package]
-version = "0.2.0"
+version = "0.2.1"
 edition = "2021"
 authors = ["JourneyApps"]
 keywords = ["sqlite", "powersync"]
diff --git a/RELEASING.md b/RELEASING.md
@@ -5,8 +5,9 @@ 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
+4. android/src/prefab/prefab.json
+5. build-pod.sh - CFBundleVersion and CFBundleShortVersionString.
+6. `cargo build` to update Cargo.lock
 
 Create a tag:
 
diff --git a/android/build.gradle.kts b/android/build.gradle.kts
@@ -1,21 +1,20 @@
 import java.util.Base64
 
 plugins {
-    id("com.android.library") version "8.0.1"
     id("maven-publish")
     id("signing")
 }
 
 group = "co.powersync"
-version = "0.2.0"
+version = "0.2.1"
 description = "PowerSync Core SQLite Extension"
 
 repositories {
     mavenCentral()
     google()
 }
 
-val buildRust = tasks.register("buildRust", Exec::class.java) {
+val buildRust = tasks.register<Exec>("buildRust") {
     workingDir("..")
     commandLine(
         "cargo",
@@ -38,36 +37,39 @@ val buildRust = tasks.register("buildRust", Exec::class.java) {
     )
 }
 
-android {
-    compileSdk = 33
-
-    namespace = "co.powersync.sqlitecore"
+val prefabAar = tasks.register<Zip>("prefabAar") {
+    dependsOn(buildRust)
 
-    defaultConfig {
-        minSdk = 21
+    from("build/intermediates/jniLibs") {
+        include("**/*")
+        into("jni")
     }
 
-    sourceSets {
-        getByName("main") {
-            jniLibs.srcDir("build/intermediates/jniLibs")
-        }
+    from("src/") {
+        include("**/*")
     }
 
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-        }
-    }
+    val architectures = listOf(
+        "armeabi-v7a",
+        "arm64-v8a",
+        "x86",
+        "x86_64"
+    )
 
-    publishing {
-        singleVariant("release") {
-            withSourcesJar()
+    architectures.forEach { architecture ->
+        from("build/intermediates/jniLibs/$architecture/") {
+            include("libpowersync.so")
+            into("prefab/modules/powersync/libs/android.$architecture/")
         }
     }
+
+    archiveFileName.set("build/outputs/aar/powersync-sqlite-core.aar")
+    destinationDirectory.set(file("./"))
 }
 
-tasks.named("preBuild") {
-    dependsOn(buildRust)
+val sourcesJar = tasks.register<Jar>("sourcesJar") {
+    // We don't have any actual java sources to bundle
+    archiveClassifier.set("sources")
 }
 
 publishing {
@@ -78,7 +80,13 @@ publishing {
             version = project.version.toString()
 
             afterEvaluate {
-                from(components["release"])
+                artifact(prefabAar) {
+                    extension = "aar"
+                }
+
+                artifact(sourcesJar) {
+                    classifier = "sources"
+                }
             }
 
             pom {
@@ -147,5 +155,9 @@ signing {
 }
 
 tasks.withType<AbstractPublishToMaven>() {
-    dependsOn("assembleRelease")
+    dependsOn(prefabAar)
 }
+
+tasks.named("build") {
+    dependsOn(prefabAar)
+}
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/android/src/AndroidManifest.xml b/android/src/AndroidManifest.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="co.powersync.sqlitecore" >
+
+    <uses-sdk android:minSdkVersion="21" />
+
+</manifest>
diff --git a/android/src/prefab/modules/powersync/include/powersync.h b/android/src/prefab/modules/powersync/include/powersync.h
@@ -0,0 +1,9 @@
+#ifndef POWERSYNC_H
+#define POWERSYNC_H
+
+#include "sqlite3.h"
+
+extern "C" int sqlite3_powersync_init(sqlite3 *db, char **pzErrMsg,
+                           const sqlite3_api_routines *pApi);
+
+#endif
diff --git a/android/src/prefab/modules/powersync/libs/android.arm64-v8a/abi.json b/android/src/prefab/modules/powersync/libs/android.arm64-v8a/abi.json
@@ -0,0 +1,7 @@
+{
+  "abi": "arm64-v8a",
+  "api": 21,
+  "ndk": 25,
+  "stl": "none",
+  "static": false
+}
diff --git a/android/src/prefab/modules/powersync/libs/android.armeabi-v7a/abi.json b/android/src/prefab/modules/powersync/libs/android.armeabi-v7a/abi.json
@@ -0,0 +1,7 @@
+{
+  "abi": "armeabi-v7a",
+  "api": 21,
+  "ndk": 25,
+  "stl": "none",
+  "static": false
+}
diff --git a/android/src/prefab/modules/powersync/libs/android.x86/abi.json b/android/src/prefab/modules/powersync/libs/android.x86/abi.json
@@ -0,0 +1,7 @@
+{
+  "abi": "x86",
+  "api": 21,
+  "ndk": 25,
+  "stl": "none",
+  "static": false
+}
diff --git a/android/src/prefab/modules/powersync/libs/android.x86_64/abi.json b/android/src/prefab/modules/powersync/libs/android.x86_64/abi.json
@@ -0,0 +1,7 @@
+{
+  "abi": "x86_64",
+  "api": 21,
+  "ndk": 25,
+  "stl": "none",
+  "static": false
+}
diff --git a/android/src/prefab/modules/powersync/module.json b/android/src/prefab/modules/powersync/module.json
@@ -0,0 +1,4 @@
+{
+  "export_libraries": [],
+  "android": {}
+}
diff --git a/android/src/prefab/prefab.json b/android/src/prefab/prefab.json
@@ -0,0 +1,6 @@
+{
+  "name": "powersync_sqlite_core",
+  "schema_version": 2,
+  "dependencies": [],
+  "version": "0.2.1"
+}
diff --git a/build-pod.sh b/build-pod.sh
@@ -28,9 +28,9 @@ function createXcframework() {
   <key>MinimumOSVersion</key>
   <string>11.0</string>
   <key>CFBundleVersion</key>
-  <string>0.2.0</string>
+  <string>0.2.1</string>
   <key>CFBundleShortVersionString</key>
-  <string>0.2.0</string>
+  <string>0.2.1</string>
 </dict>
 </plist>
 EOF
diff --git a/powersync-sqlite-core.podspec b/powersync-sqlite-core.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'powersync-sqlite-core'
-  s.version          = '0.2.0'
+  s.version          = '0.2.1'
   s.summary          = 'PowerSync SQLite Extension'
   s.description      = <<-DESC
 PowerSync extension for SQLite.

-Original file line number
+Diff line change
@@ @@ -1,7 +1,5 @@ @@
 on:
   push:
 -    tags:
 -      - "*"
 name: "ios"
 jobs:
   build: