Skip to content

Commit 6383b0d

Browse files
weopweop
committed
enhanced project configuration and updated dependencies
1 parent d6b76d3 commit 6383b0d

File tree

8 files changed

+108
-56
lines changed

8 files changed

+108
-56
lines changed

‎devtools_options.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
description: This file stores settings for Dart & Flutter DevTools.
2+
documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
3+
extensions:

‎linux/CMakeLists.txt‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Project-level configuration.
22
cmake_minimum_required(VERSION 3.13)
3+
set(CMAKE_C_COMPILER gcc)
4+
set(CMAKE_CXX_COMPILER g++)
35
project(runner LANGUAGES CXX)
46

57
# The name of the executable created for the application. Change this to change
@@ -42,8 +44,9 @@ endif()
4244
function(APPLY_STANDARD_SETTINGS TARGET)
4345
target_compile_features(${TARGET} PUBLIC cxx_std_14)
4446
target_compile_options(${TARGET} PRIVATE -Wall -Werror)
45-
# Allow deprecated declarations for tray_manager compatibility
47+
# Allow deprecated declarations and sign comparison for tray_manager compatibility
4648
target_compile_options(${TARGET} PRIVATE -Wno-error=deprecated-declarations)
49+
target_compile_options(${TARGET} PRIVATE -Wno-error=sign-compare)
4750
target_compile_options(${TARGET} PRIVATE "$<$<NOT:$<CONFIG:Debug>>:-O3>")
4851
target_compile_definitions(${TARGET} PRIVATE "$<$<NOT:$<CONFIG:Debug>>:NDEBUG>")
4952
endfunction()
@@ -56,6 +59,9 @@ add_subdirectory(${FLUTTER_MANAGED_DIR})
5659
find_package(PkgConfig REQUIRED)
5760
pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0)
5861

62+
# Add Wayland support definitions
63+
add_compile_definitions(GDK_WINDOWING_WAYLAND)
64+
5965
# Application build; see runner/CMakeLists.txt.
6066
add_subdirectory("runner")
6167

‎linux/flutter/generated_plugin_registrant.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66

77
#include "generated_plugin_registrant.h"
88

9-
#include <screen_retriever/screen_retriever_plugin.h>
9+
#include <screen_retriever_linux/screen_retriever_linux_plugin.h>
1010
#include <tray_manager/tray_manager_plugin.h>
1111
#include <url_launcher_linux/url_launcher_plugin.h>
1212
#include <window_manager/window_manager_plugin.h>
1313

1414
void fl_register_plugins(FlPluginRegistry* registry) {
15-
g_autoptr(FlPluginRegistrar) screen_retriever_registrar =
16-
fl_plugin_registry_get_registrar_for_plugin(registry, "ScreenRetrieverPlugin");
17-
screen_retriever_plugin_register_with_registrar(screen_retriever_registrar);
15+
g_autoptr(FlPluginRegistrar) screen_retriever_linux_registrar =
16+
fl_plugin_registry_get_registrar_for_plugin(registry, "ScreenRetrieverLinuxPlugin");
17+
screen_retriever_linux_plugin_register_with_registrar(screen_retriever_linux_registrar);
1818
g_autoptr(FlPluginRegistrar) tray_manager_registrar =
1919
fl_plugin_registry_get_registrar_for_plugin(registry, "TrayManagerPlugin");
2020
tray_manager_plugin_register_with_registrar(tray_manager_registrar);

‎linux/flutter/generated_plugins.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44

55
list(APPEND FLUTTER_PLUGIN_LIST
6-
screen_retriever
6+
screen_retriever_linux
77
tray_manager
88
url_launcher_linux
99
window_manager

‎linux/runner/my_application.cc‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
#ifdef GDK_WINDOWING_X11
55
#include <gdk/gdkx.h>
66
#endif
7+
#ifdef GDK_WINDOWING_WAYLAND
8+
#include <gdk/gdkwayland.h>
9+
#endif
710

811
#include "flutter/generated_plugin_registrant.h"
912

‎macos/Flutter/GeneratedPluginRegistrant.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ import FlutterMacOS
66
import Foundation
77

88
import path_provider_foundation
9-
import screen_retriever
9+
import screen_retriever_macos
1010
import shared_preferences_foundation
1111
import tray_manager
1212
import url_launcher_macos
1313
import window_manager
1414

1515
func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
1616
PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
17-
ScreenRetrieverPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverPlugin"))
17+
ScreenRetrieverMacosPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverMacosPlugin"))
1818
SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
1919
TrayManagerPlugin.register(with: registry.registrar(forPlugin: "TrayManagerPlugin"))
2020
UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))

‎pubspec.lock‎

