From 71a7047400f1b9fff06e4d67540c62fbd6082495 Mon Sep 17 00:00:00 2001 From: dario windows desktop Date: Wed, 26 Jun 2024 17:39:53 +0200 Subject: [PATCH 1/3] windows auto gen --- linux/flutter/generated_plugin_registrant.cc | 4 ++++ linux/flutter/generated_plugins.cmake | 1 + windows/flutter/CMakeLists.txt | 7 ++++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/linux/flutter/generated_plugin_registrant.cc b/linux/flutter/generated_plugin_registrant.cc index a63aae017..c939f4c3b 100644 --- a/linux/flutter/generated_plugin_registrant.cc +++ b/linux/flutter/generated_plugin_registrant.cc @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -46,6 +47,9 @@ void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) printing_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "PrintingPlugin"); printing_plugin_register_with_registrar(printing_registrar); + g_autoptr(FlPluginRegistrar) rive_common_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "RivePlugin"); + rive_plugin_register_with_registrar(rive_common_registrar); g_autoptr(FlPluginRegistrar) screen_retriever_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "ScreenRetrieverPlugin"); screen_retriever_plugin_register_with_registrar(screen_retriever_registrar); diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index 3c32cb3c0..f948f3c2c 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -11,6 +11,7 @@ list(APPEND FLUTTER_PLUGIN_LIST media_kit_libs_linux media_kit_video printing + rive_common screen_retriever sentry_flutter sqlite3_flutter_libs diff --git a/windows/flutter/CMakeLists.txt b/windows/flutter/CMakeLists.txt index b02c5485c..86edc67b9 100644 --- a/windows/flutter/CMakeLists.txt +++ b/windows/flutter/CMakeLists.txt @@ -9,6 +9,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") @@ -91,7 +96,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 From 21736e278f734a7a2d3391519cc4f9310ddacdad Mon Sep 17 00:00:00 2001 From: dario windows desktop Date: Wed, 26 Jun 2024 17:40:14 +0200 Subject: [PATCH 2/3] bumped versions --- pubspec.lock | 148 ++++++++++++++++++++++++++++++--------------------- pubspec.yaml | 46 ++++++++-------- 2 files changed, 109 insertions(+), 85 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 85dc833af..eff449aaf 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -53,18 +53,42 @@ packages: dependency: "direct main" description: name: app_links - sha256: "96e677810b83707ff5e10fac11e4839daa0ea4e0123c35864c092699165eb3db" + sha256: a9905d6a60e814503fabc7523a9ed161b812d7ca69c99ad8ceea14279dc4f06b url: "https://pub.dev" source: hosted - version: "6.1.1" + version: "6.1.3" + app_links_linux: + dependency: transitive + description: + name: app_links_linux + sha256: "567139eca3ca9fb113f2082f3aaa75a26f30f0ebdbe5fa7f09a3913c5bebd630" + url: "https://pub.dev" + source: hosted + version: "1.0.2" + app_links_platform_interface: + dependency: transitive + description: + name: app_links_platform_interface + sha256: "58cff6f11df59b0e514dd5e4a61e988348ad5662f0e75d45d4e214ebea55c94c" + url: "https://pub.dev" + source: hosted + version: "2.0.0" + app_links_web: + dependency: transitive + description: + name: app_links_web + sha256: "74586ed5f3c4786341e82a0fa43c39ec3f13108a550f74e80d8bf68aa11349d1" + url: "https://pub.dev" + source: hosted + version: "1.0.3" archive: dependency: "direct main" description: name: archive - sha256: ecf4273855368121b1caed0d10d4513c7241dfc813f7d3c8933b36622ae9b265 + sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d url: "https://pub.dev" source: hosted - version: "3.5.1" + version: "3.6.1" args: dependency: transitive description: @@ -93,10 +117,10 @@ packages: dependency: "direct main" description: name: awesome_dialog - sha256: c5bccfc0cd94f2025ba6af324e723b99241859e49d9951933d0e1a7952f4f8bb + sha256: "41c41ae4b30b5c7f26bb3d9f9c87010ed1cab0bb4d4ac0cc513e5799c37e9d82" url: "https://pub.dev" source: hosted - version: "3.2.0" + version: "3.2.1" barcode: dependency: transitive description: @@ -382,10 +406,10 @@ packages: dependency: "direct dev" description: name: dependency_validator - sha256: cdd67dbfaf85e6575c21935c6206157970e820011b5009c594ab919772e194fb + sha256: "16906f2137a312d0ffe754aee156436563a63d6ab7faaded83d401b5385d5d35" url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "4.1.0" device_info_plus: dependency: "direct main" description: @@ -430,10 +454,10 @@ packages: dependency: "direct main" description: name: easy_localization - sha256: c145aeb6584aedc7c862ab8c737c3277788f47488bfdf9bae0fe112bd0a4789c + sha256: fa59bcdbbb911a764aa6acf96bbb6fa7a5cf8234354fc45ec1a43a0349ef0201 url: "https://pub.dev" source: hosted - version: "3.0.5" + version: "3.0.7" easy_logger: dependency: transitive description: @@ -478,18 +502,18 @@ packages: dependency: "direct main" description: name: feedback - sha256: fe585cb251d08074e25ba8a7f19c58861bda48387855c27ff84d8f8622873de6 + sha256: "26769f73de6215add72074d24e4a23542e4c02a8fd1a873e7c93da5dc9c1d362" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.1.0" feedback_sentry: dependency: "direct main" description: name: feedback_sentry - sha256: "22a901f05ed773b04b604edcdbf67b36f0a9ac12747f3d68f33aea159465f841" + sha256: ebe3662942ce90b48f2a1eb66396bb17d998b69919e310fbfcb3fe924a22c660 url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.0.1" ffi: dependency: transitive description: @@ -561,10 +585,10 @@ packages: dependency: "direct main" description: name: flutter_layout_grid - sha256: "962a7ec8c7ea46c3b10606dac9c964f9143d10daa5ca28e40f4ce14eeef85b2a" + sha256: "88b4f8484a0874962e27c47733ad256aeb26acc694a9f029edbef771d301885a" url: "https://pub.dev" source: hosted - version: "2.0.6" + version: "2.0.7" flutter_lints: dependency: "direct dev" description: @@ -582,10 +606,10 @@ packages: dependency: "direct main" description: name: flutter_markdown - sha256: "31c12de79262b5431c5492e9c89948aa789158435f707d3519a7fdef6af28af7" + sha256: "85cc6f7daeae537844c92e2d56e2aff61b00095f8f77913b529ea4be12fc45ea" url: "https://pub.dev" source: hosted - version: "0.6.22+1" + version: "0.7.2+1" flutter_native_splash: dependency: "direct main" description: @@ -664,10 +688,10 @@ packages: dependency: "direct main" description: name: flutter_widget_from_html_core - sha256: cc1d9be3d187ce668ee02091cd5442dfb050cdaf98e0ab9a4d12ad008f966979 + sha256: df7c7c9e5ea144f7ab0adfbad733b4d4f7d408ab733c94e6e9fdcb327af92aa1 url: "https://pub.dev" source: hosted - version: "0.14.12" + version: "0.15.1" freezed_annotation: dependency: transitive description: @@ -693,10 +717,10 @@ packages: dependency: "direct main" description: name: get_it - sha256: ae30b28cc73053f79fd46b15f430db16cae22a0554e6cd25333c840b310b0270 + sha256: d85128a5dae4ea777324730dc65edd9c9f43155c109d5cc0a69cab74139fbac1 url: "https://pub.dev" source: hosted - version: "7.6.9" + version: "7.7.0" glob: dependency: transitive description: @@ -773,10 +797,10 @@ packages: dependency: "direct main" description: name: image - sha256: "4c68bfd5ae83e700b5204c1e74451e7bf3cf750e6843c6e158289cf56bda018e" + sha256: "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8" url: "https://pub.dev" source: hosted - version: "4.1.7" + version: "4.2.0" import_sorter: dependency: "direct dev" description: @@ -826,10 +850,10 @@ packages: dependency: transitive description: name: irondash_engine_context - sha256: e8398cca5e28dc280c87b8c35a6ff4e15be844eabec51e713631f83903563681 + sha256: cd7b769db11a2b5243b037c8a9b1ecaef02e1ae27a2d909ffa78c1dad747bb10 url: "https://pub.dev" source: hosted - version: "0.5.3" + version: "0.5.4" irondash_message_channel: dependency: transitive description: @@ -948,7 +972,7 @@ packages: description: path: liquid_swipe_flutter ref: HEAD - resolved-ref: f860246251bad0d56b7b6e28f9b37e5ccc5c7d20 + resolved-ref: dc55b23cc96eca861f41b4a4d88168143c991e50 url: "https://github.com/CaptainDario/DaKanji-Dependencies" source: git version: "2.1.1" @@ -964,10 +988,10 @@ packages: dependency: "direct main" description: name: lottie - sha256: ce2bb2605753915080e4ee47f036a64228c88dc7f56f7bc1dbe912d75b55b1e2 + sha256: "6a24ade5d3d918c306bb1c21a6b9a04aab0489d51a2582522eea820b4093b62b" url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.1.2" markdown: dependency: transitive description: @@ -1109,10 +1133,10 @@ packages: dependency: "direct main" description: name: onboarding_overlay - sha256: "78a4870ef22d2100952ea51ddc3dd3ee29fe914821298b1ac6469bed2589ba6f" + sha256: "94626772a69494533f370ffe614882a7bf58d3bf964bfe39dcb480efa4c10444" url: "https://pub.dev" source: hosted - version: "3.2.1" + version: "3.2.2" package_config: dependency: transitive description: @@ -1205,10 +1229,10 @@ packages: dependency: "direct main" description: name: pdf - sha256: "243f05342fc0bdf140eba5b069398985cdbdd3dbb1d776cf43d5ea29cc570ba6" + sha256: "81d5522bddc1ef5c28e8f0ee40b71708761753c163e0c93a40df56fd515ea0f0" url: "https://pub.dev" source: hosted - version: "3.10.8" + version: "3.11.0" pdf_widget_wrapper: dependency: "direct main" description: @@ -1293,10 +1317,10 @@ packages: dependency: transitive description: name: pubspec_parse - sha256: c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367 + sha256: c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8 url: "https://pub.dev" source: hosted - version: "1.2.3" + version: "1.3.0" qr: dependency: transitive description: @@ -1333,18 +1357,18 @@ packages: dependency: "direct main" description: name: rive - sha256: ae75a6e9cfbf146630bfb1feba97ee582d935508be6b362e4bd197b9c55a6dd3 + sha256: "0342c9cd3c83ceeee4ad9246b98d628a2e9abd9d615acf69fa81fbbcf84a36ae" url: "https://pub.dev" source: hosted - version: "0.12.4" + version: "0.13.8" rive_common: dependency: transitive description: name: rive_common - sha256: f4e20d0a99c5040c85624a3eb2b0b6b19e614d93a693c3bb25cf6e7bb2d3d6d3 + sha256: "3fe76ba4680787741688ee393e47b63417e8643816795e4eac01021683af1d84" url: "https://pub.dev" source: hosted - version: "0.2.8" + version: "0.4.9" riverpod: dependency: transitive description: @@ -1461,10 +1485,10 @@ packages: dependency: "direct main" description: name: screenshot - sha256: "5488135006b34529bf3765a7b1900ca94ccafca300c573550a0474a7162ebf95" + sha256: d448f43130f49bc7eead1b267b3ea0291cb2450f037bb0a0ecce7aa4c65e2aee url: "https://pub.dev" source: hosted - version: "2.3.0" + version: "2.5.0" scrollable_positioned_list: dependency: "direct main" description: @@ -1618,18 +1642,18 @@ packages: dependency: "direct main" description: name: sqlite3 - sha256: "1abbeb84bf2b1a10e5e1138c913123c8aa9d83cd64e5f9a0dd847b3c83063202" + sha256: b384f598b813b347c5a7e5ffad82cbaff1bec3d1561af267041e66f6f0899295 url: "https://pub.dev" source: hosted - version: "2.4.2" + version: "2.4.3" sqlite3_flutter_libs: dependency: "direct main" description: name: sqlite3_flutter_libs - sha256: d6c31c8511c441d1f12f20b607343df1afe4eddf24a1cf85021677c8eea26060 + sha256: "62bbb4073edbcdf53f40c80775f33eea01d301b7b81417e5b3fb7395416258c1" url: "https://pub.dev" source: hosted - version: "0.5.20" + version: "0.5.24" sqlparser: dependency: transitive description: @@ -1690,18 +1714,18 @@ packages: dependency: "direct main" description: name: super_clipboard - sha256: "17978c3dc7b6ebf588a8007448f668ad6aa64733b60ed2ae18152113cca39fa2" + sha256: cdab725bac26655ebd189f4d202d694a8cbc1c21e0f0478ccd7829c71716f09b url: "https://pub.dev" source: hosted - version: "0.8.16" + version: "0.8.17" super_native_extensions: dependency: transitive description: name: super_native_extensions - sha256: d2d1259c7e43966173c394ef64475e612bd5822095f6cd1008eb978175ce2f0d + sha256: fa55d452d34b7112453afbb9fa4d13c0527ff201630d10d86546497179030544 url: "https://pub.dev" source: hosted - version: "0.8.16" + version: "0.8.17" sync_http: dependency: transitive description: @@ -1739,7 +1763,7 @@ packages: description: path: "." ref: HEAD - resolved-ref: c3a2f0580ec7cd6ef39aa0966443b048b76f5360 + resolved-ref: "2c4c912848d60e449497d15ff346c67346fef389" url: "https://github.com/CaptainDario/flutter-tflite" source: git version: "0.10.3" @@ -1795,10 +1819,10 @@ packages: dependency: transitive description: name: universal_platform - sha256: d315be0f6641898b280ffa34e2ddb14f3d12b1a37882557869646e0cc363d0cc + sha256: "64e16458a0ea9b99260ceb5467a214c1f298d647c659af1bff6d3bf82536b1ec" url: "https://pub.dev" source: hosted - version: "1.0.0+1" + version: "1.1.0" uri_parser: dependency: transitive description: @@ -1811,18 +1835,18 @@ packages: dependency: "direct main" description: name: url_launcher - sha256: "6ce1e04375be4eed30548f10a315826fd933c1e493206eab82eed01f438c8d2e" + sha256: "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3" url: "https://pub.dev" source: hosted - version: "6.2.6" + version: "6.3.0" url_launcher_android: dependency: transitive description: name: url_launcher_android - sha256: "360a6ed2027f18b73c8d98e159dda67a61b7f2e0f6ec26e86c3ada33b0621775" + sha256: "17cd5e205ea615e2c6ea7a77323a11712dffa0720a8a90540db57a01347f9ad9" url: "https://pub.dev" source: hosted - version: "6.3.1" + version: "6.3.2" url_launcher_ios: dependency: transitive description: @@ -1988,18 +2012,18 @@ packages: dependency: "direct main" description: name: webview_flutter - sha256: "25e1b6e839e8cbfbd708abc6f85ed09d1727e24e08e08c6b8590d7c65c9a8932" + sha256: "6869c8786d179f929144b4a1f86e09ac0eddfe475984951ea6c634774c16b522" url: "https://pub.dev" source: hosted - version: "4.7.0" + version: "4.8.0" webview_flutter_android: dependency: transitive description: name: webview_flutter_android - sha256: dad3313c9ead95517bb1cae5e1c9d20ba83729d5a59e5e83c0a2d66203f27f91 + sha256: "0d21cfc3bfdd2e30ab2ebeced66512b91134b39e72e97b43db2d47dda1c4e53a" url: "https://pub.dev" source: hosted - version: "3.16.1" + version: "3.16.3" webview_flutter_platform_interface: dependency: transitive description: @@ -2036,10 +2060,10 @@ packages: dependency: "direct main" description: name: window_manager - sha256: b3c895bdf936c77b83c5254bec2e6b3f066710c1f89c38b20b8acc382b525494 + sha256: "8699323b30da4cdbe2aa2e7c9de567a6abd8a97d9a5c850a3c86dcd0b34bbfbf" url: "https://pub.dev" source: hosted - version: "0.3.8" + version: "0.3.9" xdg_directories: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index db1f9c683..c091b7cb4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -29,53 +29,53 @@ dependencies: # all platforms supported linked_scroll_controller: 0.2.0 shared_preferences: 2.2.3 - url_launcher: 6.2.6 + url_launcher: 6.3.0 flutter_phoenix: 1.1.1 - image: 4.1.7 - flutter_markdown: 0.6.22+1 - get_it: 7.6.9 + image: 4.2.0 + flutter_markdown: 0.7.2+1 + get_it: 7.7.0 provider: 6.1.2 universal_io: 2.2.2 - awesome_dialog: 3.2.0 - easy_localization: 3.0.5 - flutter_layout_grid: 2.0.6 + awesome_dialog: 3.2.1 + easy_localization: 3.0.7 + flutter_layout_grid: 2.0.7 tuple: 2.0.2 - lottie: 3.1.0 + lottie: 3.1.2 flutter_svg: 2.0.10+1 - onboarding_overlay : 3.2.1 + onboarding_overlay : 3.2.2 auto_size_text: 3.0.0 - feedback: 3.0.1 + feedback: 3.1.0 flutter_staggered_animations: 1.1.1 graphview: 1.2.0 xml: 6.5.0 reorderables: 0.6.0 - archive: 3.5.1 + archive: 3.6.1 device_info_plus: 10.1.0 share_plus: 9.0.0 file_picker: 8.0.5 - sqlite3: 2.4.2 - sqlite3_flutter_libs: 0.5.20 + sqlite3: 2.4.3 + sqlite3_flutter_libs: 0.5.24 drift: 2.18.0 json_annotation: 4.9.0 flutter_spinkit: 5.2.1 sentry_flutter: 8.3.0 - feedback_sentry: 3.0.0 + feedback_sentry: 3.0.1 sentry: 8.2.0 dio: 5.4.3+1 flutter_speed_dial: 7.0.0 scrollable_positioned_list: 0.3.8 - pdf: 3.10.8 + pdf: 3.11.0 pdf_widget_wrapper: 1.0.3 - rive: 0.12.4 + rive: 0.13.8 printing: 5.12.0 path_parsing: 1.0.1 # included in svg_flutter vector_graphics: 1.1.11+1 # included in svg_flutter - app_links: 6.1.1 # android, iOS, web, macos, windows (msix), linux + app_links: 6.1.3 # android, iOS, web, macos, windows (msix), linux media_kit: 1.1.10+1 # Primary package. media_kit_video: 1.2.4 # For video rendering. media_kit_libs_video: 1.0.4 # Native video dependencies. - flutter_widget_from_html_core: 0.14.12 + flutter_widget_from_html_core: 0.15.1 tflite_flutter: #0.10.4 git: url: https://github.com/CaptainDario/flutter-tflite @@ -91,8 +91,8 @@ dependencies: flutter_riverpod: 2.5.1 riverpod_annotation: 2.3.5 another_flushbar: 1.12.30 - screenshot: 2.3.0 - super_clipboard: 0.8.16 + screenshot: 2.5.0 + super_clipboard: 0.8.17 keyboard_actions: 4.2.0 flutter_ankidroid: git: @@ -113,7 +113,7 @@ dependencies: ref: v3.2.0 # Not all platforms supported - webview_flutter: 4.7.0 # android, iOS + webview_flutter: 4.8.0 # android, iOS webview_flutter_wkwebview: 3.13.1 in_app_review: 2.0.9 # android, iOS, MacOS, windows (limited) clipboard_watcher: 0.2.1 # android, iOS, macos, windows, linux @@ -130,7 +130,7 @@ dependencies: # packages that should only target specific platforms android_intent_plus: 5.0.2 # android - window_manager: 0.3.8 # desktop + window_manager: 0.3.9 # desktop screen_retriever: 0.1.9 # desktop # utility @@ -170,7 +170,7 @@ dev_dependencies: import_sorter: 4.6.0 json_serializable: 6.8.0 build_runner: 2.4.9 - dependency_validator: 4.0.0 + dependency_validator: 4.1.0 isar_generator: 3.1.0+1 # included in dakanji dictionary drift_dev: 2.18.0 From 90dcb02bbbe097cf5220ff1f641736437374cf79 Mon Sep 17 00:00:00 2001 From: dario windows desktop Date: Wed, 26 Jun 2024 17:41:16 +0200 Subject: [PATCH 3/3] bumped build number --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index c091b7cb4..4782e982e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -8,7 +8,7 @@ funding: publish_to: 'none' # Remove this line if you wish to publish to pub.dev -version: 3.4.2+105 +version: 3.4.2+106 environment: