Skip to content

Commit 159ad69

Browse files
FeichtmeierFeichtmeier
committed
chore: update sdk version, yaru and add CI and release workflows
1 parent 43902a3 commit 159ad69

25 files changed

+453
-240
lines changed

‎.github/workflows/ci.yaml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
name: CI
2+
3+
on:
4+
pull_request:
5+
branches: [master]
6+
7+
env:
8+
FLUTTER_VERSION: '3.24.3'
9+
10+
jobs:
11+
analyze:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/checkout@v4
15+
- uses: subosito/flutter-action@v2
16+
with:
17+
channel: 'stable'
18+
flutter-version: ${{env.FLUTTER_VERSION}}
19+
- run: flutter pub get
20+
- run: flutter analyze --fatal-infos
21+
22+
format:
23+
runs-on: ubuntu-latest
24+
steps:
25+
- uses: actions/checkout@v4
26+
- uses: subosito/flutter-action@v2
27+
with:
28+
channel: 'stable'
29+
flutter-version: ${{env.FLUTTER_VERSION}}
30+
- run: flutter pub get
31+
- run: dart format --set-exit-if-changed .
32+
33+
test:
34+
runs-on: ubuntu-latest
35+
steps:
36+
- uses: actions/checkout@v4
37+
- uses: subosito/flutter-action@v2
38+
with:
39+
channel: 'stable'
40+
flutter-version: ${{env.FLUTTER_VERSION}}
41+
- run: flutter test
42+
43+
build:
44+
runs-on: ubuntu-latest
45+
steps:
46+
- uses: actions/checkout@v4
47+
- uses: subosito/flutter-action@v2
48+
with:
49+
channel: 'stable'
50+
flutter-version: ${{env.FLUTTER_VERSION}}
51+
- run: sudo apt update
52+
- run: sudo apt install -y clang cmake curl libgtk-3-dev ninja-build pkg-config unzip libunwind-dev libmpv-dev
53+
- run: flutter pub get
54+
- run: flutter build linux -v

‎.github/workflows/release.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Release
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
workflow_dispatch:
8+
9+
permissions:
10+
contents: write
11+
pull-requests: write
12+
13+
jobs:
14+
release:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: googleapis/release-please-action@v4
18+
with:
19+
release-type: dart

‎clipboard_viewer/analysis_options.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
include: package:flutter_lints/flutter.yaml
22

33
analyzer:
4-
enable-experiment:
5-
- records
64

75
linter:
86
rules:

