Skip to content

Commit 96bc47f

Browse files
hackware1993hackware1993
committed
adapt flutter 3.13
1 parent 90c3979 commit 96bc47f

File tree

8 files changed

+158
-109
lines changed

8 files changed

+158
-109
lines changed

‎example/lib/charts.dart

-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ class ChartsState extends State<ChartsExample> {
5858
codePath: 'lib/charts.dart',
5959
),
6060
body: Scrollbar(
61-
isAlwaysShown: true,
6261
controller: controller,
6362
child: SingleChildScrollView(
6463
controller: controller,

‎example/lib/translate.dart

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ class TrackPainter extends CustomPainter {
2626
/// Windows and Android are no problem.
2727
/// debug version is no problem.
2828
29-
// canvas.drawPoints(PointMode.polygon,points.toList(), painter);
29+
canvas.drawPoints(PointMode.polygon,points.toList(), painter);
3030

31-
for (final element in points) {
32-
canvas.drawCircle(element, 1 / window.devicePixelRatio, painter);
33-
}
31+
// for (final element in points) {
32+
// canvas.drawCircle(element, 1 / window.devicePixelRatio, painter);
33+
// }
3434
}
3535

3636
@override

‎example/pubspec.lock

+63-50
Original file line numberDiff line numberDiff line change
@@ -5,51 +5,50 @@ packages:
55
dependency: transitive
66
description:
77
name: async
8-
url: "https://pub.dartlang.org"
8+
sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
9+
url: "https://pub.dev"
910
source: hosted
10-
version: "2.8.2"
11+
version: "2.11.0"
1112
boolean_selector:
1213
dependency: transitive
1314
description:
1415
name: boolean_selector
15-
url: "https://pub.dartlang.org"
16+
sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
17+
url: "https://pub.dev"
1618
source: hosted
17-
version: "2.1.0"
19+
version: "2.1.1"
1820
characters:
1921
dependency: transitive
2022
description:
2123
name: characters
22-
url: "https://pub.dartlang.org"
23-
source: hosted
24-
version: "1.2.0"
25-
charcode:
26-
dependency: transitive
27-
description:
28-
name: charcode
29-
url: "https://pub.dartlang.org"
24+
sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
25+
url: "https://pub.dev"
3026
source: hosted
31-
version: "1.3.1"
27+
version: "1.3.0"
3228
clock:
3329
dependency: transitive
3430
description:
3531
name: clock
36-
url: "https://pub.dartlang.org"
32+
sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
33+
url: "https://pub.dev"
3734
source: hosted
38-
version: "1.1.0"
35+
version: "1.1.1"
3936
collection:
4037
dependency: transitive
4138
description:
4239
name: collection
43-
url: "https://pub.dartlang.org"
40+
sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
41+
url: "https://pub.dev"
4442
source: hosted
45-
version: "1.15.0"
43+
version: "1.17.2"
4644
fake_async:
4745
dependency: transitive
4846
description:
4947
name: fake_async
50-
url: "https://pub.dartlang.org"
48+
sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
49+
url: "https://pub.dev"
5150
source: hosted
52-
version: "1.2.0"
51+
version: "1.3.1"
5352
flutter:
5453
dependency: "direct main"
5554
description: flutter
@@ -66,7 +65,8 @@ packages:
6665
dependency: "direct dev"
6766
description:
6867
name: flutter_lints
69-
url: "https://pub.dartlang.org"
68+
sha256: b543301ad291598523947dc534aaddc5aaad597b709d2426d3a0e0d44c5cb493
69+
url: "https://pub.dev"
7070
source: hosted
7171
version: "1.0.4"
7272
flutter_test:
@@ -78,37 +78,42 @@ packages:
7878
dependency: transitive
7979
description:
8080
name: lints
81-
url: "https://pub.dartlang.org"
81+
sha256: a2c3d198cb5ea2e179926622d433331d8b58374ab8f29cdda6e863bd62fd369c
82+
url: "https://pub.dev"
8283
source: hosted
8384
version: "1.0.1"
8485
matcher:
8586
dependency: transitive
8687
description:
8788
name: matcher
88-
url: "https://pub.dartlang.org"
89+
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
90+
url: "https://pub.dev"
8991
source: hosted
90-
version: "0.12.11"
92+
version: "0.12.16"
9193
material_color_utilities:
9294
dependency: transitive
9395
description:
9496
name: material_color_utilities
95-
url: "https://pub.dartlang.org"
97+
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
98+
url: "https://pub.dev"
9699
source: hosted
97-
version: "0.1.3"
100+
version: "0.5.0"
98101
meta:
99102
dependency: transitive
100103
description:
101104
name: meta
102-
url: "https://pub.dartlang.org"
105+
sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
106+
url: "https://pub.dev"
103107
source: hosted
104-
version: "1.7.0"
108+
version: "1.9.1"
105109
path:
106110
dependency: transitive
107111
description:
108112
name: path
109-
url: "https://pub.dartlang.org"
113+
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
114+
url: "https://pub.dev"
110115
source: hosted
111-
version: "1.8.0"
116+
version: "1.8.3"
112117
sky_engine:
113118
dependency: transitive
114119
description: flutter
@@ -118,57 +123,65 @@ packages:
118123
dependency: transitive
119124
description:
120125
name: source_span
121-
url: "https://pub.dartlang.org"
126+
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
127+
url: "https://pub.dev"
122128
source: hosted
123-
version: "1.8.1"
129+
version: "1.10.0"
124130
stack_trace:
125131
dependency: transitive
126132
description:
127133
name: stack_trace
128-
url: "https://pub.dartlang.org"
134+
sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
135+
url: "https://pub.dev"
129136
source: hosted
130-
version: "1.10.0"
137+
version: "1.11.0"
131138
stream_channel:
132139
dependency: transitive
133140
description:
134141
name: stream_channel
135-
url: "https://pub.dartlang.org"
142+
sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
143+
url: "https://pub.dev"
136144
source: hosted
137-
version: "2.1.0"
145+
version: "2.1.1"
138146
string_scanner:
139147
dependency: transitive
140148
description:
141149
name: string_scanner
142-
url: "https://pub.dartlang.org"
150+
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
151+
url: "https://pub.dev"
143152
source: hosted
144-
version: "1.1.0"
153+
version: "1.2.0"
145154
term_glyph:
146155
dependency: transitive
147156
description:
148157
name: term_glyph
149-
url: "https://pub.dartlang.org"
158+
sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
159+
url: "https://pub.dev"
150160
source: hosted
151-
version: "1.2.0"
161+
version: "1.2.1"
152162
test_api:
153163
dependency: transitive
154164
description:
155165
name: test_api
156-
url: "https://pub.dartlang.org"
166+
sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
167+
url: "https://pub.dev"
157168
source: hosted
158-
version: "0.4.8"
159-
typed_data:
169+
version: "0.6.0"
170+
vector_math:
160171
dependency: transitive
161172
description:
162-
name: typed_data
163-
url: "https://pub.dartlang.org"
173+
name: vector_math
174+
sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
175+
url: "https://pub.dev"
164176
source: hosted
165-
version: "1.3.0"
166-
vector_math:
177+
version: "2.1.4"
178+
web:
167179
dependency: transitive
168180
description:
169-
name: vector_math
170-
url: "https://pub.dartlang.org"
181+
name: web
182+
sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
183+
url: "https://pub.dev"
171184
source: hosted
172-
version: "2.1.1"
185+
version: "0.1.4-beta"
173186
sdks:
174-
dart: ">=2.16.2 <3.0.0"
187+
dart: ">=3.1.0-185.0.dev <4.0.0"

‎example/windows/flutter/generated_plugins.cmake

+8
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
list(APPEND FLUTTER_PLUGIN_LIST
66
)
77

8+
list(APPEND FLUTTER_FFI_PLUGIN_LIST
9+
)
10+
811
set(PLUGIN_BUNDLED_LIBRARIES)
912

1013
foreach(plugin ${FLUTTER_PLUGIN_LIST})
@@ -13,3 +16,8 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST})
1316
list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
1417
list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
1518
endforeach(plugin)
19+
20+
foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
21+
add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin})
22+
list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
23+
endforeach(ffi_plugin)

