From b724afb052b99b2c2b13107e2ccd63ff088efd51 Mon Sep 17 00:00:00 2001 From: Stadnik Andrii Date: Mon, 9 Oct 2023 17:57:50 +0300 Subject: [PATCH 01/35] fix: Fix artifact names in CD workflow --- .github/workflows/CD.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index b6139b6e..0362476f 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -21,6 +21,12 @@ jobs: if: github.base_ref == 'main' run: curl -L "docs.google.com/spreadsheets/d/${{ secrets.SHEET_ID }}/gviz/tq?tqx=out:csv&sheet=Ukrainian" -o table.csv + - uses: actions/upload-artifact@v3 + if: inputs.upload-artifact + with: + name: table + path: table.csv + - uses: dawidd6/action-download-artifact@v2 with: pr: ${{github.event.pull_request.number}} @@ -42,10 +48,8 @@ jobs: if: github.base_ref == 'main' && startsWith(github.ref, 'refs/tags/') steps: - uses: actions/checkout@v3 - - uses: dawidd6/action-download-artifact@v2 + - uses: actions/download-artifact@v3 with: - pr: ${{github.event.pull_request.number}} - workflow: CI.yml name: table - uses: dawidd6/action-download-artifact@v2 with: @@ -77,7 +81,7 @@ jobs: with: pr: ${{github.event.pull_request.number}} workflow: CI.yml - name: table + name: apk - name: send telegram message on push uses: appleboy/telegram-action@master @@ -85,7 +89,7 @@ jobs: with: to: ${{ secrets.TELEGRAM_TO }} token: ${{ secrets.TELEGRAM_TOKEN }} - document: table.csv + document: app-release.apk message: | ${{ github.actor }} created commit: Commit message: ${{ github.event.commits[0].message }} From 2ca7ebba4f7e8e54d8b3477a9a42525a8f4d25d2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 15:11:18 +0000 Subject: [PATCH 02/35] build(deps): bump smallvec from 1.11.0 to 1.11.1 (#443) Bumps [smallvec](https://github.com/servo/rust-smallvec) from 1.11.0 to 1.11.1. - [Release notes](https://github.com/servo/rust-smallvec/releases) - [Commits](https://github.com/servo/rust-smallvec/compare/v1.11.0...v1.11.1) --- updated-dependencies: - dependency-name: smallvec dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 06c2e07a..23d1a3db 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1473,9 +1473,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] name = "socket2" From 468358ebaf6c9dec04b2d563fe2e27ed0e0eca7b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 15:49:51 +0000 Subject: [PATCH 03/35] build(deps): bump itertools from 0.10.5 to 0.11.0 (#444) Bumps [itertools](https://github.com/rust-itertools/itertools) from 0.10.5 to 0.11.0. - [Changelog](https://github.com/rust-itertools/itertools/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-itertools/itertools/compare/v0.10.5...v0.11.0) --- updated-dependencies: - dependency-name: itertools dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 6 +++--- bot/Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 23d1a3db..a47d17a6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -144,7 +144,7 @@ dependencies = [ "anyhow", "first_aid_bot_core", "futures", - "itertools 0.10.5", + "itertools 0.11.0", "log", "pretty_env_logger", "rand", @@ -802,9 +802,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.10.5" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" dependencies = [ "either", ] diff --git a/bot/Cargo.toml b/bot/Cargo.toml index 48439224..fd07482c 100644 --- a/bot/Cargo.toml +++ b/bot/Cargo.toml @@ -12,7 +12,7 @@ teloxide = { version = "0.12", features = ["macros", "redis-storage", "bincode-serializer", "throttle"] } redis = { version = "0.23", features = ["tokio-comp"] } rand = "0.8" -itertools = "0.10" +itertools = "0.11" futures = "0.3" anyhow = { workspace = true } From f67bc9fce63516eb4d7f5812c6b6a124e223f69e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 16:09:43 +0000 Subject: [PATCH 04/35] build(deps): bump reqwest from 0.11.20 to 0.11.22 (#447) Bumps [reqwest](https://github.com/seanmonstar/reqwest) from 0.11.20 to 0.11.22. - [Release notes](https://github.com/seanmonstar/reqwest/releases) - [Changelog](https://github.com/seanmonstar/reqwest/blob/master/CHANGELOG.md) - [Commits](https://github.com/seanmonstar/reqwest/compare/v0.11.20...v0.11.22) --- updated-dependencies: - dependency-name: reqwest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a47d17a6..088cb509 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1267,9 +1267,9 @@ checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "reqwest" -version = "0.11.20" +version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ "base64", "bytes", @@ -1293,6 +1293,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "system-configuration", "tokio", "tokio-native-tls", "tokio-util", @@ -1525,6 +1526,27 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "take_mut" version = "0.2.2" From 4375650a04cfee300630c81a74f5ae445a9ffca3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 16:39:52 +0000 Subject: [PATCH 05/35] build(deps): bump csv from 1.2.2 to 1.3.0 (#445) Bumps [csv](https://github.com/BurntSushi/rust-csv) from 1.2.2 to 1.3.0. - [Commits](https://github.com/BurntSushi/rust-csv/compare/1.2.2...1.3.0) --- updated-dependencies: - dependency-name: csv dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- core/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 088cb509..c68f9d97 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -275,9 +275,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "csv" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" dependencies = [ "csv-core", "itoa", diff --git a/core/Cargo.toml b/core/Cargo.toml index e53a63fe..11c0bfee 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -11,7 +11,7 @@ crate-type = ["staticlib", "cdylib", "rlib"] [dependencies] # # Load the data -csv = "1.2" +csv = "1.3" bytes = "1.5" reqwest = { version = "0.11"} indexmap = "1.9" From c00985066057de891d753fccd24676ff824fc1a5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 17:04:01 +0000 Subject: [PATCH 06/35] build(deps): bump regex from 1.9.5 to 1.9.6 (#446) Bumps [regex](https://github.com/rust-lang/regex) from 1.9.5 to 1.9.6. - [Release notes](https://github.com/rust-lang/regex/releases) - [Changelog](https://github.com/rust-lang/regex/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/regex/compare/1.9.5...1.9.6) --- updated-dependencies: - dependency-name: regex dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 8 ++++---- core/Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c68f9d97..747eed19 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1238,9 +1238,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.5" +version = "1.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff" dependencies = [ "aho-corasick", "memchr", @@ -1250,9 +1250,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9" dependencies = [ "aho-corasick", "memchr", diff --git a/core/Cargo.toml b/core/Cargo.toml index 11c0bfee..a6552a83 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -21,7 +21,7 @@ log = { workspace = true } serde = { workspace = true, features = ["derive"] } const_format = "0.2" -regex = "1.9.5" +regex = "1.9.6" [dev-dependencies] env_logger = "0.10" From f7bc650f0d0a3cca11d9e746333ce18d3ae5e0be Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 08:41:45 +0000 Subject: [PATCH 07/35] build(deps): bump freezed from 2.4.2 to 2.4.5 in /app (#449) Bumps [freezed](https://github.com/rrousselGit/freezed) from 2.4.2 to 2.4.5. - [Commits](https://github.com/rrousselGit/freezed/compare/freezed-v2.4.2...freezed-v2.4.5) --- updated-dependencies: - dependency-name: freezed dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- app/pubspec.lock | 4 ++-- app/pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/pubspec.lock b/app/pubspec.lock index 51ed3cd0..aabf6839 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -279,10 +279,10 @@ packages: dependency: "direct dev" description: name: freezed - sha256: "83462cfc33dc9680533a7f3a4a6ab60aa94f287db5f4ee6511248c22833c497f" + sha256: "21bf2825311de65501d22e563e3d7605dff57fb5e6da982db785ae5372ff018a" url: "https://pub.dev" source: hosted - version: "2.4.2" + version: "2.4.5" freezed_annotation: dependency: "direct main" description: diff --git a/app/pubspec.yaml b/app/pubspec.yaml index d3e8d58e..4b15c233 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -54,7 +54,7 @@ dev_dependencies: flutter_lints: ^2.0.0 ffigen: ^8.0.2 build_runner: ^2.4.4 - freezed: ^2.3.5 + freezed: ^2.4.5 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec From dc2e719d2d4bb80acc423019f498d418e1285d38 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 09:30:13 +0000 Subject: [PATCH 08/35] build(deps): bump semver from 1.0.18 to 1.0.20 (#455) Bumps [semver](https://github.com/dtolnay/semver) from 1.0.18 to 1.0.20. - [Release notes](https://github.com/dtolnay/semver/releases) - [Commits](https://github.com/dtolnay/semver/compare/1.0.18...1.0.20) --- updated-dependencies: - dependency-name: semver dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 747eed19..90554b4b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1380,9 +1380,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "serde" From f9c6496e70072408a43f58789eed0e5748e4b9e4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 09:56:46 +0000 Subject: [PATCH 09/35] build(deps): bump tracing-core from 0.1.31 to 0.1.32 (#452) Bumps [tracing-core](https://github.com/tokio-rs/tracing) from 0.1.31 to 0.1.32. - [Release notes](https://github.com/tokio-rs/tracing/releases) - [Commits](https://github.com/tokio-rs/tracing/compare/tracing-core-0.1.31...tracing-core-0.1.32) --- updated-dependencies: - dependency-name: tracing-core dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 90554b4b..5c89ba72 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1791,9 +1791,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", ] From 9f9e736a5cb4da7f43c6b8385f3b2bb0165e5a40 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 10:39:19 +0000 Subject: [PATCH 10/35] build(deps): bump rustix from 0.38.13 to 0.38.19 (#453) Bumps [rustix](https://github.com/bytecodealliance/rustix) from 0.38.13 to 0.38.19. - [Release notes](https://github.com/bytecodealliance/rustix/releases) - [Commits](https://github.com/bytecodealliance/rustix/compare/v0.38.13...v0.38.19) --- updated-dependencies: - dependency-name: rustix dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5c89ba72..9c44a0a2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -838,9 +838,9 @@ checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "linux-raw-sys" -version = "0.4.7" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "lock_api" @@ -1323,9 +1323,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.13" +version = "0.38.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" +checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed" dependencies = [ "bitflags 2.4.0", "errno", From 805adbaa7b639d720fa304940f62426200914c81 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 10:58:48 +0000 Subject: [PATCH 11/35] build(deps): bump tokio from 1.32.0 to 1.33.0 (#454) Bumps [tokio](https://github.com/tokio-rs/tokio) from 1.32.0 to 1.33.0. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/compare/tokio-1.32.0...tokio-1.33.0) --- updated-dependencies: - dependency-name: tokio dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9c44a0a2..2c85aa3e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1710,9 +1710,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" dependencies = [ "backtrace", "bytes", From 2c09557bc3300095ec1ceb2bff3b1e9a9e59b2d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Oct 2023 14:02:09 +0000 Subject: [PATCH 12/35] build(deps): bump flutter_rust_bridge from 1.82.0 to 1.82.3 in /app (#450) Bumps [flutter_rust_bridge](https://github.com/fzyzcjy/flutter_rust_bridge) from 1.82.0 to 1.82.3. - [Release notes](https://github.com/fzyzcjy/flutter_rust_bridge/releases) - [Changelog](https://github.com/fzyzcjy/flutter_rust_bridge/blob/master/CHANGELOG.md) - [Commits](https://github.com/fzyzcjy/flutter_rust_bridge/compare/v1.82.0...v1.82.3) --- updated-dependencies: - dependency-name: flutter_rust_bridge dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- app/pubspec.lock | 16 ++++++++++++---- app/pubspec.yaml | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/pubspec.lock b/app/pubspec.lock index aabf6839..b9869c5c 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -266,10 +266,10 @@ packages: dependency: "direct main" description: name: flutter_rust_bridge - sha256: "85b6f4ed7b5caed631814b40bd87e066abe613172047504dc28a7372c234e9ea" + sha256: "2d31289a022f8b0a97e952d553686c50dff2ed5b58ac03628a13bc8cdf5f8ece" url: "https://pub.dev" source: hosted - version: "1.82.0" + version: "1.82.3" flutter_test: dependency: "direct dev" description: flutter @@ -544,6 +544,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.10.0" + sprintf: + dependency: transitive + description: + name: sprintf + sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23" + url: "https://pub.dev" + source: hosted + version: "7.0.0" stack_trace: dependency: transitive description: @@ -620,10 +628,10 @@ packages: dependency: transitive description: name: uuid - sha256: "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313" + sha256: b715b8d3858b6fa9f68f87d20d98830283628014750c2b09b6f516c1da4af2a7 url: "https://pub.dev" source: hosted - version: "3.0.7" + version: "4.1.0" vector_math: dependency: transitive description: diff --git a/app/pubspec.yaml b/app/pubspec.yaml index 4b15c233..bb8270f0 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -36,7 +36,7 @@ dependencies: # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.2 ffi: ^2.0.1 - flutter_rust_bridge: ^1.45.0 + flutter_rust_bridge: ^1.82.3 meta: ^1.8.0 freezed_annotation: ^2.2.0 flutter_platform_widgets: ^3.3.5 From 4226b56c47ca7631af84c75ef80fb7c088fd7d84 Mon Sep 17 00:00:00 2001 From: Stadnik Andrii Date: Fri, 20 Oct 2023 12:19:16 +0300 Subject: [PATCH 13/35] chore: Update dependencies --- Cargo.lock | 161 ++++++++++++++++++++++++------------------------ core/Cargo.toml | 4 +- 2 files changed, 81 insertions(+), 84 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2c85aa3e..95d59ae9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "1.0.5" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -74,13 +74,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.73" +version = "0.1.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -133,9 +133,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] name = "bot" @@ -233,18 +233,18 @@ dependencies = [ [[package]] name = "const_format" -version = "0.2.31" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c990efc7a285731f9a4378d81aff2f0e85a2c8781a05ef0f8baa8dac54d0ff48" +checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673" dependencies = [ "const_format_proc_macros", ] [[package]] name = "const_format_proc_macros" -version = "0.2.31" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e026b6ce194a874cb9cf32cd5772d1ef9767cc8fcb5765948d74f37a9d8b2bf6" +checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" dependencies = [ "proc-macro2", "quote", @@ -400,30 +400,19 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" dependencies = [ - "errno-dragonfly", "libc", "windows-sys", ] -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "first_aid_bot_core" @@ -445,9 +434,9 @@ dependencies = [ [[package]] name = "flutter_rust_bridge" -version = "1.82.0" +version = "1.82.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a23db02978984f7832254240b32fd92aa7ac085c159ad5684a8f8274ba636cb4" +checksum = "898aef1ddc8d2d357c726a9e758f55935e62dacc946097455225414b3856eb60" dependencies = [ "allo-isolate", "anyhow", @@ -471,9 +460,9 @@ dependencies = [ [[package]] name = "flutter_rust_bridge_macros" -version = "1.82.1" +version = "1.82.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ef4736aac920ca50be2c7747a46494d3740ca88bc49a6654b031d6f396282f3" +checksum = "d1ab3d175f0a09c1adb55fd98d7b6460b00af72c4e889b9eec2c5aee88273996" [[package]] name = "fnv" @@ -561,7 +550,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -727,16 +716,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] @@ -844,9 +833,9 @@ checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -936,9 +925,9 @@ checksum = "c96aba5aa877601bb3f6dd6a63a969e1f82e60646e81e71b14496995e9853c91" [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] @@ -974,7 +963,7 @@ version = "0.10.57" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "cfg-if", "foreign-types", "libc", @@ -991,7 +980,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1034,13 +1023,13 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall", + "redox_syscall 0.4.1", "smallvec", "windows-targets", ] @@ -1068,7 +1057,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1131,9 +1120,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -1236,11 +1225,20 @@ dependencies = [ "bitflags 1.3.2", ] +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + [[package]] name = "regex" -version = "1.9.6" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", @@ -1250,9 +1248,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.9" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", @@ -1261,9 +1259,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reqwest" @@ -1323,11 +1321,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.19" +version = "0.38.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed" +checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "errno", "libc", "linux-raw-sys", @@ -1386,22 +1384,22 @@ checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "serde" -version = "1.0.188" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1517,9 +1515,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.37" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -1639,7 +1637,7 @@ checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", "fastrand", - "redox_syscall", + "redox_syscall 0.3.5", "rustix", "windows-sys", ] @@ -1655,33 +1653,33 @@ dependencies = [ [[package]] name = "test-log" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9601d162c1d77e62c1ea0bc8116cd1caf143ce3af947536c3c9052a1677fe0c" +checksum = "f66edd6b6cd810743c0c71e1d085e92b01ce6a72782032e3f794c8284fe4bcdd" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.38", ] [[package]] name = "thiserror" -version = "1.0.48" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.48" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1734,7 +1732,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1780,11 +1778,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "pin-project-lite", "tracing-core", ] @@ -1854,9 +1851,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" dependencies = [ "getrandom", ] @@ -1915,7 +1912,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", "wasm-bindgen-shared", ] @@ -1949,7 +1946,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2015,10 +2012,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows" -version = "0.48.0" +name = "windows-core" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ "windows-targets", ] diff --git a/core/Cargo.toml b/core/Cargo.toml index a6552a83..c2704120 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -14,14 +14,14 @@ crate-type = ["staticlib", "cdylib", "rlib"] csv = "1.3" bytes = "1.5" reqwest = { version = "0.11"} -indexmap = "1.9" +indexmap = "2.0" anyhow = { workspace = true } tokio = { workspace = true } log = { workspace = true } serde = { workspace = true, features = ["derive"] } const_format = "0.2" -regex = "1.9.6" +regex = "1.10.2" [dev-dependencies] env_logger = "0.10" From 37f02ce58837e3ef512f6bc290cf29deab445d12 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Oct 2023 09:08:22 +0000 Subject: [PATCH 14/35] build(deps): bump socket2 from 0.4.9 to 0.4.10 (#458) Bumps [socket2](https://github.com/rust-lang/socket2) from 0.4.9 to 0.4.10. - [Release notes](https://github.com/rust-lang/socket2/releases) - [Changelog](https://github.com/rust-lang/socket2/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/socket2/compare/v0.4.9...v0.4.10) --- updated-dependencies: - dependency-name: socket2 dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 36 +++++++++++++++++++++++++++++------- 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 95d59ae9..02452a78 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -388,6 +388,12 @@ dependencies = [ "termcolor", ] +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "erasable" version = "1.2.1" @@ -423,7 +429,7 @@ dependencies = [ "const_format", "csv", "env_logger", - "indexmap", + "indexmap 2.0.2", "log", "regex", "reqwest", @@ -612,7 +618,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.3", "slab", "tokio", "tokio-util", @@ -625,6 +631,12 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +[[package]] +name = "hashbrown" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" + [[package]] name = "heck" version = "0.4.1" @@ -694,7 +706,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2 0.4.10", "tokio", "tower-service", "tracing", @@ -760,7 +772,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +dependencies = [ + "equivalent", + "hashbrown 0.14.2", ] [[package]] @@ -1210,7 +1232,7 @@ dependencies = [ "pin-project-lite", "ryu", "sha1_smol", - "socket2 0.4.9", + "socket2 0.4.10", "tokio", "tokio-util", "url", @@ -1478,9 +1500,9 @@ checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] name = "socket2" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" dependencies = [ "libc", "winapi", From 1dd7fb8e9278d05eeaf700786df8821049c6c0dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Oct 2023 09:36:55 +0000 Subject: [PATCH 15/35] build(deps): bump ipnet from 2.8.0 to 2.9.0 (#459) Bumps [ipnet](https://github.com/krisprice/ipnet) from 2.8.0 to 2.9.0. - [Release notes](https://github.com/krisprice/ipnet/releases) - [Changelog](https://github.com/krisprice/ipnet/blob/master/RELEASES.md) - [Commits](https://github.com/krisprice/ipnet/compare/2.8.0...2.9.0) --- updated-dependencies: - dependency-name: ipnet dependency-type: indirect update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 02452a78..19d0d02f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -787,9 +787,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-terminal" From dcb4530eb84650f59cd1a7901699c0b91a67354b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Oct 2023 08:58:44 +0000 Subject: [PATCH 16/35] build(deps): bump tokio-util from 0.7.9 to 0.7.10 (#460) Bumps [tokio-util](https://github.com/tokio-rs/tokio) from 0.7.9 to 0.7.10. - [Release notes](https://github.com/tokio-rs/tokio/releases) - [Commits](https://github.com/tokio-rs/tokio/commits) --- updated-dependencies: - dependency-name: tokio-util dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 19d0d02f..d23f9581 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1780,9 +1780,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" dependencies = [ "bytes", "futures-core", From 3e9347d758cadb8dee6e5b2753fd859cc4c2f795 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Oct 2023 09:38:20 +0000 Subject: [PATCH 17/35] build(deps): bump mio from 0.8.8 to 0.8.9 (#463) Bumps [mio](https://github.com/tokio-rs/mio) from 0.8.8 to 0.8.9. - [Release notes](https://github.com/tokio-rs/mio/releases) - [Changelog](https://github.com/tokio-rs/mio/blob/master/CHANGELOG.md) - [Commits](https://github.com/tokio-rs/mio/compare/v0.8.8...v0.8.9) --- updated-dependencies: - dependency-name: mio dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d23f9581..3574cc88 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -902,9 +902,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" dependencies = [ "libc", "wasi", From a5fb22a97764e088e44765cd1df286002e3a2ba5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Oct 2023 09:44:14 +0000 Subject: [PATCH 18/35] build(deps): bump futures-core from 0.3.28 to 0.3.29 (#464) Bumps [futures-core](https://github.com/rust-lang/futures-rs) from 0.3.28 to 0.3.29. - [Release notes](https://github.com/rust-lang/futures-rs/releases) - [Changelog](https://github.com/rust-lang/futures-rs/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/futures-rs/compare/0.3.28...0.3.29) --- updated-dependencies: - dependency-name: futures-core dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3574cc88..019afb1f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -527,9 +527,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-executor" From 615c53988c8f0c4a9b49b25a0040b5801000c910 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Oct 2023 10:25:04 +0000 Subject: [PATCH 19/35] build(deps): bump serde from 1.0.189 to 1.0.190 (#462) Bumps [serde](https://github.com/serde-rs/serde) from 1.0.189 to 1.0.190. - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](https://github.com/serde-rs/serde/compare/v1.0.189...v1.0.190) --- updated-dependencies: - dependency-name: serde dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 019afb1f..718c2b27 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1406,18 +1406,18 @@ checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "serde" -version = "1.0.189" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" +checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.189" +version = "1.0.190" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" +checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" dependencies = [ "proc-macro2", "quote", From 9c24baf2b5a29f071eb2e6b6149607069085fa92 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Oct 2023 10:30:28 +0000 Subject: [PATCH 20/35] build(deps): bump futures from 0.3.28 to 0.3.29 (#461) Bumps [futures](https://github.com/rust-lang/futures-rs) from 0.3.28 to 0.3.29. - [Release notes](https://github.com/rust-lang/futures-rs/releases) - [Changelog](https://github.com/rust-lang/futures-rs/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-lang/futures-rs/compare/0.3.28...0.3.29) --- updated-dependencies: - dependency-name: futures dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 718c2b27..24c76c09 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -502,9 +502,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" dependencies = [ "futures-channel", "futures-core", @@ -517,9 +517,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", "futures-sink", @@ -533,9 +533,9 @@ checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" dependencies = [ "futures-core", "futures-task", @@ -544,15 +544,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", @@ -561,21 +561,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ "futures-channel", "futures-core", From d495753debe4dbbb93e66e9fe42d2e3cdb188167 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Nov 2023 10:56:34 +0000 Subject: [PATCH 21/35] build(deps): bump flutter_lints from 2.0.3 to 3.0.0 in /app Bumps [flutter_lints](https://github.com/flutter/packages/tree/main/packages) from 2.0.3 to 3.0.0. - [Release notes](https://github.com/flutter/packages/releases) - [Commits](https://github.com/flutter/packages/commits/pigeon-v3.0.0/packages) --- updated-dependencies: - dependency-name: flutter_lints dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- app/pubspec.lock | 8 ++++---- app/pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/pubspec.lock b/app/pubspec.lock index b9869c5c..2b4a8494 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -250,10 +250,10 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04 + sha256: ad76540d21c066228ee3f9d1dad64a9f7e46530e8bb7c85011a88bc1fd874bc5 url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "3.0.0" flutter_platform_widgets: dependency: "direct main" description: @@ -367,10 +367,10 @@ packages: dependency: transitive description: name: lints - sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" + sha256: cbf8d4b858bb0134ef3ef87841abdf8d63bfc255c266b7bf6b39daa1085c4290 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "3.0.0" logging: dependency: transitive description: diff --git a/app/pubspec.yaml b/app/pubspec.yaml index bb8270f0..bd262a7c 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -51,7 +51,7 @@ dev_dependencies: # activated in the `analysis_options.yaml` file located at the root of your # package. See that file for information about deactivating specific lint # rules and activating additional ones. - flutter_lints: ^2.0.0 + flutter_lints: ^3.0.0 ffigen: ^8.0.2 build_runner: ^2.4.4 freezed: ^2.4.5 From fc8ca1c9094dc2cb7be64caaaadd277472437ad5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Nov 2023 08:33:13 +0000 Subject: [PATCH 22/35] build(deps): bump js-sys from 0.3.64 to 0.3.65 (#465) Bumps [js-sys](https://github.com/rustwasm/wasm-bindgen) from 0.3.64 to 0.3.65. - [Release notes](https://github.com/rustwasm/wasm-bindgen/releases) - [Changelog](https://github.com/rustwasm/wasm-bindgen/blob/main/CHANGELOG.md) - [Commits](https://github.com/rustwasm/wasm-bindgen/commits) --- updated-dependencies: - dependency-name: js-sys dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 24c76c09..b0c28331 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -828,9 +828,9 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" dependencies = [ "wasm-bindgen", ] @@ -1915,9 +1915,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -1925,9 +1925,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" dependencies = [ "bumpalo", "log", @@ -1952,9 +1952,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1962,9 +1962,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" dependencies = [ "proc-macro2", "quote", @@ -1975,9 +1975,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" [[package]] name = "wasm-streams" From 840ab427b0d5c613f35e48a138845ff39e802700 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Nov 2023 09:22:07 +0000 Subject: [PATCH 23/35] build(deps): bump flutter_lints from 3.0.0 to 3.0.1 in /app (#470) Bumps [flutter_lints](https://github.com/flutter/packages/tree/main/packages) from 3.0.0 to 3.0.1. - [Release notes](https://github.com/flutter/packages/releases) - [Commits](https://github.com/flutter/packages/commits/pigeon-v3.0.1/packages) --- updated-dependencies: - dependency-name: flutter_lints dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- app/pubspec.lock | 4 ++-- app/pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/pubspec.lock b/app/pubspec.lock index 2b4a8494..21d4a444 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -250,10 +250,10 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: ad76540d21c066228ee3f9d1dad64a9f7e46530e8bb7c85011a88bc1fd874bc5 + sha256: e2a421b7e59244faef694ba7b30562e489c2b489866e505074eb005cd7060db7 url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.0.1" flutter_platform_widgets: dependency: "direct main" description: diff --git a/app/pubspec.yaml b/app/pubspec.yaml index bd262a7c..dba6da2c 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -51,7 +51,7 @@ dev_dependencies: # activated in the `analysis_options.yaml` file located at the root of your # package. See that file for information about deactivating specific lint # rules and activating additional ones. - flutter_lints: ^3.0.0 + flutter_lints: ^3.0.1 ffigen: ^8.0.2 build_runner: ^2.4.4 freezed: ^2.4.5 From be48373866f6cdbf09864539ddab9b76587de526 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Nov 2023 08:37:12 +0000 Subject: [PATCH 24/35] build(deps): bump cc from 1.0.83 to 1.0.84 (#471) Bumps [cc](https://github.com/rust-lang/cc-rs) from 1.0.83 to 1.0.84. - [Release notes](https://github.com/rust-lang/cc-rs/releases) - [Commits](https://github.com/rust-lang/cc-rs/compare/1.0.83...1.0.84) --- updated-dependencies: - dependency-name: cc dependency-type: indirect update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b0c28331..7a772bbb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -180,9 +180,9 @@ checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "cc" -version = "1.0.83" +version = "1.0.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +checksum = "0f8e7c90afad890484a21653d08b6e209ae34770fb5ee298f9c699fcc1e5c856" dependencies = [ "libc", ] From 859463cb7e18b8787fa988e561bab9a30e6ffb43 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Nov 2023 09:16:45 +0000 Subject: [PATCH 25/35] build(deps): bump flutter_rust_bridge from 1.82.3 to 1.82.4 in /app (#475) Bumps [flutter_rust_bridge](https://github.com/fzyzcjy/flutter_rust_bridge) from 1.82.3 to 1.82.4. - [Release notes](https://github.com/fzyzcjy/flutter_rust_bridge/releases) - [Changelog](https://github.com/fzyzcjy/flutter_rust_bridge/blob/master/CHANGELOG.md) - [Commits](https://github.com/fzyzcjy/flutter_rust_bridge/compare/v1.82.3...v1.82.4) --- updated-dependencies: - dependency-name: flutter_rust_bridge dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- app/pubspec.lock | 4 ++-- app/pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/pubspec.lock b/app/pubspec.lock index 21d4a444..60a3385f 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -266,10 +266,10 @@ packages: dependency: "direct main" description: name: flutter_rust_bridge - sha256: "2d31289a022f8b0a97e952d553686c50dff2ed5b58ac03628a13bc8cdf5f8ece" + sha256: "7c5e94d037ccb0de7b5f7de3ff2491548d292b5aad01b01f5a5703f8aac9389b" url: "https://pub.dev" source: hosted - version: "1.82.3" + version: "1.82.4" flutter_test: dependency: "direct dev" description: flutter diff --git a/app/pubspec.yaml b/app/pubspec.yaml index dba6da2c..74d355fd 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -36,7 +36,7 @@ dependencies: # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.2 ffi: ^2.0.1 - flutter_rust_bridge: ^1.82.3 + flutter_rust_bridge: ^1.82.4 meta: ^1.8.0 freezed_annotation: ^2.2.0 flutter_platform_widgets: ^3.3.5 From ff5c0f1a35c6f30be6831d33360b8294dfa0031f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Nov 2023 10:00:36 +0000 Subject: [PATCH 26/35] build(deps): bump provider from 6.0.5 to 6.1.1 in /app (#473) Bumps [provider](https://github.com/rrousselGit/provider) from 6.0.5 to 6.1.1. - [Commits](https://github.com/rrousselGit/provider/compare/provider-v6.0.5...provider-v6.1.1) --- updated-dependencies: - dependency-name: provider dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- app/pubspec.lock | 4 ++-- app/pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/pubspec.lock b/app/pubspec.lock index 60a3385f..98362f41 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -463,10 +463,10 @@ packages: dependency: "direct main" description: name: provider - sha256: cdbe7530b12ecd9eb455bdaa2fcb8d4dad22e80b8afb4798b41479d5ce26847f + sha256: "9a96a0a19b594dbc5bf0f1f27d2bc67d5f95957359b461cd9feb44ed6ae75096" url: "https://pub.dev" source: hosted - version: "6.0.5" + version: "6.1.1" pub_semver: dependency: transitive description: diff --git a/app/pubspec.yaml b/app/pubspec.yaml index 74d355fd..54ebbba8 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -40,7 +40,7 @@ dependencies: meta: ^1.8.0 freezed_annotation: ^2.2.0 flutter_platform_widgets: ^3.3.5 - provider: ^6.0.5 + provider: ^6.1.1 dev_dependencies: flutter_test: From 46d1b392756875359cec25afb790065a5b22fedc Mon Sep 17 00:00:00 2001 From: Stadnik Andrii Date: Tue, 9 Jan 2024 12:16:56 +0200 Subject: [PATCH 27/35] Update flutter rust bridge --- Cargo.lock | 20 +- Cargo.toml | 3 +- app/.editorconfig | 2 - app/.gitignore | 10 +- app/.metadata | 34 +- app/analysis_options.yaml | 3 +- app/android/app/build.gradle | 52 +- app/android/app/src/debug/AndroidManifest.xml | 3 +- app/android/app/src/main/AndroidManifest.xml | 8 +- .../MainActivity.kt | 2 +- .../app/src/profile/AndroidManifest.xml | 3 +- app/android/build.gradle | 1 - app/android/gradle.properties | 2 +- app/android/settings.gradle | 34 +- app/flutter_rust_bridge.yaml | 2 + app/integration_test/simple_test.dart | 13 + app/ios/Flutter/Debug.xcconfig | 1 + app/ios/Flutter/Release.xcconfig | 1 + app/ios/Podfile | 44 ++ app/ios/Runner.xcodeproj/project.pbxproj | 201 +++++--- .../xcshareddata/xcschemes/Runner.xcscheme | 13 +- app/ios/Runner/AppDelegate.swift | 1 - app/ios/Runner/Info.plist | 6 +- app/ios/Runner/Runner-Bridging-Header.h | 1 - app/ios/Runner/bridge_generated.h | 89 ---- app/ios/RunnerTests/RunnerTests.swift | 12 + app/justfile | 24 - app/lib/main.dart | 83 ++-- app/lib/src/rust/api/simple.dart | 10 + app/lib/src/rust/frb_generated.dart | 89 ++++ app/lib/src/rust/frb_generated.io.dart | 90 ++++ app/lib/src/rust/frb_generated.web.dart | 57 +++ app/linux/CMakeLists.txt | 13 +- app/linux/flutter/generated_plugins.cmake | 1 + app/linux/my_application.cc | 4 +- app/linux/rust.cmake | 21 - app/macos/Flutter/Flutter-Debug.xcconfig | 1 + app/macos/Flutter/Flutter-Release.xcconfig | 1 + app/macos/Podfile | 43 ++ app/macos/Runner.xcodeproj/project.pbxproj | 199 +++++--- .../xcshareddata/xcschemes/Runner.xcscheme | 21 +- app/macos/Runner/AppDelegate.swift | 1 - app/macos/Runner/Configs/AppInfo.xcconfig | 6 +- app/macos/Runner/DebugProfile.entitlements | 2 - app/macos/Runner/MainFlutterWindow.swift | 2 +- app/macos/Runner/Release.entitlements | 2 - app/macos/Runner/bridge_generated.h | 89 ---- app/macos/RunnerTests/RunnerTests.swift | 12 + app/native/src/lib.rs | 2 - app/pubspec.lock | 458 +++--------------- app/pubspec.yaml | 29 +- app/rust/.gitignore | 1 + app/{native => rust}/Cargo.toml | 2 +- .../native.xcodeproj/project.pbxproj | 0 .../src/api}/bridge_generated.io.rs | 0 .../src => rust/src/api}/bridge_generated.rs | 0 .../src/api}/bridge_generated.web.rs | 0 .../src/api.rs => rust/src/api/simple.rs} | 2 + app/rust/src/frb_generated.io.rs | 38 ++ app/rust/src/frb_generated.rs | 72 +++ app/rust/src/frb_generated.web.rs | 39 ++ app/rust/src/lib.rs | 2 + app/rust_builder/.gitignore | 29 ++ app/rust_builder/README.md | 1 + app/rust_builder/android/.gitignore | 9 + app/rust_builder/android/build.gradle | 56 +++ app/rust_builder/android/settings.gradle | 1 + .../android/src/main/AndroidManifest.xml | 3 + app/rust_builder/cargokit/.gitignore | 4 + app/rust_builder/cargokit/LICENSE | 42 ++ app/rust_builder/cargokit/README | 11 + app/rust_builder/cargokit/build_pod.sh | 58 +++ .../cargokit/build_tool/README.md | 5 + .../cargokit/build_tool/analysis_options.yaml | 34 ++ .../cargokit/build_tool/bin/build_tool.dart | 8 + .../cargokit/build_tool/lib/build_tool.dart | 8 + .../lib/src/android_environment.dart | 195 ++++++++ .../lib/src/artifacts_provider.dart | 266 ++++++++++ .../build_tool/lib/src/build_cmake.dart | 40 ++ .../build_tool/lib/src/build_gradle.dart | 49 ++ .../build_tool/lib/src/build_pod.dart | 89 ++++ .../build_tool/lib/src/build_tool.dart | 271 +++++++++++ .../cargokit/build_tool/lib/src/builder.dart | 198 ++++++++ .../cargokit/build_tool/lib/src/cargo.dart | 48 ++ .../build_tool/lib/src/crate_hash.dart | 124 +++++ .../build_tool/lib/src/environment.dart | 68 +++ .../cargokit/build_tool/lib/src/logging.dart | 52 ++ .../cargokit/build_tool/lib/src/options.dart | 309 ++++++++++++ .../lib/src/precompile_binaries.dart | 202 ++++++++ .../cargokit/build_tool/lib/src/rustup.dart | 136 ++++++ .../cargokit/build_tool/lib/src/target.dart | 140 ++++++ .../cargokit/build_tool/lib/src/util.dart | 172 +++++++ .../build_tool/lib/src/verify_binaries.dart | 84 ++++ .../cargokit/build_tool/pubspec.lock | 453 +++++++++++++++++ .../cargokit/build_tool/pubspec.yaml | 33 ++ .../cargokit/cmake/cargokit.cmake | 97 ++++ .../cargokit/cmake/resolve_symlinks.ps1 | 27 ++ .../cargokit/gradle/plugin.gradle | 169 +++++++ app/rust_builder/cargokit/run_build_tool.cmd | 90 ++++ app/rust_builder/cargokit/run_build_tool.sh | 88 ++++ app/rust_builder/ios/Classes/dummy_file.c | 1 + app/rust_builder/ios/rust_builder.podspec | 45 ++ app/rust_builder/linux/CMakeLists.txt | 19 + app/rust_builder/macos/Classes/dummy_file.c | 1 + app/rust_builder/macos/rust_builder.podspec | 44 ++ app/rust_builder/pubspec.yaml | 34 ++ app/rust_builder/windows/.gitignore | 17 + app/rust_builder/windows/CMakeLists.txt | 20 + app/test/data_test.dart | 33 -- app/test/ffi.test.dart | 7 - app/test/widget_test.dart | 6 - app/test_driver/integration_test.dart | 3 + app/web/index.html | 6 +- app/web/manifest.json | 4 +- app/windows/CMakeLists.txt | 14 +- app/windows/flutter/CMakeLists.txt | 7 +- app/windows/flutter/generated_plugins.cmake | 1 + app/windows/runner/Runner.rc | 10 +- app/windows/runner/flutter_window.cpp | 5 + app/windows/runner/main.cpp | 2 +- app/windows/runner/utils.cpp | 9 +- app/windows/runner/win32_window.cpp | 2 +- app/windows/runner/win32_window.h | 2 +- app/windows/rust.cmake | 21 - 124 files changed, 4936 insertions(+), 1023 deletions(-) delete mode 100644 app/.editorconfig rename app/android/app/src/main/kotlin/com/example/{flutter_rust_bridge_template => app2}/MainActivity.kt (72%) create mode 100644 app/flutter_rust_bridge.yaml create mode 100644 app/integration_test/simple_test.dart create mode 100644 app/ios/Podfile delete mode 100644 app/ios/Runner/bridge_generated.h create mode 100644 app/ios/RunnerTests/RunnerTests.swift delete mode 100644 app/justfile create mode 100644 app/lib/src/rust/api/simple.dart create mode 100644 app/lib/src/rust/frb_generated.dart create mode 100644 app/lib/src/rust/frb_generated.io.dart create mode 100644 app/lib/src/rust/frb_generated.web.dart delete mode 100644 app/linux/rust.cmake create mode 100644 app/macos/Podfile delete mode 100644 app/macos/Runner/bridge_generated.h create mode 100644 app/macos/RunnerTests/RunnerTests.swift delete mode 100644 app/native/src/lib.rs create mode 100644 app/rust/.gitignore rename app/{native => rust}/Cargo.toml (95%) rename app/{native => rust}/native.xcodeproj/project.pbxproj (100%) rename app/{native/src => rust/src/api}/bridge_generated.io.rs (100%) rename app/{native/src => rust/src/api}/bridge_generated.rs (100%) rename app/{native/src => rust/src/api}/bridge_generated.web.rs (100%) rename app/{native/src/api.rs => rust/src/api/simple.rs} (97%) create mode 100644 app/rust/src/frb_generated.io.rs create mode 100644 app/rust/src/frb_generated.rs create mode 100644 app/rust/src/frb_generated.web.rs create mode 100644 app/rust/src/lib.rs create mode 100644 app/rust_builder/.gitignore create mode 100644 app/rust_builder/README.md create mode 100644 app/rust_builder/android/.gitignore create mode 100644 app/rust_builder/android/build.gradle create mode 100644 app/rust_builder/android/settings.gradle create mode 100644 app/rust_builder/android/src/main/AndroidManifest.xml create mode 100644 app/rust_builder/cargokit/.gitignore create mode 100644 app/rust_builder/cargokit/LICENSE create mode 100644 app/rust_builder/cargokit/README create mode 100755 app/rust_builder/cargokit/build_pod.sh create mode 100644 app/rust_builder/cargokit/build_tool/README.md create mode 100644 app/rust_builder/cargokit/build_tool/analysis_options.yaml create mode 100644 app/rust_builder/cargokit/build_tool/bin/build_tool.dart create mode 100644 app/rust_builder/cargokit/build_tool/lib/build_tool.dart create mode 100644 app/rust_builder/cargokit/build_tool/lib/src/android_environment.dart create mode 100644 app/rust_builder/cargokit/build_tool/lib/src/artifacts_provider.dart create mode 100644 app/rust_builder/cargokit/build_tool/lib/src/build_cmake.dart create mode 100644 app/rust_builder/cargokit/build_tool/lib/src/build_gradle.dart create mode 100644 app/rust_builder/cargokit/build_tool/lib/src/build_pod.dart create mode 100644 app/rust_builder/cargokit/build_tool/lib/src/build_tool.dart create mode 100644 app/rust_builder/cargokit/build_tool/lib/src/builder.dart create mode 100644 app/rust_builder/cargokit/build_tool/lib/src/cargo.dart create mode 100644 app/rust_builder/cargokit/build_tool/lib/src/crate_hash.dart create mode 100644 app/rust_builder/cargokit/build_tool/lib/src/environment.dart create mode 100644 app/rust_builder/cargokit/build_tool/lib/src/logging.dart create mode 100644 app/rust_builder/cargokit/build_tool/lib/src/options.dart create mode 100644 app/rust_builder/cargokit/build_tool/lib/src/precompile_binaries.dart create mode 100644 app/rust_builder/cargokit/build_tool/lib/src/rustup.dart create mode 100644 app/rust_builder/cargokit/build_tool/lib/src/target.dart create mode 100644 app/rust_builder/cargokit/build_tool/lib/src/util.dart create mode 100644 app/rust_builder/cargokit/build_tool/lib/src/verify_binaries.dart create mode 100644 app/rust_builder/cargokit/build_tool/pubspec.lock create mode 100644 app/rust_builder/cargokit/build_tool/pubspec.yaml create mode 100644 app/rust_builder/cargokit/cmake/cargokit.cmake create mode 100644 app/rust_builder/cargokit/cmake/resolve_symlinks.ps1 create mode 100644 app/rust_builder/cargokit/gradle/plugin.gradle create mode 100755 app/rust_builder/cargokit/run_build_tool.cmd create mode 100755 app/rust_builder/cargokit/run_build_tool.sh create mode 100644 app/rust_builder/ios/Classes/dummy_file.c create mode 100644 app/rust_builder/ios/rust_builder.podspec create mode 100644 app/rust_builder/linux/CMakeLists.txt create mode 100644 app/rust_builder/macos/Classes/dummy_file.c create mode 100644 app/rust_builder/macos/rust_builder.podspec create mode 100644 app/rust_builder/pubspec.yaml create mode 100644 app/rust_builder/windows/.gitignore create mode 100644 app/rust_builder/windows/CMakeLists.txt delete mode 100644 app/test/data_test.dart delete mode 100644 app/test/ffi.test.dart delete mode 100644 app/test/widget_test.dart create mode 100644 app/test_driver/integration_test.dart delete mode 100644 app/windows/rust.cmake diff --git a/Cargo.lock b/Cargo.lock index 7a772bbb..234f71e3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -911,16 +911,6 @@ dependencies = [ "windows-sys", ] -[[package]] -name = "native" -version = "0.1.0" -dependencies = [ - "first_aid_bot_core", - "flutter_rust_bridge", - "openssl", - "tokio", -] - [[package]] name = "native-tls" version = "0.2.11" @@ -1326,6 +1316,16 @@ dependencies = [ "winreg", ] +[[package]] +name = "rust_lib" +version = "0.1.0" +dependencies = [ + "first_aid_bot_core", + "flutter_rust_bridge", + "openssl", + "tokio", +] + [[package]] name = "rustc-demangle" version = "0.1.23" diff --git a/Cargo.toml b/Cargo.toml index a6df4a84..fe9b1699 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,8 @@ resolver = "2" members = [ "core", "bot", - "app/native" + # "app/native" + "app2/rust" ] [workspace.dependencies] diff --git a/app/.editorconfig b/app/.editorconfig deleted file mode 100644 index 9d4c2fa8..00000000 --- a/app/.editorconfig +++ /dev/null @@ -1,2 +0,0 @@ -[*.dart] -indent_size = 2 diff --git a/app/.gitignore b/app/.gitignore index 09360f32..29a3a501 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -8,6 +8,7 @@ .buildlog/ .history .svn/ +migrate_working_dir/ # IntelliJ related *.iml @@ -26,13 +27,10 @@ .dart_tool/ .flutter-plugins .flutter-plugins-dependencies -.packages .pub-cache/ .pub/ /build/ -# Web related - # Symbolication related app.*.symbols @@ -43,9 +41,3 @@ app.*.map.json /android/app/debug /android/app/profile /android/app/release -native/target -xcuserdata -jniLibs - -Cargo.lock -pubspec.lock diff --git a/app/.metadata b/app/.metadata index 8e89d4de..3e6e02af 100644 --- a/app/.metadata +++ b/app/.metadata @@ -1,11 +1,11 @@ # This file tracks properties of this Flutter project. # Used by Flutter tool to assess capabilities and perform upgrades etc. # -# This file should be version controlled. +# This file should be version controlled and should not be manually edited. version: - revision: 9944297138845a94256f1cf37beb88ff9a8e811a - channel: stable + revision: "78666c8dc57e9f7548ca9f8dd0740fbf0c658dc9" + channel: "stable" project_type: app @@ -13,26 +13,26 @@ project_type: app migration: platforms: - platform: root - create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a - base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a + create_revision: 78666c8dc57e9f7548ca9f8dd0740fbf0c658dc9 + base_revision: 78666c8dc57e9f7548ca9f8dd0740fbf0c658dc9 - platform: android - create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a - base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a + create_revision: 78666c8dc57e9f7548ca9f8dd0740fbf0c658dc9 + base_revision: 78666c8dc57e9f7548ca9f8dd0740fbf0c658dc9 - platform: ios - create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a - base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a + create_revision: 78666c8dc57e9f7548ca9f8dd0740fbf0c658dc9 + base_revision: 78666c8dc57e9f7548ca9f8dd0740fbf0c658dc9 - platform: linux - create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a - base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a + create_revision: 78666c8dc57e9f7548ca9f8dd0740fbf0c658dc9 + base_revision: 78666c8dc57e9f7548ca9f8dd0740fbf0c658dc9 - platform: macos - create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a - base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a + create_revision: 78666c8dc57e9f7548ca9f8dd0740fbf0c658dc9 + base_revision: 78666c8dc57e9f7548ca9f8dd0740fbf0c658dc9 - platform: web - create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a - base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a + create_revision: 78666c8dc57e9f7548ca9f8dd0740fbf0c658dc9 + base_revision: 78666c8dc57e9f7548ca9f8dd0740fbf0c658dc9 - platform: windows - create_revision: 9944297138845a94256f1cf37beb88ff9a8e811a - base_revision: 9944297138845a94256f1cf37beb88ff9a8e811a + create_revision: 78666c8dc57e9f7548ca9f8dd0740fbf0c658dc9 + base_revision: 78666c8dc57e9f7548ca9f8dd0740fbf0c658dc9 # User provided section diff --git a/app/analysis_options.yaml b/app/analysis_options.yaml index 61b6c4de..0d290213 100644 --- a/app/analysis_options.yaml +++ b/app/analysis_options.yaml @@ -13,8 +13,7 @@ linter: # The lint rules applied to this project can be customized in the # section below to disable rules from the `package:flutter_lints/flutter.yaml` # included above or to enable additional rules. A list of all available lints - # and their documentation is published at - # https://dart-lang.github.io/linter/lints/index.html. + # and their documentation is published at https://dart.dev/lints. # # Instead of disabling a lint rule for the entire project in the # section below, it can also be suppressed for a single line of code diff --git a/app/android/app/build.gradle b/app/android/app/build.gradle index 35d5f7cd..98c3666c 100644 --- a/app/android/app/build.gradle +++ b/app/android/app/build.gradle @@ -1,3 +1,9 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) { } } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { flutterVersionCode = '1' @@ -21,11 +22,8 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - android { + namespace "com.example.app2" compileSdkVersion flutter.compileSdkVersion ndkVersion flutter.ndkVersion @@ -44,7 +42,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "com.example.first_aid_robot" + applicationId "com.example.app2" // You can update the following values to match your application needs. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. minSdkVersion flutter.minSdkVersion @@ -66,36 +64,4 @@ flutter { source '../..' } -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" -} - -[ - Debug: null, - Profile: '--release', - Release: '--release' -].each { - def taskPostfix = it.key - def profileMode = it.value - tasks.whenTaskAdded { task -> - if (task.name == "javaPreCompile$taskPostfix") { - task.dependsOn "cargoBuild$taskPostfix" - } - } - tasks.register("cargoBuild$taskPostfix", Exec) { - workingDir "../../native" - // environment ANDROID_NDK_HOME: "$ANDROID_NDK" - commandLine 'cargo', 'ndk', - // the 2 ABIs below are used by real Android devices - '-t', 'armeabi-v7a', - '-t', 'arm64-v8a', - // the below 2 ABIs are usually used for Android simulators, - // add or remove these ABIs as needed. - // '-t', 'x86', - // '-t', 'x86_64', - '-o', '../android/app/src/main/jniLibs', 'build' - if (profileMode != null) { - args profileMode - } - } -} +dependencies {} diff --git a/app/android/app/src/debug/AndroidManifest.xml b/app/android/app/src/debug/AndroidManifest.xml index be6a24e8..399f6981 100644 --- a/app/android/app/src/debug/AndroidManifest.xml +++ b/app/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,4 @@ - + - + - first_aid_robot + app2 diff --git a/app/web/manifest.json b/app/web/manifest.json index 39ebea07..1c02722f 100644 --- a/app/web/manifest.json +++ b/app/web/manifest.json @@ -1,6 +1,6 @@ { - "name": "first_aid_robot", - "short_name": "first_aid_robot", + "name": "app2", + "short_name": "app2", "start_url": ".", "display": "standalone", "background_color": "#0175C2", diff --git a/app/windows/CMakeLists.txt b/app/windows/CMakeLists.txt index fb2cf3c0..3b905263 100644 --- a/app/windows/CMakeLists.txt +++ b/app/windows/CMakeLists.txt @@ -1,14 +1,14 @@ # Project-level configuration. cmake_minimum_required(VERSION 3.14) -project(first_aid_robot LANGUAGES CXX) +project(app2 LANGUAGES CXX) # The name of the executable created for the application. Change this to change # the on-disk name of your application. -set(BINARY_NAME "first_aid_robot") +set(BINARY_NAME "app2") # Explicitly opt in to modern CMake behaviors to avoid warnings with recent # versions of CMake. -cmake_policy(SET CMP0063 NEW) +cmake_policy(VERSION 3.14...3.25) # Define build configuration option. get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) @@ -52,11 +52,11 @@ add_subdirectory(${FLUTTER_MANAGED_DIR}) # Application build; see runner/CMakeLists.txt. add_subdirectory("runner") + # Generated plugin build rules, which manage building the plugins and adding # them to the application. include(flutter/generated_plugins.cmake) -include(./rust.cmake) # === Installation === # Support files are copied into place next to the executable, so that it can @@ -87,6 +87,12 @@ if(PLUGIN_BUNDLED_LIBRARIES) COMPONENT Runtime) endif() +# Copy the native assets provided by the build.dart from all packages. +set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/windows/") +install(DIRECTORY "${NATIVE_ASSETS_DIR}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + # Fully re-copy the assets directory on each build to avoid having stale files # from a previous install. set(FLUTTER_ASSET_DIR_NAME "flutter_assets") diff --git a/app/windows/flutter/CMakeLists.txt b/app/windows/flutter/CMakeLists.txt index 930d2071..903f4899 100644 --- a/app/windows/flutter/CMakeLists.txt +++ b/app/windows/flutter/CMakeLists.txt @@ -10,6 +10,11 @@ include(${EPHEMERAL_DIR}/generated_config.cmake) # https://github.com/flutter/flutter/issues/57146. set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper") +# Set fallback configurations for older versions of the flutter tool. +if (NOT DEFINED FLUTTER_TARGET_PLATFORM) + set(FLUTTER_TARGET_PLATFORM "windows-x64") +endif() + # === Flutter Library === set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll") @@ -92,7 +97,7 @@ add_custom_command( COMMAND ${CMAKE_COMMAND} -E env ${FLUTTER_TOOL_ENVIRONMENT} "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat" - windows-x64 $ + ${FLUTTER_TARGET_PLATFORM} $ VERBATIM ) add_custom_target(flutter_assemble DEPENDS diff --git a/app/windows/flutter/generated_plugins.cmake b/app/windows/flutter/generated_plugins.cmake index b93c4c30..7f4127b0 100644 --- a/app/windows/flutter/generated_plugins.cmake +++ b/app/windows/flutter/generated_plugins.cmake @@ -6,6 +6,7 @@ list(APPEND FLUTTER_PLUGIN_LIST ) list(APPEND FLUTTER_FFI_PLUGIN_LIST + rust_builder ) set(PLUGIN_BUNDLED_LIBRARIES) diff --git a/app/windows/runner/Runner.rc b/app/windows/runner/Runner.rc index d2cb051d..b492edd9 100644 --- a/app/windows/runner/Runner.rc +++ b/app/windows/runner/Runner.rc @@ -90,12 +90,12 @@ BEGIN BLOCK "040904e4" BEGIN VALUE "CompanyName", "com.example" "\0" - VALUE "FileDescription", "first_aid_robot" "\0" + VALUE "FileDescription", "app2" "\0" VALUE "FileVersion", VERSION_AS_STRING "\0" - VALUE "InternalName", "first_aid_robot" "\0" - VALUE "LegalCopyright", "Copyright (C) 2023 com.example. All rights reserved." "\0" - VALUE "OriginalFilename", "first_aid_robot.exe" "\0" - VALUE "ProductName", "first_aid_robot" "\0" + VALUE "InternalName", "app2" "\0" + VALUE "LegalCopyright", "Copyright (C) 2024 com.example. All rights reserved." "\0" + VALUE "OriginalFilename", "app2.exe" "\0" + VALUE "ProductName", "app2" "\0" VALUE "ProductVersion", VERSION_AS_STRING "\0" END END diff --git a/app/windows/runner/flutter_window.cpp b/app/windows/runner/flutter_window.cpp index b25e363e..955ee303 100644 --- a/app/windows/runner/flutter_window.cpp +++ b/app/windows/runner/flutter_window.cpp @@ -31,6 +31,11 @@ bool FlutterWindow::OnCreate() { this->Show(); }); + // Flutter can complete the first frame before the "show window" callback is + // registered. The following call ensures a frame is pending to ensure the + // window is shown. It is a no-op if the first frame hasn't completed yet. + flutter_controller_->ForceRedraw(); + return true; } diff --git a/app/windows/runner/main.cpp b/app/windows/runner/main.cpp index 33b51b85..3decfa58 100644 --- a/app/windows/runner/main.cpp +++ b/app/windows/runner/main.cpp @@ -27,7 +27,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, FlutterWindow window(project); Win32Window::Point origin(10, 10); Win32Window::Size size(1280, 720); - if (!window.Create(L"first_aid_robot", origin, size)) { + if (!window.Create(L"app2", origin, size)) { return EXIT_FAILURE; } window.SetQuitOnClose(true); diff --git a/app/windows/runner/utils.cpp b/app/windows/runner/utils.cpp index f5bf9fa0..b2b08734 100644 --- a/app/windows/runner/utils.cpp +++ b/app/windows/runner/utils.cpp @@ -47,16 +47,17 @@ std::string Utf8FromUtf16(const wchar_t* utf16_string) { } int target_length = ::WideCharToMultiByte( CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, - -1, nullptr, 0, nullptr, nullptr); + -1, nullptr, 0, nullptr, nullptr) + -1; // remove the trailing null character + int input_length = (int)wcslen(utf16_string); std::string utf8_string; - if (target_length == 0 || target_length > utf8_string.max_size()) { + if (target_length <= 0 || target_length > utf8_string.max_size()) { return utf8_string; } utf8_string.resize(target_length); int converted_length = ::WideCharToMultiByte( CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, - -1, utf8_string.data(), - target_length, nullptr, nullptr); + input_length, utf8_string.data(), target_length, nullptr, nullptr); if (converted_length == 0) { return std::string(); } diff --git a/app/windows/runner/win32_window.cpp b/app/windows/runner/win32_window.cpp index 041a3855..60608d0f 100644 --- a/app/windows/runner/win32_window.cpp +++ b/app/windows/runner/win32_window.cpp @@ -60,7 +60,7 @@ class WindowClassRegistrar { public: ~WindowClassRegistrar() = default; - // Returns the singleton registar instance. + // Returns the singleton registrar instance. static WindowClassRegistrar* GetInstance() { if (!instance_) { instance_ = new WindowClassRegistrar(); diff --git a/app/windows/runner/win32_window.h b/app/windows/runner/win32_window.h index c86632d8..e901dde6 100644 --- a/app/windows/runner/win32_window.h +++ b/app/windows/runner/win32_window.h @@ -77,7 +77,7 @@ class Win32Window { // OS callback called by message pump. Handles the WM_NCCREATE message which // is passed when the non-client area is being created and enables automatic // non-client DPI scaling so that the non-client area automatically - // responsponds to changes in DPI. All other messages are handled by + // responds to changes in DPI. All other messages are handled by // MessageHandler. static LRESULT CALLBACK WndProc(HWND const window, UINT const message, diff --git a/app/windows/rust.cmake b/app/windows/rust.cmake deleted file mode 100644 index a7c53217..00000000 --- a/app/windows/rust.cmake +++ /dev/null @@ -1,21 +0,0 @@ -# We include Corrosion inline here, but ideally in a project with -# many dependencies we would need to install Corrosion on the system. -# See instructions on https://github.com/AndrewGaspar/corrosion#cmake-install -# Once done, uncomment this line: -# find_package(Corrosion REQUIRED) - -include(FetchContent) - -FetchContent_Declare( - Corrosion - GIT_REPOSITORY https://github.com/AndrewGaspar/corrosion.git - GIT_TAG origin/master # Optionally specify a version tag or branch here -) - -FetchContent_MakeAvailable(Corrosion) - -corrosion_import_crate(MANIFEST_PATH ../native/Cargo.toml IMPORTED_CRATES imported_crates) -target_link_libraries(${BINARY_NAME} PRIVATE ${imported_crates}) -foreach(imported_crate ${imported_crates}) - list(APPEND PLUGIN_BUNDLED_LIBRARIES $) -endforeach() From 61ec7c68bfb7fdacb9f8b426e2c5a2ed6e2075fd Mon Sep 17 00:00:00 2001 From: Stadnik Andrii Date: Tue, 9 Jan 2024 12:18:26 +0200 Subject: [PATCH 28/35] Update gh actions --- .github/workflows/build_flutter_apk.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_flutter_apk.yml b/.github/workflows/build_flutter_apk.yml index c5d05872..e52d2a4b 100644 --- a/.github/workflows/build_flutter_apk.yml +++ b/.github/workflows/build_flutter_apk.yml @@ -37,6 +37,7 @@ jobs: - uses: baptiste0928/cargo-install@v2 with: crate: flutter_rust_bridge_codegen + version: 2.0.0-dev.0 - uses: baptiste0928/cargo-install@v2 with: crate: cargo-ndk From ea09f3ae8285f2dfd131de78028c1d4e8ce42ef7 Mon Sep 17 00:00:00 2001 From: Stadnik Andrii Date: Tue, 30 Apr 2024 12:18:11 +0300 Subject: [PATCH 29/35] Update --- Cargo.lock | 212 +---------------------------------------------------- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 212 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 234f71e3..c890ef4a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -26,33 +26,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "allo-isolate" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f56b7997817c178b853573e8bdfb6c3afe02810b43f17d766d6703560074b0c3" -dependencies = [ - "anyhow", - "atomic", - "backtrace", - "chrono", -] - -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - [[package]] name = "anyhow" version = "1.0.75" @@ -83,12 +56,6 @@ dependencies = [ "syn 2.0.38", ] -[[package]] -name = "atomic" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba" - [[package]] name = "autocfg" version = "1.1.0" @@ -154,24 +121,12 @@ dependencies = [ "tokio", ] -[[package]] -name = "build-target" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "832133bbabbbaa9fbdba793456a2827627a7d2b8fb96032fa1e7666d7895832b" - [[package]] name = "bumpalo" version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" -[[package]] -name = "bytemuck" -version = "1.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" - [[package]] name = "bytes" version = "1.5.0" @@ -199,12 +154,7 @@ version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", "num-traits", - "wasm-bindgen", - "windows-targets", ] [[package]] @@ -221,16 +171,6 @@ dependencies = [ "tokio-util", ] -[[package]] -name = "console_error_panic_hook" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" -dependencies = [ - "cfg-if", - "wasm-bindgen", -] - [[package]] name = "const_format" version = "0.2.32" @@ -329,15 +269,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "dart-sys" -version = "4.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d8b5680b5c2cc52f50acb2457d9b3a3b58adcca785db13a0e3655626f601de6" -dependencies = [ - "cc", -] - [[package]] name = "derive_more" version = "0.99.17" @@ -438,38 +369,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "flutter_rust_bridge" -version = "1.82.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "898aef1ddc8d2d357c726a9e758f55935e62dacc946097455225414b3856eb60" -dependencies = [ - "allo-isolate", - "anyhow", - "backtrace", - "build-target", - "bytemuck", - "cc", - "chrono", - "console_error_panic_hook", - "dart-sys", - "flutter_rust_bridge_macros", - "js-sys", - "lazy_static", - "libc", - "log", - "parking_lot", - "threadpool", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "flutter_rust_bridge_macros" -version = "1.82.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1ab3d175f0a09c1adb55fd98d7b6460b00af72c4e889b9eec2c5aee88273996" - [[package]] name = "fnv" version = "1.0.7" @@ -726,29 +625,6 @@ dependencies = [ "tokio-native-tls", ] -[[package]] -name = "iana-time-zone" -version = "0.1.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows-core", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - [[package]] name = "ident_case" version = "1.0.1" @@ -853,16 +729,6 @@ version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" -[[package]] -name = "lock_api" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" -dependencies = [ - "autocfg", - "scopeguard", -] - [[package]] name = "log" version = "0.4.20" @@ -1001,15 +867,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" -[[package]] -name = "openssl-src" -version = "300.1.5+3.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "559068e4c12950d7dcaa1857a61725c0d38d4fc03ff8e070ab31a75d6e316491" -dependencies = [ - "cc", -] - [[package]] name = "openssl-sys" version = "0.9.93" @@ -1018,34 +875,10 @@ checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" dependencies = [ "cc", "libc", - "openssl-src", "pkg-config", "vcpkg", ] -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.4.1", - "smallvec", - "windows-targets", -] - [[package]] name = "percent-encoding" version = "2.3.0" @@ -1237,15 +1070,6 @@ dependencies = [ "bitflags 1.3.2", ] -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "regex" version = "1.10.2" @@ -1316,16 +1140,6 @@ dependencies = [ "winreg", ] -[[package]] -name = "rust_lib" -version = "0.1.0" -dependencies = [ - "first_aid_bot_core", - "flutter_rust_bridge", - "openssl", - "tokio", -] - [[package]] name = "rustc-demangle" version = "0.1.23" @@ -1492,12 +1306,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "smallvec" -version = "1.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" - [[package]] name = "socket2" version = "0.4.10" @@ -1659,7 +1467,7 @@ checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", "fastrand", - "redox_syscall 0.3.5", + "redox_syscall", "rustix", "windows-sys", ] @@ -1704,15 +1512,6 @@ dependencies = [ "syn 2.0.38", ] -[[package]] -name = "threadpool" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" -dependencies = [ - "num_cpus", -] - [[package]] name = "tinyvec" version = "1.6.0" @@ -2033,15 +1832,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows-core" -version = "0.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" -dependencies = [ - "windows-targets", -] - [[package]] name = "windows-sys" version = "0.48.0" diff --git a/Cargo.toml b/Cargo.toml index fe9b1699..fdb41b2a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ members = [ "core", "bot", # "app/native" - "app2/rust" + # "app/rust" ] [workspace.dependencies] From 782335097f440e1c2207e51a78eee2bc1dde5367 Mon Sep 17 00:00:00 2001 From: Stadnik Andrii Date: Tue, 30 Apr 2024 12:24:49 +0300 Subject: [PATCH 30/35] Replace app2 with app --- app/android/app/build.gradle | 4 ++-- app/android/app/src/main/AndroidManifest.xml | 2 +- .../kotlin/com/example/app2/MainActivity.kt | 2 +- app/integration_test/simple_test.dart | 4 ++-- app/ios/Runner.xcodeproj/project.pbxproj | 12 ++++++------ app/ios/Runner/Info.plist | 4 ++-- app/lib/src/rust/frb_generated.io.dart | 2 +- app/linux/CMakeLists.txt | 4 ++-- app/linux/my_application.cc | 4 ++-- app/macos/Runner.xcodeproj/project.pbxproj | 18 +++++++++--------- .../xcshareddata/xcschemes/Runner.xcscheme | 8 ++++---- app/macos/Runner/Configs/AppInfo.xcconfig | 4 ++-- app/pubspec.yaml | 2 +- app/rust/src/frb_generated.io.rs | 2 +- app/web/index.html | 4 ++-- app/web/manifest.json | 4 ++-- app/windows/CMakeLists.txt | 4 ++-- app/windows/runner/Runner.rc | 8 ++++---- app/windows/runner/main.cpp | 2 +- 19 files changed, 47 insertions(+), 47 deletions(-) diff --git a/app/android/app/build.gradle b/app/android/app/build.gradle index 98c3666c..d6f6037a 100644 --- a/app/android/app/build.gradle +++ b/app/android/app/build.gradle @@ -23,7 +23,7 @@ if (flutterVersionName == null) { } android { - namespace "com.example.app2" + namespace "com.example.app" compileSdkVersion flutter.compileSdkVersion ndkVersion flutter.ndkVersion @@ -42,7 +42,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "com.example.app2" + applicationId "com.example.app" // You can update the following values to match your application needs. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. minSdkVersion flutter.minSdkVersion diff --git a/app/android/app/src/main/AndroidManifest.xml b/app/android/app/src/main/AndroidManifest.xml index 1008a63b..e8847cc2 100644 --- a/app/android/app/src/main/AndroidManifest.xml +++ b/app/android/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName - App2 + app CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -13,7 +13,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - app2 + app CFBundlePackageType APPL CFBundleShortVersionString diff --git a/app/lib/src/rust/frb_generated.io.dart b/app/lib/src/rust/frb_generated.io.dart index 30b98b04..4090c959 100644 --- a/app/lib/src/rust/frb_generated.io.dart +++ b/app/lib/src/rust/frb_generated.io.dart @@ -74,7 +74,7 @@ class RustLibWire implements BaseWire { late final _dart_fn_deliver_outputPtr = _lookup< ffi.NativeFunction< ffi.Void Function(ffi.Int32, ffi.Pointer, ffi.Int32, - ffi.Int32)>>('frbgen_app2_dart_fn_deliver_output'); + ffi.Int32)>>('frbgen_app_dart_fn_deliver_output'); late final _dart_fn_deliver_output = _dart_fn_deliver_outputPtr .asFunction, int, int)>(); diff --git a/app/linux/CMakeLists.txt b/app/linux/CMakeLists.txt index e0560305..b99d63df 100644 --- a/app/linux/CMakeLists.txt +++ b/app/linux/CMakeLists.txt @@ -4,10 +4,10 @@ project(runner LANGUAGES CXX) # The name of the executable created for the application. Change this to change # the on-disk name of your application. -set(BINARY_NAME "app2") +set(BINARY_NAME "app") # The unique GTK application identifier for this application. See: # https://wiki.gnome.org/HowDoI/ChooseApplicationID -set(APPLICATION_ID "com.example.app2") +set(APPLICATION_ID "com.example.app") # Explicitly opt in to modern CMake behaviors to avoid warnings with recent # versions of CMake. diff --git a/app/linux/my_application.cc b/app/linux/my_application.cc index e9529276..42d9b08a 100644 --- a/app/linux/my_application.cc +++ b/app/linux/my_application.cc @@ -40,11 +40,11 @@ static void my_application_activate(GApplication* application) { if (use_header_bar) { GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new()); gtk_widget_show(GTK_WIDGET(header_bar)); - gtk_header_bar_set_title(header_bar, "app2"); + gtk_header_bar_set_title(header_bar, "app"); gtk_header_bar_set_show_close_button(header_bar, TRUE); gtk_window_set_titlebar(window, GTK_WIDGET(header_bar)); } else { - gtk_window_set_title(window, "app2"); + gtk_window_set_title(window, "app"); } gtk_window_set_default_size(window, 1280, 720); diff --git a/app/macos/Runner.xcodeproj/project.pbxproj b/app/macos/Runner.xcodeproj/project.pbxproj index fa0bab66..d20f4ef4 100644 --- a/app/macos/Runner.xcodeproj/project.pbxproj +++ b/app/macos/Runner.xcodeproj/project.pbxproj @@ -64,7 +64,7 @@ 331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; - 33CC10ED2044A3C60003C045 /* app2.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "app2.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 33CC10ED2044A3C60003C045 /* app.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "app.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = ""; }; 33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; @@ -131,7 +131,7 @@ 33CC10EE2044A3C60003C045 /* Products */ = { isa = PBXGroup; children = ( - 33CC10ED2044A3C60003C045 /* app2.app */, + 33CC10ED2044A3C60003C045 /* app.app */, 331C80D5294CF71000263BE5 /* RunnerTests.xctest */, ); name = Products; @@ -217,7 +217,7 @@ ); name = Runner; productName = Runner; - productReference = 33CC10ED2044A3C60003C045 /* app2.app */; + productReference = 33CC10ED2044A3C60003C045 /* app.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -384,10 +384,10 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.app2.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = com.example.app.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/app2.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/app2"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/app.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/app"; }; name = Debug; }; @@ -398,10 +398,10 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.app2.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = com.example.app.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/app2.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/app2"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/app.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/app"; }; name = Release; }; @@ -412,10 +412,10 @@ CURRENT_PROJECT_VERSION = 1; GENERATE_INFOPLIST_FILE = YES; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.app2.RunnerTests; + PRODUCT_BUNDLE_IDENTIFIER = com.example.app.RunnerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_VERSION = 5.0; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/app2.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/app2"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/app.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/app"; }; name = Profile; }; diff --git a/app/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/app/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index f9e47581..2b285b44 100644 --- a/app/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/app/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -15,7 +15,7 @@ @@ -31,7 +31,7 @@ @@ -65,7 +65,7 @@ @@ -82,7 +82,7 @@ diff --git a/app/macos/Runner/Configs/AppInfo.xcconfig b/app/macos/Runner/Configs/AppInfo.xcconfig index a897c7bf..85215c10 100644 --- a/app/macos/Runner/Configs/AppInfo.xcconfig +++ b/app/macos/Runner/Configs/AppInfo.xcconfig @@ -5,10 +5,10 @@ // 'flutter create' template. // The application's name. By default this is also the title of the Flutter window. -PRODUCT_NAME = app2 +PRODUCT_NAME = app // The application's bundle identifier -PRODUCT_BUNDLE_IDENTIFIER = com.example.app2 +PRODUCT_BUNDLE_IDENTIFIER = com.example.app // The copyright displayed in application information PRODUCT_COPYRIGHT = Copyright © 2024 com.example. All rights reserved. diff --git a/app/pubspec.yaml b/app/pubspec.yaml index 27c91ca2..a4976cd8 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -1,4 +1,4 @@ -name: app2 +name: app description: "A new Flutter project." # The following line prevents the package from being accidentally published to # pub.dev using `flutter pub publish`. This is preferred for private packages. diff --git a/app/rust/src/frb_generated.io.rs b/app/rust/src/frb_generated.io.rs index 75d8e970..318e481d 100644 --- a/app/rust/src/frb_generated.io.rs +++ b/app/rust/src/frb_generated.io.rs @@ -21,7 +21,7 @@ impl NewWithNullPtr for *mut T { } #[no_mangle] -pub extern "C" fn frbgen_app2_dart_fn_deliver_output( +pub extern "C" fn frbgen_app_dart_fn_deliver_output( call_id: i32, ptr_: *mut u8, rust_vec_len_: i32, diff --git a/app/web/index.html b/app/web/index.html index 17a92c70..fd444812 100644 --- a/app/web/index.html +++ b/app/web/index.html @@ -23,13 +23,13 @@ - + - app2 + app