‎clipboard_viewer/lib/main.dart

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ class _MyHomePageState extends State<MyHomePage> {
4747
itemCount: items.length,
4848
itemBuilder: (context, index) {
4949
final item = items[index];
50+
// TODO(@HrX03) is this needed?
51+
// ignore: unused_local_variable
5052
final rawReader = item.$1.rawReader;
5153

5254
return ListTile(
@@ -60,6 +62,8 @@ class _MyHomePageState extends State<MyHomePage> {
6062
onPressed: () async {
6163
await Pasteboard.writeFiles(["/home/davide"]);
6264
return;
65+
// TODO(@HrX03) is this needed?
66+
// ignore: unused_local_variable, dead_code
6367
final data = await ClipboardReader.readClipboard();
6468
final value = await data.readValue(linuxFileUri);
6569

‎clipboard_viewer/pubspec.lock

Lines changed: 54 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ packages:
55
dependency: transitive
66
description:
77
name: async
8-
sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
8+
sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
99
url: "https://pub.dev"
1010
source: hosted
11-
version: "2.10.0"
11+
version: "2.11.0"
1212
boolean_selector:
1313
dependency: transitive
1414
description:
@@ -37,10 +37,10 @@ packages:
3737
dependency: transitive
3838
description:
3939
name: collection
40-
sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
40+
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
4141
url: "https://pub.dev"
4242
source: hosted
43-
version: "1.17.1"
43+
version: "1.18.0"
4444
crypto:
4545
dependency: transitive
4646
description:
@@ -120,6 +120,30 @@ packages:
120120
url: "https://pub.dev"
121121
source: hosted
122122
version: "0.6.7"
123+
leak_tracker:
124+
dependency: transitive
125+
description:
126+
name: leak_tracker
127+
sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
128+
url: "https://pub.dev"
129+
source: hosted
130+
version: "10.0.5"
131+
leak_tracker_flutter_testing:
132+
dependency: transitive
133+
description:
134+
name: leak_tracker_flutter_testing
135+
sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
136+
url: "https://pub.dev"
137+
source: hosted
138+
version: "3.0.5"
139+
leak_tracker_testing:
140+
dependency: transitive
141+
description:
142+
name: leak_tracker_testing
143+
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
144+
url: "https://pub.dev"
145+
source: hosted
146+
version: "3.0.1"
123147
lints:
124148
dependency: transitive
125149
description:
@@ -132,26 +156,26 @@ packages:
132156
dependency: transitive
133157
description:
134158
name: matcher
135-
sha256: c94db23593b89766cda57aab9ac311e3616cf87c6fa4e9749df032f66f30dcb8
159+
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
136160
url: "https://pub.dev"
137161
source: hosted
138-
version: "0.12.14"
162+
version: "0.12.16+1"
139163
material_color_utilities:
140164
dependency: transitive
141165
description:
142166
name: material_color_utilities
143-
sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
167+
sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
144168
url: "https://pub.dev"
145169
source: hosted
146-
version: "0.2.0"
170+
version: "0.11.1"
147171
meta:
148172
dependency: transitive
149173
description:
150174
name: meta
151-
sha256: "12307e7f0605ce3da64cf0db90e5fcab0869f3ca03f76be6bb2991ce0a55e82b"
175+
sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
152176
url: "https://pub.dev"
153177
source: hosted
154-
version: "1.9.0"
178+
version: "1.15.0"
155179
pasteboard:
156180
dependency: "direct main"
157181
description:
@@ -164,10 +188,10 @@ packages:
164188
dependency: transitive
165189
description:
166190
name: path
167-
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
191+
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
168192
url: "https://pub.dev"
169193
source: hosted
170-
version: "1.8.3"
194+
version: "1.9.0"
171195
plugin_platform_interface:
172196
dependency: transitive
173197
description:
@@ -185,26 +209,26 @@ packages:
185209
dependency: transitive
186210
description:
187211
name: source_span
188-
sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
212+
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
189213
url: "https://pub.dev"
190214
source: hosted
191-
version: "1.9.1"
215+
version: "1.10.0"
192216
stack_trace:
193217
dependency: transitive
194218
description:
195219
name: stack_trace
196-
sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
220+
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
197221
url: "https://pub.dev"
198222
source: hosted
199-
version: "1.11.0"
223+
version: "1.11.1"
200224
stream_channel:
201225
dependency: transitive
202226
description:
203227
name: stream_channel
204-
sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
228+
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
205229
url: "https://pub.dev"
206230
source: hosted
207-
version: "2.1.1"
231+
version: "2.1.2"
208232
string_scanner:
209233
dependency: transitive
210234
description:
@@ -241,10 +265,10 @@ packages:
241265
dependency: transitive
242266
description:
243267
name: test_api
244-
sha256: "6182294da5abf431177fccc1ee02401f6df30f766bc6130a0852c6b6d7ee6b2d"
268+
sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
245269
url: "https://pub.dev"
246270
source: hosted
247-
version: "0.4.18"
271+
version: "0.7.2"
248272
typed_data:
249273
dependency: transitive
250274
description:
@@ -269,6 +293,14 @@ packages:
269293
url: "https://pub.dev"
270294
source: hosted
271295
version: "2.1.4"
296+
vm_service:
297+
dependency: transitive
298+
description:
299+
name: vm_service
300+
sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
301+
url: "https://pub.dev"
302+
source: hosted
303+
version: "14.2.5"
272304
sdks:
273-
dart: ">=3.0.0-313.0.dev <4.0.0"
274-
flutter: ">=3.0.0"
305+
dart: ">=3.3.0 <4.0.0"
306+
flutter: ">=3.18.0-18.0.pre.54"

‎lib/backend/entity_info.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class EntityInfo {
4141
}
4242

4343
@override
44-
bool operator ==(Object? other) {
44+
bool operator ==(Object other) {
4545
if (other is EntityInfo) {
4646
return _equals(other);
4747
}

‎lib/backend/folder_provider.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import 'package:files/backend/utils.dart';
2121
import 'package:flutter/material.dart';
2222
import 'package:windows_path_provider/windows_path_provider.dart';
2323
import 'package:xdg_directories/xdg_directories.dart';
24-
import 'package:yaru_icons/yaru_icons.dart';
24+
import 'package:yaru/yaru.dart';
2525

2626
class FolderProvider {
2727
final List<BuiltinFolder> _folders;

‎lib/backend/utils.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import 'package:files/backend/providers.dart';
66
import 'package:flutter/material.dart';
77
import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
88
import 'package:mime/mime.dart';
9-
import 'package:yaru_icons/yaru_icons.dart';
9+
import 'package:yaru/yaru.dart';
1010

1111
class Utils {
1212
Utils._();

‎lib/main.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import 'package:files/widgets/tab_strip.dart';
2121
import 'package:files/widgets/workspace.dart';
2222
import 'package:flutter/material.dart';
2323
import 'package:yaru/yaru.dart';
24-
import 'package:yaru_widgets/yaru_widgets.dart';
2524

2625
Future<void> main(List<String> args) async {
2726
WidgetsFlutterBinding.ensureInitialized();
@@ -40,7 +39,7 @@ ThemeData? _applyThemeValues(ThemeData? theme) {
4039
outlinedButtonTheme: OutlinedButtonThemeData(
4140
style: theme.outlinedButtonTheme.style?.merge(
4241
OutlinedButton.styleFrom(
43-
backgroundColor: theme.colorScheme.surfaceVariant,
42+
backgroundColor: theme.colorScheme.surfaceContainerHighest,
4443
),
4544
),
4645
),
@@ -93,7 +92,7 @@ class _FilesHomeState extends State<FilesHome> {
9392
@override
9493
Widget build(BuildContext context) {
9594
return Material(
96-
color: Theme.of(context).colorScheme.background,
95+
color: Theme.of(context).colorScheme.surface,
9796
child: Column(
9897
children: [
9998
GestureDetector(

‎lib/widgets/breadcrumbs_bar.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ class _BreadcrumbsBarState extends State<BreadcrumbsBar> {
7575
child: Padding(
7676
padding: const EdgeInsets.all(8.0),
7777
child: Material(
78-
color: Theme.of(context).colorScheme.surfaceVariant,
78+
color:
79+
Theme.of(context).colorScheme.surfaceContainerHighest,
7980
shape: RoundedRectangleBorder(
8081
borderRadius: BorderRadius.circular(6),
8182
side: !focusNode.hasFocus
@@ -200,7 +201,8 @@ class _BreadcrumbChip extends StatelessWidget {
200201
return SizedBox(
201202
height: double.infinity,
202203
child: DragTarget<FileSystemEntity>(
203-
onAccept: (data) => Utils.moveFileToDest(data, path.toPath()),
204+
onAcceptWithDetails: (details) =>
205+
Utils.moveFileToDest(details.data, path.toPath()),
204206
builder: (context, candidateData, rejectedData) {
205207
return InkWell(
206208
child: Row(

‎lib/widgets/context_menu.dart

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import 'package:flutter/material.dart';
2-
import 'package:yaru_icons/yaru_icons.dart';
3-
import 'package:yaru_widgets/yaru_widgets.dart';
2+
import 'package:yaru/yaru.dart';
43

54
class ContextMenu extends StatefulWidget {
65
final List<BaseContextMenuItem> entries;
@@ -105,7 +104,7 @@ class SubmenuMenuItem extends BaseContextMenuItem {
105104
leadingIcon: buildLeading(context),
106105
trailingIcon: buildTrailing(context),
107106
style: const ButtonStyle(
108-
padding: MaterialStatePropertyAll(
107+
padding: WidgetStatePropertyAll(
109108
EdgeInsets.symmetric(horizontal: 16),
110109
),
111110
),
@@ -142,7 +141,7 @@ class ContextMenuItem extends BaseContextMenuItem {
142141
onPressed: onTap,
143142
shortcut: shortcut,
144143
style: const ButtonStyle(
145-
padding: MaterialStatePropertyAll(
144+
padding: WidgetStatePropertyAll(
146145
EdgeInsets.symmetric(horizontal: 16),
147146
),
148147
),
@@ -216,13 +215,10 @@ class CheckboxMenuItem extends ContextMenuItem {
216215
switch (value) {
217216
case false:
218217
onChanged!.call(true);
219-
break;
220218
case true:
221219
onChanged!.call(tristate ? null : false);
222-
break;
223220
case null:
224221
onChanged!.call(false);
225-
break;
226222
}
227223
};
228224

‎lib/widgets/double_scrollbars.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,8 @@ class ScrollProxy extends StatelessWidget {
136136
switch (direction) {
137137
case Axis.vertical:
138138
provider = VerticalScrollReceiver.of(context);
139-
break;
140139
case Axis.horizontal:
141140
provider = HorizontalScrollReceiver.of(context);
142-
break;
143141
}
144142

145143
provider.notify(notification);

0 commit comments

Comments
 (0)