Skip to content

Commit

Permalink
Merge pull request #27 from ZaneH/chore/v2-migration
Browse files Browse the repository at this point in the history
Migrate to Tauri v2
  • Loading branch information
ZaneH authored Jan 27, 2025
2 parents 1471dcd + ed42525 commit 490d92c
Show file tree
Hide file tree
Showing 16 changed files with 2,376 additions and 3,032 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ jobs:
- uses: tauri-apps/tauri-action@v0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
TAURI_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
TAURI_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
with:
tagName: app-v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version.
releaseName: 'Piano Trainer v__VERSION__'
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@
/coverage

# production
/build
/build/*
!/build/.keep
/dist/*
!/dist/.gitkeep

# misc
.DS_Store
Expand Down
2 changes: 0 additions & 2 deletions .taurignore
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
*

!src/**/*
Empty file added build/.keep
Empty file.
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"@tauri-apps/api": "^1.5.6",
"@tauri-apps/api": "^2.2.0",
"@tauri-apps/plugin-store": "^2.2.0",
"@testing-library/jest-dom": "^5.16.4",
"@testing-library/react": "^13.3.0",
"@testing-library/user-event": "^13.5.0",
Expand All @@ -12,16 +13,15 @@
"@types/react": "^19.0.7",
"@types/react-dom": "^19.0.3",
"i18next": "^21.8.14",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react": "^19.0.0",
"react-dom": "^19.0.0",
"react-i18next": "^11.18.1",
"react-piano": "^3.1.3",
"react-scripts": "5.0.1",
"react-select": "^5.4.0",
"remixicon-react": "^1.0.0",
"soundfont-player": "^0.12.0",
"styled-components": "^5.3.5",
"tauri-plugin-store-api": "https://github.com/tauri-apps/tauri-plugin-store#dev",
"typescript": "^4.7.4",
"web-vitals": "^2.1.4"
},
Expand Down Expand Up @@ -52,7 +52,7 @@
]
},
"devDependencies": {
"@tauri-apps/cli": "^1.5.11",
"@tauri-apps/cli": "^2.2.7",
"@types/prettier": "^2.6.3",
"@types/styled-components": "^5.1.25",
"@types/testing-library__jest-dom": "^5.14.5",
Expand Down
3 changes: 3 additions & 0 deletions src-tauri/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Generated by Cargo
# will have compiled files and executables
/target/

# cargo-mobile
/gen
Loading

0 comments on commit 490d92c

Please sign in to comment.