use latest main of uniffi

This commit is contained in:
imWildCat 2023-08-20 16:27:12 -07:00
parent 065a0b6209
commit d42e677327
4 changed files with 16 additions and 13 deletions

View File

@ -8,7 +8,7 @@ on:
jobs:
build_ios:
name: 'Build iOS'
name: "Build iOS"
runs-on: macos-latest
steps:
@ -26,8 +26,13 @@ jobs:
path: hello/target/HelloFFI.xcframework
retention-days: 7
- name: "Run ios tests"
run: |
cd hello/platforms/apple
xcodebuild -project HelloAppleDemoApp.xcodeproj -scheme HelloAppleDemoApp -destination 'platform=iOS Simulator,name=iPhone 14' test
build_android:
name: 'Build Android'
name: "Build Android"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
@ -35,9 +40,9 @@ jobs:
lfs: true
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '17'
cache: 'gradle'
distribution: "temurin"
java-version: "17"
cache: "gradle"
# Reference: https://github.com/mozilla/rust-android-gradle/blob/master/.github/workflows/check.yml
- uses: actions-rs/toolchain@v1
# Reference: https://github.com/rust-windowing/android-ndk-rs/blob/master/.github/workflows/rust.yml

View File

@ -15,9 +15,7 @@ debug = true # Enable debug symbols. For example, we can use `dwarfdump` to chec
[workspace.dependencies]
# uniffi = { version = "0.24" }
# uniffi_bindgen = { version = "0.24" }
# uniffi_macros = { version = "0.24" }
uniffi = { git = "https://github.com/mozilla/uniffi-rs", rev = "e20b9c2b72144ef51a381c6b321ac810a4fbfdbe" }
uniffi_build = { git = "https://github.com/mozilla/uniffi-rs", rev = "e20b9c2b72144ef51a381c6b321ac810a4fbfdbe" }
uniffi_bindgen = { git = "https://github.com/mozilla/uniffi-rs", rev = "e20b9c2b72144ef51a381c6b321ac810a4fbfdbe" }
uniffi_core = { git = "https://github.com/mozilla/uniffi-rs", rev = "e20b9c2b72144ef51a381c6b321ac810a4fbfdbe" }
uniffi_macros = { git = "https://github.com/mozilla/uniffi-rs", rev = "e20b9c2b72144ef51a381c6b321ac810a4fbfdbe" }

View File

@ -1,7 +1,7 @@
//
import UIKit
//import Hello
import Hello
@main
class AppDelegate: UIResponder, UIApplicationDelegate {
@ -10,7 +10,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
// Override point for customization after application launch.
// setLoggingDelegate(delegate: self)
setLoggingDelegate(delegate: self)
return true
}

View File

@ -1,8 +1,8 @@
uniffi::include_scaffolding!("hello");
// uniffi::include_scaffolding!("hello");
// This is interesting. Because we're supposed to use setup_scaffolding!() at the top.
// Please refer to <https://mozilla.github.io/uniffi-rs/proc_macro/index.html>
// I found this sample at: https://github.com/MathieuTricoire/convex-rs-ffi/tree/90fb36ea3dec16b05a8e4f47aa032987b2727122
// uniffi::setup_scaffolding!();
uniffi::setup_scaffolding!();
#[uniffi::export(callback_interface)]
pub trait GreetingDelegate: Send + Sync {