From b2ae7204b00b3ce190c04a1399298183e25426f8 Mon Sep 17 00:00:00 2001 From: Lucas Nogueira Date: Tue, 4 Apr 2023 15:42:31 -0300 Subject: [PATCH] update example --- .../examples/tauri-app/src-tauri/Cargo.lock | 77 +++---------------- .../examples/tauri-app/src-tauri/Cargo.toml | 2 +- .../src-tauri/gen/android/app/.gitignore | 1 + .../src-tauri/gen/android/app/app/.gitignore | 3 + .../gen/android/app/app/proguard-tauri.pro | 30 -------- .../android/app/app/tauri.build.gradle.kts | 7 -- .../gen/android/app/tauri.settings.gradle | 1 - 7 files changed, 16 insertions(+), 105 deletions(-) delete mode 100644 plugins/camera/examples/tauri-app/src-tauri/gen/android/app/app/proguard-tauri.pro delete mode 100644 plugins/camera/examples/tauri-app/src-tauri/gen/android/app/app/tauri.build.gradle.kts delete mode 100644 plugins/camera/examples/tauri-app/src-tauri/gen/android/app/tauri.settings.gradle diff --git a/plugins/camera/examples/tauri-app/src-tauri/Cargo.lock b/plugins/camera/examples/tauri-app/src-tauri/Cargo.lock index 6b231401..275de3f4 100644 --- a/plugins/camera/examples/tauri-app/src-tauri/Cargo.lock +++ b/plugins/camera/examples/tauri-app/src-tauri/Cargo.lock @@ -45,7 +45,7 @@ dependencies = [ "serde", "serde_json", "tauri", - "tauri-build 2.0.0-alpha.1", + "tauri-build", "tauri-plugin-camera", ] @@ -2905,16 +2905,6 @@ dependencies = [ "syn", ] -[[package]] -name = "swift-rs" -version = "0.3.0" -source = "git+https://github.com/Brendonovich/swift-rs?rev=eb6de914ad57501da5019154d476d45660559999#eb6de914ad57501da5019154d476d45660559999" -dependencies = [ - "base64 0.13.1", - "serde", - "serde_json", -] - [[package]] name = "swift-rs" version = "1.0.3" @@ -3061,13 +3051,13 @@ dependencies = [ "serialize-to-javascript", "shared_child", "state", - "swift-rs 1.0.3", + "swift-rs", "tar", - "tauri-build 2.0.0-alpha.3", + "tauri-build", "tauri-macros", "tauri-runtime", "tauri-runtime-wry", - "tauri-utils 2.0.0-alpha.3", + "tauri-utils", "tempfile", "thiserror", "tokio", @@ -3078,25 +3068,6 @@ dependencies = [ "windows 0.44.0", ] -[[package]] -name = "tauri-build" -version = "2.0.0-alpha.1" -source = "git+https://github.com/tauri-apps/tauri?branch=next#037d488dee091730c8c01d9d09affcaa2386a463" -dependencies = [ - "anyhow", - "cargo_toml", - "filetime", - "heck 0.4.1", - "json-patch", - "semver 1.0.16", - "serde", - "serde_json", - "swift-rs 0.3.0", - "tauri-utils 2.0.0-alpha.1", - "tauri-winres", - "walkdir", -] - [[package]] name = "tauri-build" version = "2.0.0-alpha.3" @@ -3111,8 +3082,8 @@ dependencies = [ "semver 1.0.16", "serde", "serde_json", - "swift-rs 1.0.3", - "tauri-utils 2.0.0-alpha.3", + "swift-rs", + "tauri-utils", "tauri-winres", "walkdir", ] @@ -3136,7 +3107,7 @@ dependencies = [ "serde", "serde_json", "sha2", - "tauri-utils 2.0.0-alpha.3", + "tauri-utils", "thiserror", "time", "url", @@ -3155,7 +3126,7 @@ dependencies = [ "quote", "syn", "tauri-codegen", - "tauri-utils 2.0.0-alpha.3", + "tauri-utils", ] [[package]] @@ -3165,7 +3136,7 @@ dependencies = [ "serde", "serde_json", "tauri", - "tauri-build 2.0.0-alpha.3", + "tauri-build", "thiserror", ] @@ -3183,7 +3154,7 @@ dependencies = [ "raw-window-handle", "serde", "serde_json", - "tauri-utils 2.0.0-alpha.3", + "tauri-utils", "thiserror", "url", "uuid", @@ -3204,7 +3175,7 @@ dependencies = [ "rand 0.8.5", "raw-window-handle", "tauri-runtime", - "tauri-utils 2.0.0-alpha.3", + "tauri-utils", "uuid", "webkit2gtk", "webview2-com", @@ -3212,32 +3183,6 @@ dependencies = [ "wry", ] -[[package]] -name = "tauri-utils" -version = "2.0.0-alpha.1" -source = "git+https://github.com/tauri-apps/tauri?branch=next#037d488dee091730c8c01d9d09affcaa2386a463" -dependencies = [ - "ctor", - "glob", - "heck 0.4.1", - "html5ever", - "infer", - "json-patch", - "kuchiki", - "memchr", - "phf 0.10.1", - "proc-macro2", - "quote", - "semver 1.0.16", - "serde", - "serde_json", - "serde_with", - "thiserror", - "url", - "walkdir", - "windows 0.44.0", -] - [[package]] name = "tauri-utils" version = "2.0.0-alpha.3" diff --git a/plugins/camera/examples/tauri-app/src-tauri/Cargo.toml b/plugins/camera/examples/tauri-app/src-tauri/Cargo.toml index 6cedbe03..2145e97c 100644 --- a/plugins/camera/examples/tauri-app/src-tauri/Cargo.toml +++ b/plugins/camera/examples/tauri-app/src-tauri/Cargo.toml @@ -14,7 +14,7 @@ rust-version = "1.64" crate-type = ["staticlib", "cdylib", "rlib"] [build-dependencies] -tauri-build = { git = "https://github.com/tauri-apps/tauri", branch = "next", features = [] } +tauri-build = { version = "2.0.0-alpha.3", features = [] } [dependencies] serde_json = "1.0" diff --git a/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/.gitignore b/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/.gitignore index 5390e9b2..943a67a4 100644 --- a/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/.gitignore +++ b/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/.gitignore @@ -17,3 +17,4 @@ build local.properties /.tauri +/tauri.settings.gradle \ No newline at end of file diff --git a/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/app/.gitignore b/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/app/.gitignore index e897324f..810469e2 100644 --- a/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/app/.gitignore +++ b/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/app/.gitignore @@ -1 +1,4 @@ /src/main/java/app/tauri/app/generated +/src/main/jniLibs/**/*.so +/tauri.build.gradle.kts +/proguard-tauri.pro \ No newline at end of file diff --git a/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/app/proguard-tauri.pro b/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/app/proguard-tauri.pro deleted file mode 100644 index f70b56a3..00000000 --- a/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/app/proguard-tauri.pro +++ /dev/null @@ -1,30 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. - --keep class app.tauri.app.* { - native ; -} - --keepclassmembers class app.tauri.app.TauriActivity { - getAppClass(...); - getVersion(); -} - --keep class app.tauri.app.RustWebView { - public (...); - loadUrlMainThread(...); -} - --keep class app.tauri.app.Ipc { - public (...); - @android.webkit.JavascriptInterface public ; -} - --keep class app.tauri.app.RustWebChromeClient,app.tauri.app.RustWebViewClient { - public (...); -} - --keep class app.tauri.app.MainActivity { - public getPluginManager(); -} - --keep class androidx.appcompat.app.AppCompatActivity { } diff --git a/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/app/tauri.build.gradle.kts b/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/app/tauri.build.gradle.kts deleted file mode 100644 index 624ca6bc..00000000 --- a/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/app/tauri.build.gradle.kts +++ /dev/null @@ -1,7 +0,0 @@ -// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. - -val implementation by configurations - -dependencies { - -} diff --git a/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/tauri.settings.gradle b/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/tauri.settings.gradle deleted file mode 100644 index edbde458..00000000 --- a/plugins/camera/examples/tauri-app/src-tauri/gen/android/app/tauri.settings.gradle +++ /dev/null @@ -1 +0,0 @@ -// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. \ No newline at end of file