From c10356cabcb8894fbe0893e0336eecf3b50155a6 Mon Sep 17 00:00:00 2001 From: Lucas Nogueira Date: Thu, 22 Aug 2024 22:00:58 -0300 Subject: [PATCH 1/8] reinit android project --- .github/workflows/android.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 2d400e63..092e4c09 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -48,6 +48,8 @@ jobs: run: yarn - name: Build interface run: yarn build + - name: recreate Android project + run: rm -r src-tauri/gen/android && yarn tauri android init # - name: Clippy # run: cargo clippy --manifest-path=src-tauri/Cargo.toml --all-targets --all-features -- -D warnings - name: build Apk From a06bbeead259347a6b90c82f436645e4c4dc00e5 Mon Sep 17 00:00:00 2001 From: Lucas Nogueira Date: Thu, 22 Aug 2024 22:50:01 -0300 Subject: [PATCH 2/8] set ndk home --- .github/workflows/android.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 092e4c09..75a844e4 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -50,6 +50,8 @@ jobs: run: yarn build - name: recreate Android project run: rm -r src-tauri/gen/android && yarn tauri android init + env: + NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }} # - name: Clippy # run: cargo clippy --manifest-path=src-tauri/Cargo.toml --all-targets --all-features -- -D warnings - name: build Apk From 913ff024ee19ec27fef5d39380b9e576568df9af Mon Sep 17 00:00:00 2001 From: Lucas Nogueira Date: Thu, 22 Aug 2024 23:02:30 -0300 Subject: [PATCH 3/8] update tauri --- package.json | 2 +- yarn.lock | 194 +++++++++++++++++++++++++-------------------------- 2 files changed, 98 insertions(+), 98 deletions(-) diff --git a/package.json b/package.json index e0d194ae..5c211bb5 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "@mui/lab": "^5.0.0-alpha.169", "@mui/material": "^5.15.15", "@tauri-apps/api": "2.0.0-rc.0", - "@tauri-apps/cli": "^2.0.0-rc.0", + "@tauri-apps/cli": "^2.0.0-rc.7", "@tauri-apps/plugin-autostart": "^2.0.0-rc", "@tauri-apps/plugin-fs": "^2.0.0-rc", "@tauri-apps/plugin-notification": "^2.0.0-rc", diff --git a/yarn.lock b/yarn.lock index 8049f41f..76ee90b3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -19,9 +19,9 @@ picocolors "^1.0.0" "@babel/compat-data@^7.25.2": - version "7.25.2" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.25.2.tgz#e41928bd33475305c586f6acbbb7e3ade7a6f7f5" - integrity sha512-bYcppcpKBvX4znYaPEeFau03bp89ShqNMLs+rmdptMw+heSZh9+z84d2YG+K7cYLbWwzdjtDoW/uqZmPjulClQ== + version "7.25.4" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.25.4.tgz#7d2a80ce229890edcf4cc259d4d696cb4dae2fcb" + integrity sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ== "@babel/core@^7.21.3", "@babel/core@^7.24.5": version "7.25.2" @@ -44,12 +44,12 @@ json5 "^2.2.3" semver "^6.3.1" -"@babel/generator@^7.25.0": - version "7.25.0" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.25.0.tgz#f858ddfa984350bc3d3b7f125073c9af6988f18e" - integrity sha512-3LEEcj3PVW8pW2R1SR1M89g/qrYk/m/mB/tLqn7dn4sbBUQyTqnlod+II2U4dqiGtUmkcnAmkMDralTFZttRiw== +"@babel/generator@^7.25.0", "@babel/generator@^7.25.4": + version "7.25.4" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.25.4.tgz#1dc63c1c9caae9e6dc24e264eac254eb25005669" + integrity sha512-NFtZmZsyzDPJnk9Zg3BbTfKKc9UlHYzD0E//p2Z3B9nCwwtJW9T0gVbCz8+fBngnn4zf1Dr3IK8PHQQHq0lDQw== dependencies: - "@babel/types" "^7.25.0" + "@babel/types" "^7.25.4" "@jridgewell/gen-mapping" "^0.3.5" "@jridgewell/trace-mapping" "^0.3.25" jsesc "^2.5.1" @@ -129,12 +129,12 @@ js-tokens "^4.0.0" picocolors "^1.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.20.7", "@babel/parser@^7.25.0", "@babel/parser@^7.25.3": - version "7.25.3" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.25.3.tgz#91fb126768d944966263f0657ab222a642b82065" - integrity sha512-iLTJKDbJ4hMvFPgQwwsVoxtHyWpKKPBrxkANrSYewDPaPpT5py5yeVkgPIJ7XYXhndxJpaA3PyALSXQ7u8e/Dw== +"@babel/parser@^7.1.0", "@babel/parser@^7.20.7", "@babel/parser@^7.25.0", "@babel/parser@^7.25.4": + version "7.25.4" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.25.4.tgz#af4f2df7d02440286b7de57b1c21acfb2a6f257a" + integrity sha512-nq+eWrOgdtu3jG5Os4TQP3x3cLA8hR8TvJNjD8vnPa20WGycimcparWnLK4jJhElTK6SDyuJo1weMKO/5LpmLA== dependencies: - "@babel/types" "^7.25.2" + "@babel/types" "^7.25.4" "@babel/plugin-transform-react-jsx-self@^7.24.5": version "7.24.7" @@ -151,9 +151,9 @@ "@babel/helper-plugin-utils" "^7.24.7" "@babel/runtime@^7.12.5", "@babel/runtime@^7.18.3", "@babel/runtime@^7.23.9", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.7": - version "7.25.0" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.25.0.tgz#3af9a91c1b739c569d5d80cc917280919c544ecb" - integrity sha512-7dRy4DwXwtzBrPbZflqxnvfxLF8kdZXPkhymtDeFoFqE6ldzjQFgYTtYIFARcLEYDrqfBfYcZt1WqFxRoyC9Rw== + version "7.25.4" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.25.4.tgz#6ef37d678428306e7d75f054d5b1bdb8cf8aa8ee" + integrity sha512-DSgLeL/FNcpXuzav5wfYvHCGvynXkJbn3Zvc3823AEe9nPwW9IK4UoCSS5yGymmQzN0pCPvivtgS6/8U2kkm1w== dependencies: regenerator-runtime "^0.14.0" @@ -167,22 +167,22 @@ "@babel/types" "^7.25.0" "@babel/traverse@^7.24.7", "@babel/traverse@^7.25.2": - version "7.25.3" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.25.3.tgz#f1b901951c83eda2f3e29450ce92743783373490" - integrity sha512-HefgyP1x754oGCsKmV5reSmtV7IXj/kpaE1XYY+D9G5PvKKoFfSbiS4M77MdjuwlZKDIKFCffq9rPU+H/s3ZdQ== + version "7.25.4" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.25.4.tgz#648678046990f2957407e3086e97044f13c3e18e" + integrity sha512-VJ4XsrD+nOvlXyLzmLzUs/0qjFS4sK30te5yEFlvbbUNEgKaVb2BHZUpAL+ttLPQAHNrsI3zZisbfha5Cvr8vg== dependencies: "@babel/code-frame" "^7.24.7" - "@babel/generator" "^7.25.0" - "@babel/parser" "^7.25.3" + "@babel/generator" "^7.25.4" + "@babel/parser" "^7.25.4" "@babel/template" "^7.25.0" - "@babel/types" "^7.25.2" + "@babel/types" "^7.25.4" debug "^4.3.1" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.21.3", "@babel/types@^7.24.7", "@babel/types@^7.25.0", "@babel/types@^7.25.2": - version "7.25.2" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.25.2.tgz#55fb231f7dc958cd69ea141a4c2997e819646125" - integrity sha512-YTnYtra7W9e6/oAZEHj0bJehPRUlLH9/fbpT5LfB0NhQXyALCRkRs3zH9v07IYhkgpqX6Z78FnuccZr/l4Fs4Q== +"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.21.3", "@babel/types@^7.24.7", "@babel/types@^7.25.0", "@babel/types@^7.25.2", "@babel/types@^7.25.4": + version "7.25.4" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.25.4.tgz#6bcb46c72fdf1012a209d016c07f769e10adcb5f" + integrity sha512-zQ1ijeeCXVEh+aNL0RlmkPkG8HUiDcU2pzQQFjtbntgAczRASFzj4H+6+bV+dy1ntKR14I/DypeuRG1uma98iQ== dependencies: "@babel/helper-string-parser" "^7.24.8" "@babel/helper-validator-identifier" "^7.24.7" @@ -840,75 +840,75 @@ integrity sha512-v454Qs3REHc3Za59U+/eSmBsdmF+3NE5+76+lFDaitVqN4ZglDHENDaMARYKGJVZuxiSkzyqG0SeG7lLQjVkPA== "@tauri-apps/api@^2.0.0-rc.0", "@tauri-apps/api@^2.0.0-rc.1": - version "2.0.0-rc.2" - resolved "https://registry.yarnpkg.com/@tauri-apps/api/-/api-2.0.0-rc.2.tgz#0eeff3d80bf273008cf2f7d8ce15d170be790360" - integrity sha512-qIJJ1gKkzpPmEmIGTpja6XhuCD8A+vEh/wKaO7TzbxKiws5w3E+Kg4sBtwrH85hjMyqT0SgAUVaUk9XS7FBg3g== - -"@tauri-apps/cli-darwin-arm64@2.0.0-rc.6": - version "2.0.0-rc.6" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-2.0.0-rc.6.tgz#42be245fda3782f99d0eafd5b1ece86ba87a1de4" - integrity sha512-uLKb2hYMY3QYdcUDDVLPD7Jo4rWwJVjFBsnFydck7WhmUlERqTc2R1qr84beSPDDHqFiL38pHVYbTUItu0J6gA== - -"@tauri-apps/cli-darwin-x64@2.0.0-rc.6": - version "2.0.0-rc.6" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-2.0.0-rc.6.tgz#9e52cc174645b237648a7b5c6e40a6337f5c0b8d" - integrity sha512-4muxIQN24NKLf9GqOgS6dChA6/zIVzB5t79QaMmdbmJIa8T1inWa58HpCSHVhZpS4jkZHNt0LY5qf6/78pgslA== - -"@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-rc.6": - version "2.0.0-rc.6" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-2.0.0-rc.6.tgz#03a66471747d7c5063346483ad10c15b527916e2" - integrity sha512-PWWt6LH/uNUlXV/OFC0AK997F4FroTIJnA9UOt/gU0OD80+2/AxWPxZv9JBnKaO85aiDnB36r/PVeBC64b3LEA== - -"@tauri-apps/cli-linux-arm64-gnu@2.0.0-rc.6": - version "2.0.0-rc.6" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-2.0.0-rc.6.tgz#1e906acaa4cd6344ffe811262e428aba08ec2fbe" - integrity sha512-AH8+AB1i0hqNbrzbTKKoMx8pQ9Wl4I3pDAaMDlY42hSgzh9KkHnGg1WqyRNbwiJ6rplKNVefvP26p9b+uvzu3g== - -"@tauri-apps/cli-linux-arm64-musl@2.0.0-rc.6": - version "2.0.0-rc.6" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.0.0-rc.6.tgz#9ef98f4ce2f101cefccb48924e1b0571b4a79309" - integrity sha512-j9leBklTyaYBZeyy0Fj3rwQpPqlV+kD/6Ro0REr5L1IPkF1gkiIJV/hbJOQ2sFdLH/KCBQ+DqBYn8qhBvKLukw== - -"@tauri-apps/cli-linux-x64-gnu@2.0.0-rc.6": - version "2.0.0-rc.6" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-2.0.0-rc.6.tgz#789eb9a5b4997fcb6cec6b489cd06fbbd817072c" - integrity sha512-U0I1AwluC8wgkH3gi3k5D25UsXxBy9cNGr11FUSEhCifapRZ3cgpYPxCkepCsDnGThJivSV44BjBGD+STCj6Kw== - -"@tauri-apps/cli-linux-x64-musl@2.0.0-rc.6": - version "2.0.0-rc.6" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-2.0.0-rc.6.tgz#a905ca7310f8012addd712cb8cd16037ac63ce35" - integrity sha512-OL4BFZmrK6YbBkWvL5n6PfdcjuT6993uY+JoLJelrqKdoLWZeKy1+UIIIZGfrMMjpcD1YgqwUW6YiwkMPwcMyg== - -"@tauri-apps/cli-win32-arm64-msvc@2.0.0-rc.6": - version "2.0.0-rc.6" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-arm64-msvc/-/cli-win32-arm64-msvc-2.0.0-rc.6.tgz#120d3df19991c0749241934cabf27f0fe7c4ae8c" - integrity sha512-hVZl4+FNLzdVQqH/VijF5V86KmShMAS2SkJDXk+RdcB5y52tbEsZyBUpDlc3XwCW11HBINT2Y3FIxLOT74MgqA== - -"@tauri-apps/cli-win32-ia32-msvc@2.0.0-rc.6": - version "2.0.0-rc.6" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-2.0.0-rc.6.tgz#b28f8529e4fcc5427e5bd0f72bed4e90ff17c0b9" - integrity sha512-518O4YkYmifGlHSP4YJUCoiPvfdgnnA0/sxBT125IrTk67cnFmnwz18eniykYX8pwe7SleetRZ9JhEWpUYb0lQ== - -"@tauri-apps/cli-win32-x64-msvc@2.0.0-rc.6": - version "2.0.0-rc.6" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-2.0.0-rc.6.tgz#eb14e3a9ef458d4bde22ddd8fd393d3bb010daa8" - integrity sha512-06Fb3xQCEyw/O0cphBN5w6XH6Acu6kskXBqMQNt+RfAdFfOM92hrg2gGR+DVv3JRsZctwC4WXLe++TCqcq7nuw== - -"@tauri-apps/cli@^2.0.0-rc.0": - version "2.0.0-rc.6" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli/-/cli-2.0.0-rc.6.tgz#64b7638df75733f76483a7c3e5bd88e1820f8a63" - integrity sha512-yafCtmGDptkRASmn8WefoPYJjHqy2VE7tms+OQ0PK3vsgUU5+nrbhEyzpcVINHokWRhoT1kuUaNBnhTnUf7nWw== + version "2.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@tauri-apps/api/-/api-2.0.0-rc.3.tgz#1dd17530de9cafd854f77d3feeca1732a985a81e" + integrity sha512-k1erUfnoOFJwL5VNFZz0BQZ2agNstG7CNOjwpdWMl1vOaVuSn4DhJtXB0Deh9lZaaDlfrykKOyZs9c3XXpMi5Q== + +"@tauri-apps/cli-darwin-arm64@2.0.0-rc.7": + version "2.0.0-rc.7" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-2.0.0-rc.7.tgz#f4b581e5b39753a991a3047c7a8f793a2674c720" + integrity sha512-DUdO1TCj+cViFkOWtYotq4UNBGfHvl1xLK85n2rmpsCeveGxO9pf1CihOtADuVonHl6ETa9x/uaSTCMeMsKEbA== + +"@tauri-apps/cli-darwin-x64@2.0.0-rc.7": + version "2.0.0-rc.7" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-2.0.0-rc.7.tgz#dd0db378ca0ef3ca31794e5eb682b25ee82933e3" + integrity sha512-T36ncxLyfgKBsPXdgCfw7WeOtHwDrfkvjJoovlBH5nAejlxZC4g4pYm7/Qvpc++FRmQhcHJXP8Y+fBOSEZrfog== + +"@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-rc.7": + version "2.0.0-rc.7" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-2.0.0-rc.7.tgz#c3f369cd90d8bb76816314adb93005b511d0a35a" + integrity sha512-afLBeWgpm++9oKsYNShqKsBCHLLgMJy+rodHIiUd9LB4VqjU/1bYfZdia0PxKjnEuOz27mG9Be5v0SDdsZsLww== + +"@tauri-apps/cli-linux-arm64-gnu@2.0.0-rc.7": + version "2.0.0-rc.7" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-2.0.0-rc.7.tgz#0fba0be82a261cd05e3f622e3e9db67ee2b20ea5" + integrity sha512-sjT/URsuJ2ImJGe9fH0b8reewGq5R1E5t4DZRF0ZVpCpUC1yTpml0kuPWt4S0rGws/beRICPaZWW8OuColIFtQ== + +"@tauri-apps/cli-linux-arm64-musl@2.0.0-rc.7": + version "2.0.0-rc.7" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.0.0-rc.7.tgz#104d1eff19775bf02f75b89c369b548c4cb99b1c" + integrity sha512-s7OG30ffEBKF5BiMEIVmtd/UNHC956ihEOfZYRJwBZ9cL8qoPLjEMZYMCGB/767M4igXy1bhKaVnl8pZpk+RNw== + +"@tauri-apps/cli-linux-x64-gnu@2.0.0-rc.7": + version "2.0.0-rc.7" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-2.0.0-rc.7.tgz#93ddc89ba857af34cfaab70742fbce3324062bff" + integrity sha512-Qj9ibUvq2CwJE5JQ7M/DfOw44xcf59rUGsMGuku/bSKLPu6UXEFyUFjUURcnOgcZkq9o86no7ONoKdMxm4viKQ== + +"@tauri-apps/cli-linux-x64-musl@2.0.0-rc.7": + version "2.0.0-rc.7" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-2.0.0-rc.7.tgz#23ebd8bf9b627ef9cde9d78d229987fbd54fda76" + integrity sha512-75ucw3b7MVnyVNvoW+xqB1N8VGjx1vqP7HshAs+p1fSkeCOy2NvtMP7t8pdRlGQ59exH6vGvnQ/LxC5HgDP2Xg== + +"@tauri-apps/cli-win32-arm64-msvc@2.0.0-rc.7": + version "2.0.0-rc.7" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-arm64-msvc/-/cli-win32-arm64-msvc-2.0.0-rc.7.tgz#04647bc7b06e86b5aed722ec89e08ef346f50809" + integrity sha512-KaWY7kVbpmJCn5INtcPX+tji7CqwmqtGechith65VIlEUUs+KyOkMdmgbsJvqe0N58VMHLFzEVfx1xtlaKGDUA== + +"@tauri-apps/cli-win32-ia32-msvc@2.0.0-rc.7": + version "2.0.0-rc.7" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-2.0.0-rc.7.tgz#27bc34c30e04795edcee6031a7a4c3c64d3081ea" + integrity sha512-J2xVw7gcP1JY1Pj6lE+MuAUKtanD7tXyjBD6W8R2S7sD06Job9PHoonOQhm/vWlhQVtRkWPNX7K7MXbdoI/Z9w== + +"@tauri-apps/cli-win32-x64-msvc@2.0.0-rc.7": + version "2.0.0-rc.7" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-2.0.0-rc.7.tgz#a893da9e87e982c33589d4a4ae43f274c83a8882" + integrity sha512-0dQzFCUGjrpJBsj/JpV2XRUbH6nDbhW4NKpx6DUnFrwPe7YQwz2eexo7FAu2pLTW8HEPCPd0NvXGOCUrWM/klg== + +"@tauri-apps/cli@^2.0.0-rc.7": + version "2.0.0-rc.7" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli/-/cli-2.0.0-rc.7.tgz#e8b106d691d8bcbf4eea592023ca8ee6f63643dd" + integrity sha512-FdNcr75EIPfA69gWxpk3xv78og8CVbEa8ih2Rvp9k1tyAyryOth0Ps+jNEqP/WtfFwITWTYm4JqOubSCHoFjpQ== optionalDependencies: - "@tauri-apps/cli-darwin-arm64" "2.0.0-rc.6" - "@tauri-apps/cli-darwin-x64" "2.0.0-rc.6" - "@tauri-apps/cli-linux-arm-gnueabihf" "2.0.0-rc.6" - "@tauri-apps/cli-linux-arm64-gnu" "2.0.0-rc.6" - "@tauri-apps/cli-linux-arm64-musl" "2.0.0-rc.6" - "@tauri-apps/cli-linux-x64-gnu" "2.0.0-rc.6" - "@tauri-apps/cli-linux-x64-musl" "2.0.0-rc.6" - "@tauri-apps/cli-win32-arm64-msvc" "2.0.0-rc.6" - "@tauri-apps/cli-win32-ia32-msvc" "2.0.0-rc.6" - "@tauri-apps/cli-win32-x64-msvc" "2.0.0-rc.6" + "@tauri-apps/cli-darwin-arm64" "2.0.0-rc.7" + "@tauri-apps/cli-darwin-x64" "2.0.0-rc.7" + "@tauri-apps/cli-linux-arm-gnueabihf" "2.0.0-rc.7" + "@tauri-apps/cli-linux-arm64-gnu" "2.0.0-rc.7" + "@tauri-apps/cli-linux-arm64-musl" "2.0.0-rc.7" + "@tauri-apps/cli-linux-x64-gnu" "2.0.0-rc.7" + "@tauri-apps/cli-linux-x64-musl" "2.0.0-rc.7" + "@tauri-apps/cli-win32-arm64-msvc" "2.0.0-rc.7" + "@tauri-apps/cli-win32-ia32-msvc" "2.0.0-rc.7" + "@tauri-apps/cli-win32-x64-msvc" "2.0.0-rc.7" "@tauri-apps/plugin-autostart@^2.0.0-rc": version "2.0.0-rc.0" @@ -2495,9 +2495,9 @@ is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7: integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA== is-core-module@^2.11.0, is-core-module@^2.13.0, is-core-module@^2.13.1: - version "2.15.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.0.tgz#71c72ec5442ace7e76b306e9d48db361f22699ea" - integrity sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA== + version "2.15.1" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.1.tgz#a7363a25bee942fefab0de13bf6aa372c82dcc37" + integrity sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ== dependencies: hasown "^2.0.2" From 06fcba755379949b11a29e07b53b76e95455b807 Mon Sep 17 00:00:00 2001 From: Lucas Nogueira Date: Thu, 22 Aug 2024 23:02:44 -0300 Subject: [PATCH 4/8] uncommit .cargo/config.toml --- src-tauri/.cargo/config.toml | 4 ---- src-tauri/.gitignore | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 src-tauri/.cargo/config.toml diff --git a/src-tauri/.cargo/config.toml b/src-tauri/.cargo/config.toml deleted file mode 100644 index 58fa0284..00000000 --- a/src-tauri/.cargo/config.toml +++ /dev/null @@ -1,4 +0,0 @@ -[build] -target = "x86_64-pc-windows-msvc" - -[target] diff --git a/src-tauri/.gitignore b/src-tauri/.gitignore index c1237045..ff025bb6 100644 --- a/src-tauri/.gitignore +++ b/src-tauri/.gitignore @@ -2,3 +2,5 @@ # will have compiled files and executables /target/ WixTools + +.cargo/ \ No newline at end of file From 81ab67c05aceb1132a52391b8a1d441a13870e5e Mon Sep 17 00:00:00 2001 From: Lucas Nogueira Date: Thu, 22 Aug 2024 23:32:11 -0300 Subject: [PATCH 5/8] test fix --- .github/workflows/android.yml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 75a844e4..c28cc71a 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -48,19 +48,12 @@ jobs: run: yarn - name: Build interface run: yarn build - - name: recreate Android project - run: rm -r src-tauri/gen/android && yarn tauri android init - env: - NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }} # - name: Clippy # run: cargo clippy --manifest-path=src-tauri/Cargo.toml --all-targets --all-features -- -D warnings + - name: install test CLI + run: cargo install tauri-cli --git https://github.com/tauri-apps/tauri --branch fix/ensure-gradlew-executable - name: build Apk - uses: Ludea/tauri-build@android - id: build - with: - mobile: android - target: aarch64 - args: "--split-per-abi" + run: cargo tauri android build --target aarch64 --split-per-abi env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} STRONGHOLD_SALT: ${{ secrets.STRONGHOLD_SALT }} From 6557645659e4369bb3bbd01181c3a0a874db9c92 Mon Sep 17 00:00:00 2001 From: Lucas Nogueira Date: Thu, 22 Aug 2024 23:58:20 -0300 Subject: [PATCH 6/8] Revert "test fix" This reverts commit 81ab67c05aceb1132a52391b8a1d441a13870e5e. --- .github/workflows/android.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index c28cc71a..75a844e4 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -48,12 +48,19 @@ jobs: run: yarn - name: Build interface run: yarn build + - name: recreate Android project + run: rm -r src-tauri/gen/android && yarn tauri android init + env: + NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }} # - name: Clippy # run: cargo clippy --manifest-path=src-tauri/Cargo.toml --all-targets --all-features -- -D warnings - - name: install test CLI - run: cargo install tauri-cli --git https://github.com/tauri-apps/tauri --branch fix/ensure-gradlew-executable - name: build Apk - run: cargo tauri android build --target aarch64 --split-per-abi + uses: Ludea/tauri-build@android + id: build + with: + mobile: android + target: aarch64 + args: "--split-per-abi" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} STRONGHOLD_SALT: ${{ secrets.STRONGHOLD_SALT }} From 9d92cf6ebe5dd0e7305596cc305a21f3bb8e87a4 Mon Sep 17 00:00:00 2001 From: Lucas Nogueira Date: Fri, 23 Aug 2024 08:27:00 -0300 Subject: [PATCH 7/8] Reapply "test fix" This reverts commit 6557645659e4369bb3bbd01181c3a0a874db9c92. --- .github/workflows/android.yml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 75a844e4..c28cc71a 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -48,19 +48,12 @@ jobs: run: yarn - name: Build interface run: yarn build - - name: recreate Android project - run: rm -r src-tauri/gen/android && yarn tauri android init - env: - NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }} # - name: Clippy # run: cargo clippy --manifest-path=src-tauri/Cargo.toml --all-targets --all-features -- -D warnings + - name: install test CLI + run: cargo install tauri-cli --git https://github.com/tauri-apps/tauri --branch fix/ensure-gradlew-executable - name: build Apk - uses: Ludea/tauri-build@android - id: build - with: - mobile: android - target: aarch64 - args: "--split-per-abi" + run: cargo tauri android build --target aarch64 --split-per-abi env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} STRONGHOLD_SALT: ${{ secrets.STRONGHOLD_SALT }} From 20fedc50c67d512e6e2e0c9e72fa25bd1c19f7a2 Mon Sep 17 00:00:00 2001 From: Lucas Nogueira Date: Fri, 30 Aug 2024 22:37:07 -0300 Subject: [PATCH 8/8] update workflow --- .github/workflows/android.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index c28cc71a..d57570b6 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -50,10 +50,8 @@ jobs: run: yarn build # - name: Clippy # run: cargo clippy --manifest-path=src-tauri/Cargo.toml --all-targets --all-features -- -D warnings - - name: install test CLI - run: cargo install tauri-cli --git https://github.com/tauri-apps/tauri --branch fix/ensure-gradlew-executable - name: build Apk - run: cargo tauri android build --target aarch64 --split-per-abi + run: yarn tauri android build --target aarch64 --split-per-abi env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} STRONGHOLD_SALT: ${{ secrets.STRONGHOLD_SALT }}