Lines changed: 82 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ packages:
7474
dependency: "direct dev"
7575
description:
7676
name: flutter_lints
77-
sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
77+
sha256: "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1"
7878
url: "https://pub.dev"
7979
source: hosted
80-
version: "5.0.0"
80+
version: "6.0.0"
8181
flutter_test:
8282
dependency: "direct dev"
8383
description: flutter
@@ -88,38 +88,46 @@ packages:
8888
description: flutter
8989
source: sdk
9090
version: "0.0.0"
91+
json_annotation:
92+
dependency: transitive
93+
description:
94+
name: json_annotation
95+
sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
96+
url: "https://pub.dev"
97+
source: hosted
98+
version: "4.9.0"
9199
leak_tracker:
92100
dependency: transitive
93101
description:
94102
name: leak_tracker
95-
sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0"
103+
sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
96104
url: "https://pub.dev"
97105
source: hosted
98-
version: "10.0.9"
106+
version: "11.0.2"
99107
leak_tracker_flutter_testing:
100108
dependency: transitive
101109
description:
102110
name: leak_tracker_flutter_testing
103-
sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
111+
sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
104112
url: "https://pub.dev"
105113
source: hosted
106-
version: "3.0.9"
114+
version: "3.0.10"
107115
leak_tracker_testing:
108116
dependency: transitive
109117
description:
110118
name: leak_tracker_testing
111-
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
119+
sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
112120
url: "https://pub.dev"
113121
source: hosted
114-
version: "3.0.1"
122+
version: "3.0.2"
115123
lints:
116124
dependency: transitive
117125
description:
118126
name: lints
119-
sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7
127+
sha256: a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0
120128
url: "https://pub.dev"
121129
source: hosted
122-
version: "5.1.1"
130+
version: "6.0.0"
123131
matcher:
124132
dependency: transitive
125133
description:
@@ -180,18 +188,18 @@ packages:
180188
dependency: transitive
181189
description:
182190
name: path_provider_android
183-
sha256: d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9
191+
sha256: e122c5ea805bb6773bb12ce667611265980940145be920cd09a4b0ec0285cb16
184192
url: "https://pub.dev"
185193
source: hosted
186-
version: "2.2.17"
194+
version: "2.2.20"
187195
path_provider_foundation:
188196
dependency: transitive
189197
description:
190198
name: path_provider_foundation
191-
sha256: "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942"
199+
sha256: "16eef174aacb07e09c351502740fa6254c165757638eba1e9116b0a781201bbd"
192200
url: "https://pub.dev"
193201
source: hosted
194-
version: "2.4.1"
202+
version: "2.4.2"
195203
path_provider_linux:
196204
dependency: transitive
197205
description:
@@ -236,26 +244,58 @@ packages:
236244
dependency: "direct main"
237245
description:
238246
name: process
239-
sha256: "44b4226c0afd4bc3b7c7e67d44c4801abd97103cf0c84609e2654b664ca2798c"
247+
sha256: c6248e4526673988586e8c00bb22a49210c258dc91df5227d5da9748ecf79744
240248
url: "https://pub.dev"
241249
source: hosted
242-
version: "5.0.4"
250+
version: "5.0.5"
243251
provider:
244252
dependency: "direct main"
245253
description:
246254
name: provider
247-
sha256: "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84"
255+
sha256: "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272"
248256
url: "https://pub.dev"
249257
source: hosted
250-
version: "6.1.5"
258+
version: "6.1.5+1"
251259
screen_retriever:
252260
dependency: transitive
253261
description:
254262
name: screen_retriever
255-
sha256: "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90"
263+
sha256: "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c"
264+
url: "https://pub.dev"
265+
source: hosted
266+
version: "0.2.0"
267+
screen_retriever_linux:
268+
dependency: transitive
269+
description:
270+
name: screen_retriever_linux
271+
sha256: f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18
272+
url: "https://pub.dev"
273+
source: hosted
274+
version: "0.2.0"
275+
screen_retriever_macos:
276+
dependency: transitive
277+
description:
278+
name: screen_retriever_macos
279+
sha256: "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149"
280+
url: "https://pub.dev"
281+
source: hosted
282+
version: "0.2.0"
283+
screen_retriever_platform_interface:
284+
dependency: transitive
285+
description:
286+
name: screen_retriever_platform_interface
287+
sha256: ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0
256288
url: "https://pub.dev"
257289
source: hosted
258-
version: "0.1.9"
290+
version: "0.2.0"
291+
screen_retriever_windows:
292+
dependency: transitive
293+
description:
294+
name: screen_retriever_windows
295+
sha256: "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13"
296+
url: "https://pub.dev"
297+
source: hosted
298+
version: "0.2.0"
259299
shared_preferences:
260300
dependency: "direct main"
261301
description:
@@ -268,10 +308,10 @@ packages:
268308
dependency: transitive
269309
description:
270310
name: shared_preferences_android
271-
sha256: "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac"
311+
sha256: "34266009473bf71d748912da4bf62d439185226c03e01e2d9687bc65bbfcb713"
272312
url: "https://pub.dev"
273313
source: hosted
274-
version: "2.4.10"
314+
version: "2.4.15"
275315
shared_preferences_foundation:
276316
dependency: transitive
277317
description:
@@ -369,42 +409,42 @@ packages:
369409
dependency: transitive
370410
description:
371411
name: test_api
372-
sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
412+
sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00"
373413
url: "https://pub.dev"
374414
source: hosted
375-
version: "0.7.4"
415+
version: "0.7.6"
376416
tray_manager:
377417
dependency: "direct main"
378418
description:
379419
name: tray_manager
380-
sha256: ad18c4cd73003097d182884bacb0578ad2865f3ab842a0ad00f6d043ed49eaf0
420+
sha256: "537e539f48cd82d8ee2240d4330158c7b44c7e043e8e18b5811f2f8f6b7df25a"
381421
url: "https://pub.dev"
382422
source: hosted
383-
version: "0.5.0"
423+
version: "0.5.1"
384424
url_launcher:
385425
dependency: "direct main"
386426
description:
387427
name: url_launcher
388-
sha256: "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603"
428+
sha256: f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8
389429
url: "https://pub.dev"
390430
source: hosted
391-
version: "6.3.1"
431+
version: "6.3.2"
392432
url_launcher_android:
393433
dependency: transitive
394434
description:
395435
name: url_launcher_android
396-
sha256: "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79"
436+
sha256: "5c8b6c2d89a78f5a1cca70a73d9d5f86c701b36b42f9c9dac7bad592113c28e9"
397437
url: "https://pub.dev"
398438
source: hosted
399-
version: "6.3.16"
439+
version: "6.3.24"
400440
url_launcher_ios:
401441
dependency: transitive
402442
description:
403443
name: url_launcher_ios
404-
sha256: "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb"
444+
sha256: d80b3f567a617cb923546034cc94bfe44eb15f989fe670b37f26abdb9d939cb7
405445
url: "https://pub.dev"
406446
source: hosted
407-
version: "6.3.3"
447+
version: "6.3.4"
408448
url_launcher_linux:
409449
dependency: transitive
410450
description:
@@ -417,10 +457,10 @@ packages:
417457
dependency: transitive
418458
description:
419459
name: url_launcher_macos
420-
sha256: "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2"
460+
sha256: c043a77d6600ac9c38300567f33ef12b0ef4f4783a2c1f00231d2b1941fea13f
421461
url: "https://pub.dev"
422462
source: hosted
423-
version: "3.2.2"
463+
version: "3.2.3"
424464
url_launcher_platform_interface:
425465
dependency: transitive
426466
description:
@@ -449,18 +489,18 @@ packages:
449489
dependency: transitive
450490
description:
451491
name: vector_math
452-
sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
492+
sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
453493
url: "https://pub.dev"
454494
source: hosted
455-
version: "2.1.4"
495+
version: "2.2.0"
456496
vm_service:
457497
dependency: transitive
458498
description:
459499
name: vm_service
460-
sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02
500+
sha256: "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60"
461501
url: "https://pub.dev"
462502
source: hosted
463-
version: "15.0.0"
503+
version: "15.0.2"
464504
web:
465505
dependency: transitive
466506
description:
@@ -473,10 +513,10 @@ packages:
473513
dependency: "direct main"
474514
description:
475515
name: window_manager
476-
sha256: "8699323b30da4cdbe2aa2e7c9de567a6abd8a97d9a5c850a3c86dcd0b34bbfbf"
516+
sha256: "7eb6d6c4164ec08e1bf978d6e733f3cebe792e2a23fb07cbca25c2872bfdbdcd"
477517
url: "https://pub.dev"
478518
source: hosted
479-
version: "0.3.9"
519+
version: "0.5.1"
480520
xdg_directories:
481521
dependency: transitive
482522
description:
@@ -494,5 +534,5 @@ packages:
494534
source: hosted
495535
version: "3.1.3"
496536
sdks:
497-
dart: ">=3.8.0 <4.0.0"
498-
flutter: ">=3.27.0"
537+
dart: ">=3.9.0 <4.0.0"
538+
flutter: ">=3.35.0"

‎pubspec.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ dependencies:
1111
sdk: flutter
1212
yaml: ^3.1.2
1313
path_provider: ^2.1.4
14-
process: ^5.0.2
15-
window_manager: ^0.3.7
16-
tray_manager: ^0.5.0
17-
url_launcher: ^6.3.1
18-
provider: ^6.1.2
14+
process: ^5.0.5
15+
window_manager: ^0.5.1
16+
tray_manager: ^0.5.1
17+
url_launcher: ^6.3.2
18+
provider: ^6.1.5
1919
shared_preferences: ^2.3.3
2020

2121
dev_dependencies:
2222
flutter_test:
2323
sdk: flutter
24-
flutter_lints: ^5.0.0
24+
flutter_lints: ^6.0.0
2525

2626
flutter:
2727
uses-material-design: true

0 commit comments

Comments
 (0)