From 038ad3e0126ac245cb59960a66272f53830b1376 Mon Sep 17 00:00:00 2001 From: Jonas Heinle Date: Thu, 14 Nov 2024 18:09:40 +0100 Subject: [PATCH] pumping up version --- .github/workflows/dart.yml | 2 +- .metadata | 25 ++++++++++++++++++++----- external/jotrockenmitlockenrepo | 2 +- pubspec.yaml | 4 ++-- windows/runner/runner.exe.manifest | 6 ------ windows/runner/utils.cpp | 4 ++-- 6 files changed, 26 insertions(+), 17 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 2c9a34a..b8bfdc3 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -66,7 +66,7 @@ jobs: uses: flutter-actions/setup-flutter@v3.6 with: channel: stable - version: 3.24.4 + version: 3.24.5 # Note: This workflow uses the latest stable version of the Dart SDK. # You can specify other versions if desired, see documentation here: diff --git a/.metadata b/.metadata index 72aedeb..d044da8 100644 --- a/.metadata +++ b/.metadata @@ -4,7 +4,7 @@ # This file should be version controlled and should not be manually edited. version: - revision: "5dcb86f68f239346676ceb1ed1ea385bd215fba1" + revision: "dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668" channel: "stable" project_type: app @@ -13,11 +13,26 @@ project_type: app migration: platforms: - platform: root - create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1 - base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1 + create_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 + base_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 + - platform: android + create_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 + base_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 + - platform: ios + create_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 + base_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 + - platform: linux + create_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 + base_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 + - platform: macos + create_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 + base_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 - platform: web - create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1 - base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1 + create_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 + base_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 + - platform: windows + create_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 + base_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668 # User provided section diff --git a/external/jotrockenmitlockenrepo b/external/jotrockenmitlockenrepo index 00d4493..4e8de43 160000 --- a/external/jotrockenmitlockenrepo +++ b/external/jotrockenmitlockenrepo @@ -1 +1 @@ -Subproject commit 00d4493e844a81b3dea07dd3b5de8412819753fe +Subproject commit 4e8de43dd605aae3831d7d19166b3779b3aec65e diff --git a/pubspec.yaml b/pubspec.yaml index faf7784..dac0ea3 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -9,7 +9,7 @@ version: 1.3.5 environment: sdk: ">=3.4.4 <4.0.0" - flutter: ">=3.24.4" + flutter: ">=3.24.5" dependencies: flutter: @@ -22,7 +22,7 @@ dependencies: sdk: flutter intl: ^0.19.0 - go_router: any + go_router: 14.6.0 font_awesome_flutter: any dev_dependencies: mockito: ^5.4.4 diff --git a/windows/runner/runner.exe.manifest b/windows/runner/runner.exe.manifest index a42ea76..153653e 100644 --- a/windows/runner/runner.exe.manifest +++ b/windows/runner/runner.exe.manifest @@ -9,12 +9,6 @@ - - - - - - diff --git a/windows/runner/utils.cpp b/windows/runner/utils.cpp index b2b0873..3a0b465 100644 --- a/windows/runner/utils.cpp +++ b/windows/runner/utils.cpp @@ -45,13 +45,13 @@ std::string Utf8FromUtf16(const wchar_t* utf16_string) { if (utf16_string == nullptr) { return std::string(); } - int target_length = ::WideCharToMultiByte( + unsigned int target_length = ::WideCharToMultiByte( CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, -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);