Temp 16: Revert back to uniffi 0.23.0

thunderbiscuit · Oct 5, 2023 · 52935c2 · 52935c2
1 parent 413ec98
commit 52935c2
Show file tree

Hide file tree

Showing 14 changed files with 277 additions and 273 deletions.
diff --git a/.github/workflows/cont_integration.yml b/.github/workflows/cont_integration.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - version: 1.72.1 # STABLE
+          - version: 1.67.0
             clippy: true
           # TODO: Should we keep this? We'll need to pin dependencies
           # - version: 1.61.0 # MSRV

diff --git a/.github/workflows/publish-android.yaml b/.github/workflows/publish-android.yaml
@@ -37,8 +37,8 @@ jobs:
           distribution: temurin
           java-version: 11
 
-      - name: "Set default Rust version to 1.72.1"
-        run: rustup default 1.72.1
+      - name: "Set default Rust version to 1.67.0"
+        run: rustup default 1.67.0
 
       - name: "Install Rust Android targets"
         run: rustup target add x86_64-linux-android aarch64-linux-android armv7-linux-androideabi

diff --git a/.github/workflows/publish-jvm.yaml b/.github/workflows/publish-jvm.yaml
@@ -24,8 +24,8 @@ jobs:
           distribution: temurin
           java-version: 11
 
-      - name: "Set default Rust version to 1.72.1"
-        run: rustup default 1.72.1
+      - name: "Set default Rust version to 1.67.0"
+        run: rustup default 1.67.0
 
       - name: "Install aarch64 Rust target"
         run: rustup target add aarch64-apple-darwin
@@ -54,8 +54,8 @@ jobs:
           distribution: temurin
           java-version: 11
 
-      - name: "Set default Rust version to 1.72.1"
-        run: rustup default 1.72.1
+      - name: "Set default Rust version to 1.67.0"
+        run: rustup default 1.67.0
 
       - name: "Install x86_64-pc-windows-msvc Rust target"
         run: rustup target add x86_64-pc-windows-msvc
@@ -94,8 +94,8 @@ jobs:
           distribution: temurin
           java-version: 11
 
-      - name: "Set default Rust version to 1.72.1"
-        run: rustup default 1.72.1
+      - name: "Set default Rust version to 1.67.0"
+        run: rustup default 1.67.0
 
       - name: "Build bdk-jvm library"
         run: |

diff --git a/.github/workflows/test-android.yaml b/.github/workflows/test-android.yaml
@@ -46,8 +46,8 @@ jobs:
           distribution: temurin
           java-version: 11
 
-      - name: "Set default Rust version to 1.72.1"
-        run: rustup default 1.72.1
+      - name: "Set default Rust version to 1.67.0"
+        run: rustup default 1.67.0
 
       - name: "Install Rust Android targets"
         run: rustup target add x86_64-linux-android aarch64-linux-android armv7-linux-androideabi

diff --git a/.github/workflows/test-jvm.yaml b/.github/workflows/test-jvm.yaml
@@ -32,16 +32,10 @@ jobs:
           distribution: temurin
           java-version: 11
 
-      - name: "Set default Rust version to 1.72.1"
-        run: rustup default 1.72.1
+      - name: "Set default Rust version to 1.67.0"
+        run: rustup default 1.67.0
 
       - name: "Run JVM tests"
         run: |
           cd bdk-jvm
-          ./gradlew buildJvmLib
           ./gradlew test
-
-      - name: "Print directory structure"
-        run: |
-          pwd
-          ls -R
diff --git a/.github/workflows/test-swift.yaml b/.github/workflows/test-swift.yaml
@@ -17,8 +17,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: "Set default Rust version to 1.72.1"
-        run: rustup default 1.72.1
+      - name: "Set default Rust version to 1.67.0"
+        run: rustup default 1.67.0
 
       - name: Install Rust targets
         run: |

diff --git a/bdk-android/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiAndroidPlugin.kt b/bdk-android/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiAndroidPlugin.kt
@@ -137,10 +137,14 @@ internal class UniFfiAndroidPlugin : Plugin<Project> {
         val generateAndroidBindings by tasks.register<Exec>("generateAndroidBindings") {
             dependsOn(moveNativeAndroidLibs)
 
-            val libraryPath = "${project.projectDir}/../../bdk-ffi/target/aarch64-linux-android/release-smaller/libbdkffi.so"
-            workingDir("${project.projectDir}/../../bdk-ffi")
+            // val libraryPath = "${project.projectDir}/../../bdk-ffi/target/aarch64-linux-android/release-smaller/libbdkffi.so"
+            // workingDir("${project.projectDir}/../../bdk-ffi")
+            // val cargoArgs: List<String> = listOf("run", "--bin", "uniffi-bindgen", "generate", "--library", libraryPath, "--language", "kotlin", "--out-dir", "../bdk-android/lib/src/main/kotlin", "--no-format")
 
-            val cargoArgs: List<String> = listOf("run", "--bin", "uniffi-bindgen", "generate", "--library", libraryPath, "--language", "kotlin", "--out-dir", "../bdk-android/lib/src/main/kotlin", "--no-format")
+            // The code above worked for uniffi 0.24.3 using the --library flag
+            // The code below works for uniffi 0.23.0
+            workingDir("${project.projectDir}/../../bdk-ffi")
+            val cargoArgs: List<String> = listOf("run", "--bin", "uniffi-bindgen", "generate", "src/bdk.udl", "--language", "kotlin", "--out-dir", "../bdk-android/lib/src/main/kotlin", "--no-format")
 
             executable("cargo")
             args(cargoArgs)