Remove deprecated plugins.

Uni-Gal · Oct 24, 2023 · d34e8ce · d34e8ce
1 parent 9b155d1
commit d34e8ce
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 79 deletions.
diff --git a/bins/Cargo.lock b/bins/Cargo.lock
diff --git a/bins/ayaka-gui/package-lock.json b/bins/ayaka-gui/package-lock.json
diff --git a/bins/ayaka-gui/package.json b/bins/ayaka-gui/package.json
@@ -13,8 +13,6 @@
     "@fortawesome/free-solid-svg-icons": "^6.4.2",
     "@fortawesome/vue-fontawesome": "^3.0.3",
     "@tauri-apps/api": "^2.0.0-alpha.9",
-    "@tauri-apps/plugin-app": "^2.0.0-alpha.1",
-    "@tauri-apps/plugin-window": "^2.0.0-alpha.1",
     "@tauri-apps/plugin-os": "^2.0.0-alpha.3",
     "async-mutex": "^0.4.0",
     "bootstrap": "^5.3.2",
@@ -39,4 +37,4 @@
     "vite": "^3.2.7",
     "vue-tsc": "^1.8.20"
   }
-}
+}
diff --git a/bins/ayaka-gui/src-tauri/Cargo.toml b/bins/ayaka-gui/src-tauri/Cargo.toml
@@ -23,8 +23,6 @@ serde_json = "1"
 serde = { version = "1", features = ["derive"] }
 tauri = { version = "2.0.0-alpha.16", features = [] }
 clap = { workspace = true, features = ["derive"] }
-tauri-plugin-app = "2.0.0-alpha.2"
-tauri-plugin-window = "2.0.0-alpha.2"
 tauri-plugin-os = "2.0.0-alpha.3"
 tokio = { workspace = true, features = ["sync"] }
 axum = { version = "0.6", default-features = false, features = [

diff --git a/bins/ayaka-gui/src-tauri/src/lib.rs b/bins/ayaka-gui/src-tauri/src/lib.rs
@@ -343,9 +343,7 @@ pub fn run() -> Result<()> {
         .plugin(tauri_plugin_dialog::init());
     #[cfg(target_os = "android")]
     let builder = builder.plugin(file_picker_android::init());
-    let builder = builder
-        .plugin(tauri_plugin_os::init())
-        .plugin(tauri_plugin_window::init());
+    let builder = builder.plugin(tauri_plugin_os::init());
     builder
         .setup(move |app| {
             #[cfg(target_os = "android")]

diff --git a/bins/ayaka-gui/src-tauri/tauri.conf.json b/bins/ayaka-gui/src-tauri/tauri.conf.json
@@ -3,7 +3,8 @@
     "beforeBuildCommand": "npm run build",
     "beforeDevCommand": "npm run dev",
     "devPath": "http://localhost:5173",
-    "distDir": "../dist"
+    "distDir": "../dist",
+    "withGlobalTauri": true
   },
   "package": {
     "productName": "ayaka-gui",

diff --git a/bins/ayaka-gui/src/App.vue b/bins/ayaka-gui/src/App.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import 'bootstrap-dark-5/dist/css/bootstrap-dark.min.css'
-import { getCurrent } from "@tauri-apps/plugin-window"
+import { getCurrent } from "@tauri-apps/api/window"
 import { init } from './interop'
 import { Modal } from 'bootstrap'
 </script>

diff --git a/bins/ayaka-gui/src/views/AboutView.vue b/bins/ayaka-gui/src/views/AboutView.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { getName, getTauriVersion, getVersion } from "@tauri-apps/plugin-app"
+import { getName, getTauriVersion, getVersion } from "@tauri-apps/api/app"
 import { info, ayaka_version } from '../interop'
 import IconButton from '../components/IconButton.vue';
 </script>