Merge pull request #121 from Berrysoft/dev/tauri2

Update tauri to 2.0 (alpha)
Uni-Gal · Mar 30, 2023 · 4f196c1 · 4f196c1
2 parents a0fd21d + adcbaab
commit 4f196c1
Show file tree

Hide file tree

Showing 107 changed files with 3,857 additions and 998 deletions.
diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml
@@ -32,7 +32,7 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y libwebkit2gtk-4.0-dev
+          sudo apt-get install -y libwebkit2gtk-4.1-dev
         if: matrix.platform.name == 'linux-x64'
       - name: Install targets
         run: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -38,7 +38,7 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y libwebkit2gtk-4.0-dev
+          sudo apt-get install -y libwebkit2gtk-4.1-dev
         if: matrix.platform.name == 'linux-x64'
       - name: Install targets
         run: |

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -16,11 +16,6 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libwebkit2gtk-4.0-dev
-        if: matrix.os == 'ubuntu-latest'
       - name: Install targets
         run: |
           rustup target add wasm32-unknown-unknown

diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,6 @@
 .vscode
 .cache
 .clangd
+compile_flags.txt
 .vs
+.DS_Store
diff --git a/Makefile b/Makefile
@@ -19,7 +19,7 @@ book:
 serve-book:
 	cd book && $(MAKE) serve
 
-.PHONY: plugins debug-cross release release-cross
+.PHONY: plugins debug-cross release release-cross release-android
 plugins:
 	cd plugins && $(MAKE) plugins
 debug-cross:
@@ -28,6 +28,8 @@ release:
 	cd bins && $(MAKE) release
 release-cross:
 	cd bins && $(MAKE) release-cross TARGET=$(TARGET)
+release-android:
+	cd bins && $(MAKE) release-android
 
 examples/plugins.ayapack: plugins
 	(cd -P examples && tar -cf $(abspath $@) -- plugins)
@@ -53,4 +55,10 @@ $(eval $(foreach ex,$(EXAMPLES),$(call example-tpl,$(ex))))
 %.pdf: %.tex
 	cd $(dir $<) && latexmk -lualatex $(notdir $<)
 
+.PHONY: example-android example-ios
+example-android:
+	cd bins && $(MAKE) run-android
+example-ios:
+	cd bins && $(MAKE) run-ios
+
 .SECONDARY:
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,4 +4,6 @@ @@
     .vscode
     .cache
     .clangd
+    compile_flags.txt
     .vs
+    .DS_Store