feat: update swift-rs (#285)

* feat: update swift-rs

* swift-rs v1

* pin deps
pull/302/head
Lucas Fernandes Nogueira 2 years ago committed by GitHub
parent 961602bd1b
commit 539c38a692
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

21
Cargo.lock generated

@ -4140,10 +4140,11 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
[[package]]
name = "swift-rs"
version = "0.3.0"
source = "git+https://github.com/Brendonovich/swift-rs?rev=eb6de914ad57501da5019154d476d45660559999#eb6de914ad57501da5019154d476d45660559999"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "806ff0904302a8a91644422fcfeee4828c3a9dbcfd1757ba495f1a755c2ac873"
dependencies = [
"base64 0.13.1",
"base64 0.21.0",
"serde",
"serde_json",
]
@ -4258,7 +4259,7 @@ dependencies = [
[[package]]
name = "tauri"
version = "2.0.0-alpha.3"
source = "git+https://github.com/tauri-apps/tauri?branch=next#105fe3fa242df87ad7655b519b0c01c3da9d8ee4"
source = "git+https://github.com/tauri-apps/tauri?branch=next#5d94eaa3bc9f1e5cf3e0fa64fba5801d494c2541"
dependencies = [
"anyhow",
"attohttpc",
@ -4308,7 +4309,7 @@ dependencies = [
[[package]]
name = "tauri-build"
version = "2.0.0-alpha.1"
source = "git+https://github.com/tauri-apps/tauri?branch=next#105fe3fa242df87ad7655b519b0c01c3da9d8ee4"
source = "git+https://github.com/tauri-apps/tauri?branch=next#5d94eaa3bc9f1e5cf3e0fa64fba5801d494c2541"
dependencies = [
"anyhow",
"cargo_toml",
@ -4327,7 +4328,7 @@ dependencies = [
[[package]]
name = "tauri-codegen"
version = "2.0.0-alpha.1"
source = "git+https://github.com/tauri-apps/tauri?branch=next#105fe3fa242df87ad7655b519b0c01c3da9d8ee4"
source = "git+https://github.com/tauri-apps/tauri?branch=next#5d94eaa3bc9f1e5cf3e0fa64fba5801d494c2541"
dependencies = [
"base64 0.21.0",
"brotli",
@ -4352,7 +4353,7 @@ dependencies = [
[[package]]
name = "tauri-macros"
version = "2.0.0-alpha.1"
source = "git+https://github.com/tauri-apps/tauri?branch=next#105fe3fa242df87ad7655b519b0c01c3da9d8ee4"
source = "git+https://github.com/tauri-apps/tauri?branch=next#5d94eaa3bc9f1e5cf3e0fa64fba5801d494c2541"
dependencies = [
"heck",
"proc-macro2",
@ -4573,7 +4574,7 @@ dependencies = [
[[package]]
name = "tauri-runtime"
version = "0.13.0-alpha.1"
source = "git+https://github.com/tauri-apps/tauri?branch=next#105fe3fa242df87ad7655b519b0c01c3da9d8ee4"
source = "git+https://github.com/tauri-apps/tauri?branch=next#5d94eaa3bc9f1e5cf3e0fa64fba5801d494c2541"
dependencies = [
"gtk",
"http",
@ -4594,7 +4595,7 @@ dependencies = [
[[package]]
name = "tauri-runtime-wry"
version = "0.13.0-alpha.1"
source = "git+https://github.com/tauri-apps/tauri?branch=next#105fe3fa242df87ad7655b519b0c01c3da9d8ee4"
source = "git+https://github.com/tauri-apps/tauri?branch=next#5d94eaa3bc9f1e5cf3e0fa64fba5801d494c2541"
dependencies = [
"cocoa",
"gtk",
@ -4614,7 +4615,7 @@ dependencies = [
[[package]]
name = "tauri-utils"
version = "2.0.0-alpha.1"
source = "git+https://github.com/tauri-apps/tauri?branch=next#105fe3fa242df87ad7655b519b0c01c3da9d8ee4"
source = "git+https://github.com/tauri-apps/tauri?branch=next#5d94eaa3bc9f1e5cf3e0fa64fba5801d494c2541"
dependencies = [
"brotli",
"ctor",

@ -26,7 +26,7 @@ fern = "0.6"
android_logger = "0.11"
[target."cfg(target_os = \"ios\")".dependencies]
swift-rs = { git = "https://github.com/Brendonovich/swift-rs", rev = "eb6de914ad57501da5019154d476d45660559999" }
swift-rs = "1.0.1"
[features]
colored = ["fern/colored"]

@ -3,11 +3,11 @@ import Tauri
import SwiftRs
@_cdecl("tauri_log")
func log(level: Int, message: UnsafePointer<SRString>) {
func log(level: Int, message: SRString) {
switch level {
case 1: Logger.debug(message.pointee.to_string())
case 2: Logger.info(message.pointee.to_string())
case 3: Logger.error(message.pointee.to_string())
case 1: Logger.debug(message.toString())
case 2: Logger.info(message.toString())
case 3: Logger.error(message.toString())
default: break
}
}

@ -23,9 +23,9 @@ use tauri::{
pub use fern;
#[cfg(target_os = "ios")]
extern "C" {
fn tauri_log(level: u8, message: &swift_rs::SRString);
}
swift_rs::swift!(fn tauri_log(
level: u8, message: &swift_rs::SRString
));
const DEFAULT_MAX_FILE_SIZE: u128 = 40000;
const DEFAULT_ROTATION_STRATEGY: RotationStrategy = RotationStrategy::KeepOne;

Loading…
Cancel
Save