‎lib/src/core.dart

+4-4
Original file line numberDiff line numberDiff line change
@@ -1723,7 +1723,7 @@ class Constraint extends ConstraintDefine {
17231723
}
17241724

17251725
if (needsLayout) {
1726-
AbstractNode? targetParent = renderObject.parent;
1726+
RenderObject? targetParent = renderObject.parent;
17271727
if (needsRecalculateConstraints) {
17281728
if (targetParent is _ConstraintRenderBox) {
17291729
targetParent.markNeedsRecalculateConstraints();
@@ -1734,19 +1734,19 @@ class Constraint extends ConstraintDefine {
17341734
}
17351735
} else {
17361736
if (needsReorderPaintingOrder) {
1737-
AbstractNode? targetParent = renderObject.parent;
1737+
RenderObject? targetParent = renderObject.parent;
17381738
if (targetParent is _ConstraintRenderBox) {
17391739
targetParent.needsReorderPaintingOrder = true;
17401740
}
17411741
}
17421742
if (needsReorderEventOrder) {
1743-
AbstractNode? targetParent = renderObject.parent;
1743+
RenderObject? targetParent = renderObject.parent;
17441744
if (targetParent is _ConstraintRenderBox) {
17451745
targetParent.needsReorderEventOrder = true;
17461746
}
17471747
}
17481748
if (needsPaint) {
1749-
AbstractNode? targetParent = renderObject.parent;
1749+
RenderObject? targetParent = renderObject.parent;
17501750
if (targetParent is RenderObject) {
17511751
targetParent.markNeedsPaint();
17521752
}

‎linux/flutter/generated_plugins.cmake

+8
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
list(APPEND FLUTTER_PLUGIN_LIST
66
)
77

8+
list(APPEND FLUTTER_FFI_PLUGIN_LIST
9+
)
10+
811
set(PLUGIN_BUNDLED_LIBRARIES)
912

1013
foreach(plugin ${FLUTTER_PLUGIN_LIST})
@@ -13,3 +16,8 @@ foreach(plugin ${FLUTTER_PLUGIN_LIST})
1316
list(APPEND PLUGIN_BUNDLED_LIBRARIES $<TARGET_FILE:${plugin}_plugin>)
1417
list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries})
1518
endforeach(plugin)
19+
20+
foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST})
21+
add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin})
22+
list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries})
23+
endforeach(ffi_plugin)

0 commit comments

Comments
 (0)