v2.1.0

wyhaya · Sep 14, 2024 · 0858170 · 0858170
1 parent 4dfe2c4
commit 0858170
Show file tree

Hide file tree

Showing 22 changed files with 25 additions and 316 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,31 +26,23 @@ jobs:
             ~/.cargo/registry/index/
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
-            tauri-v1/target/
-            tauri-v2/target/
+            target/
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
       - name: Setup Rust
         run: |
           rustup update
-          rustup target add ${{ matrix.job.target }}
 
       - name: Install Linux dependencies
         if: runner.os == 'Linux'
         run: |
           sudo apt update
-          sudo apt install libwebkit2gtk-4.0-dev build-essential curl wget file libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev -y
-          sudo apt install libwebkit2gtk-4.1-dev libxdo-dev -y
+          sudo apt install libwebkit2gtk-4.1-dev build-essential curl wget file libxdo-dev libssl-dev libayatana-appindicator3-dev librsvg2-dev -y
 
       - name: Cargo fmt
         run: |
-          cd tauri-v1 && cargo fmt --all -- --check && cd ..
-          cd tauri-v2 && cargo fmt --all -- --check && cd ..
+          cargo fmt --all -- --check
 
-      - name: Cargo build v1
+      - name: Cargo build
         run: |
-          cd tauri-v1 && cargo build --target ${{ matrix.job.target }} && cd ..
-
-      - name: Cargo build v2
-        run: |
-          cd tauri-v2 && cargo build --target ${{ matrix.job.target }} && cd ..
+          cargo build --target ${{ matrix.job.target }}
diff --git a/tauri-v2/Cargo.toml → Cargo.toml b/tauri-v2/Cargo.toml → Cargo.toml
diff --git a/README.md b/README.md
@@ -4,13 +4,13 @@ Tauri currently doesn't support dynamically change app theme, this plugin makes
 
 https://github.com/wyhaya/tauri-plugin-theme/assets/23690145/2422ce95-418d-4f07-adf5-e78af2552f51
 
+> [!NOTE]  
+> This only applies to the `Tauri 2x` version. If you are using the Tauri 1x version, please refer to [tauri-1x-version](https://github.com/wyhaya/tauri-plugin-theme/tree/tauri-1x-version).
+
 ## Install
 
 ```bash
-# For tauri@v1
-cargo add tauri-plugin-theme@1
-# For tauri@v2
-cargo add tauri-plugin-theme@2
+cargo add tauri-plugin-theme@2.1.0
 ```
 
 ```rust
@@ -23,6 +23,20 @@ tauri::Builder::default()
     // ...
 ```
 
+### Tauri permissions
+
+Add to `src-tauri/capabilities/default.json`
+
+```json5
+{
+  ...
+    "permissions": [
+        ...
+        "theme:default"
+    ]
+}
+```
+
 ## Usage
 
 ```javascript
@@ -47,27 +61,11 @@ const theme = await invoke("plugin:theme|get_theme");
 
 When you call `set_theme`, the theme will be auto saved, and it will be restored auto after the App restart.
 
-### Tauri permissions
-
-If you're using `tauri@v2` you'll also need to add the plugin's permissions file
-
-Add to `src-tauri/capabilities/default.json`
-
-```json5
-{
-  ...
-    "permissions": [
-        ...
-        "theme:default"
-    ]
-}
-```
-
 ## Support
 
 | MacOS | Linux | Windows | Android | iOS |
-| ----- | ----- | ------- | ------- | ------- |
-| ✅    | ✅    | ✅      | ❌      | ❌
+| ----- | ----- | ------- | ------- | --- |
+| ✅    | ✅    | ✅      | ❌      | ❌  |
 
 ## NOTE
 

diff --git a/tauri-v2/build.rs → build.rs b/tauri-v2/build.rs → build.rs
diff --git a/...ons/autogenerated/commands/get_theme.toml → ...ons/autogenerated/commands/get_theme.toml b/...ons/autogenerated/commands/get_theme.toml → ...ons/autogenerated/commands/get_theme.toml
diff --git a/...ons/autogenerated/commands/set_theme.toml → ...ons/autogenerated/commands/set_theme.toml b/...ons/autogenerated/commands/set_theme.toml → ...ons/autogenerated/commands/set_theme.toml
diff --git a/...v2/permissions/autogenerated/reference.md → permissions/autogenerated/reference.md b/...v2/permissions/autogenerated/reference.md → permissions/autogenerated/reference.md
diff --git a/tauri-v2/permissions/default.toml → permissions/default.toml b/tauri-v2/permissions/default.toml → permissions/default.toml
diff --git a/tauri-v2/permissions/schemas/schema.json → permissions/schemas/schema.json b/tauri-v2/permissions/schemas/schema.json → permissions/schemas/schema.json
diff --git a/tauri-v2/src/lib.rs → src/lib.rs b/tauri-v2/src/lib.rs → src/lib.rs
diff --git a/tauri-v2/src/platform/linux.rs → src/platform/linux.rs b/tauri-v2/src/platform/linux.rs → src/platform/linux.rs
diff --git a/tauri-v2/src/platform/macos.rs → src/platform/macos.rs b/tauri-v2/src/platform/macos.rs → src/platform/macos.rs
diff --git a/tauri-v1/src/platform/mod.rs → src/platform/mod.rs b/tauri-v1/src/platform/mod.rs → src/platform/mod.rs
diff --git a/tauri-v2/src/platform/windows.rs → src/platform/windows.rs b/tauri-v2/src/platform/windows.rs → src/platform/windows.rs
diff --git a/tauri-v1/Cargo.toml b/tauri-v1/Cargo.toml
diff --git a/tauri-v1/README.md b/tauri-v1/README.md
diff --git a/tauri-v1/src/lib.rs b/tauri-v1/src/lib.rs
diff --git a/tauri-v1/src/platform/linux.rs b/tauri-v1/src/platform/linux.rs
diff --git a/tauri-v1/src/platform/macos.rs b/tauri-v1/src/platform/macos.rs
diff --git a/tauri-v1/src/platform/windows.rs b/tauri-v1/src/platform/windows.rs
diff --git a/tauri-v2/README.md b/tauri-v2/README.md
diff --git a/tauri-v2/src/platform/mod.rs b/tauri-v2/src/platform/mod.rs