Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit f219175

Browse files
toly1994328toly1994328
committedMay 20, 2023
升级 Flutter 3.10.1
1 parent 0c99a5a commit f219175

File tree

15 files changed

+87
-110
lines changed

15 files changed

+87
-110
lines changed
 

‎README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
> 当前Flutter 版本
3030
3131
```
32-
Flutter 3.7.12 • channel stable • https://github.com/flutter/flutter.git
33-
Framework • revision 4d9e56e694 (7 days ago) • 2023-04-17 21:47:46 -0400
34-
Engine • revision 1a65d409c7
35-
Tools • Dart 2.19.6 • DevTools 2.20.1
32+
Flutter 3.10.1 • channel stable • https://github.com/flutter/flutter.git
33+
Framework • revision d3d8effc68 (3 days ago) • 2023-05-16 17:59:05 -0700
34+
Engine • revision b4fb11214d
35+
Tools • Dart 3.0.1 • DevTools 2.23.1
3636
```
3737

3838
---

‎android/app/build.gradle

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,16 @@ android {
4444
defaultConfig {
4545
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
4646
applicationId "com.toly1994.flutter_unit"
47-
minSdkVersion 16
47+
minSdkVersion 19
4848
targetSdkVersion 30
4949
versionCode flutterVersionCode.toInteger()
5050
versionName flutterVersionName
5151
multiDexEnabled true
5252
archivesBaseName = "FlutterUnit.apk"
53+
ndk {
54+
abiFilters 'arm64-v8a'
55+
// abiFilters 'armeabi', 'x86', 'armeabi-v7a', 'x86_64', 'arm64-v8a'
56+
}
5357
}
5458

5559
buildTypes {

‎android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ subprojects {
2424
project.evaluationDependsOn(':app')
2525
}
2626

27-
task clean(type: Delete) {
27+
tasks.register("clean", Delete) {
2828
delete rootProject.buildDir
2929
}

‎lib/app/utils/color_utils.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ class ColorUtils {
3838
print(e);
3939
}
4040
switch (code.length) {
41-
case 1 + 6://6位
41+
case 7://6位
4242
result = Color(value + 0xFF000000);
4343
break;
44-
case 1 + 8://8位
44+
case 9://8位
4545
result = Color(value);
4646
break;
4747
default:

‎macos/Flutter/GeneratedPluginRegistrant.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import FlutterMacOS
66
import Foundation
77

8-
import package_info_plus_macos
8+
import package_info_plus
99
import path_provider_macos
1010
import screen_retriever
1111
import share_plus

‎packages/app_update/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies:
1414
flutter_bloc: ^8.0.1 # 状态管理
1515
shared_preferences: ^2.0.13 # xml 固化
1616
r_upgrade: ^0.3.8+2 # 应用升级
17-
package_info_plus: ^1.3.0 # 应用包信息
17+
package_info_plus: ^4.0.1
1818
utils:
1919
path: ../utils
2020
app_config:

‎packages/components/lib/flutter_ui/no_div_expansion_tile.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ class _NoBorderExpansionTileState extends State<NoBorderExpansionTile> with Sing
107107
_iconColor = _controller.drive(_iconColorTween.chain(_easeInTween));
108108
_backgroundColor = _controller.drive(_backgroundColorTween.chain(_easeOutTween));
109109

110-
_isExpanded = PageStorage.of(context)?.readState(context) ?? widget.initiallyExpanded;
110+
_isExpanded = PageStorage.of(context).readState(context) ?? widget.initiallyExpanded;
111111
if (_isExpanded) {
112112
_controller.value = 1.0;
113113
}
@@ -135,7 +135,7 @@ class _NoBorderExpansionTileState extends State<NoBorderExpansionTile> with Sing
135135
});
136136
});
137137
}
138-
PageStorage.of(context)?.writeState(context, _isExpanded);
138+
PageStorage.of(context).writeState(context, _isExpanded);
139139
});
140140
widget.onExpansionChanged?.call(_isExpanded);
141141
}
@@ -179,11 +179,11 @@ class _NoBorderExpansionTileState extends State<NoBorderExpansionTile> with Sing
179179
_borderColorTween
180180
.end = theme.dividerColor;
181181
_headerColorTween
182-
..begin = theme.textTheme.subtitle1!.color
183-
..end = theme.accentColor;
182+
..begin = theme.textTheme.bodyMedium?.color
183+
..end = theme.primaryColor;
184184
_iconColorTween
185185
..begin = theme.unselectedWidgetColor
186-
..end = theme.accentColor;
186+
..end = theme.primaryColor;
187187
_backgroundColorTween
188188
.end = widget.backgroundColor;
189189
super.didChangeDependencies();

‎packages/widget_repository/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dependencies:
1212
flutter:
1313
sdk: flutter
1414
equatable: ^2.0.5
15-
intl: ^0.17.0
15+
intl: ^0.18.0
1616
utils:
1717
path: ../utils
1818
storage:

‎packages/widgets/lib/ProxyWidget/SliderTheme/node2_diy.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ class _DIYSliderThemeState extends State<DIYSliderTheme> {
3838
valueIndicatorColor: Colors.deepPurpleAccent,
3939
thumbShape: _CustomThumbShape(),
4040
valueIndicatorShape: _CustomValueIndicatorShape(),
41-
valueIndicatorTextStyle: theme.accentTextTheme.bodyText2!
42-
.copyWith(color: theme.colorScheme.onSurface),
41+
valueIndicatorTextStyle: theme.primaryTextTheme.bodyMedium?.copyWith(color: theme.colorScheme.onSurface),
4342
),
4443
child: Slider(
4544
min: 0.0,

‎packages/widgets/lib/SingleChildRenderObjectWidget/AnimatedSize/node1_base.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ class _CustomAnimatedSizeState extends State<CustomAnimatedSize>
4747
height: 100,
4848
alignment: Alignment.center,
4949
child: AnimatedSize(
50-
vsync: this,
5150
duration: const Duration(seconds: 1),
5251
curve: Curves.fastOutSlowIn,
5352
alignment: const Alignment(0, 0),

‎packages/widgets/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ dependencies:
1111
flutter:
1212
sdk: flutter
1313
path_provider: ^2.0.11 # 路径
14-
intl: ^0.17.0
14+
intl: ^0.18.0
1515
app_config:
1616
path: ../app_config
1717
components:

‎pubspec.lock

Lines changed: 49 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ packages:
3535
dependency: transitive
3636
description:
3737
name: async
38-
sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
38+
sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
3939
url: "https://pub.flutter-io.cn"
4040
source: hosted
41-
version: "2.10.0"
41+
version: "2.11.0"
4242
authentication:
4343
dependency: "direct main"
4444
description:
@@ -66,10 +66,10 @@ packages:
6666
dependency: transitive
6767
description:
6868
name: characters
69-
sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
69+
sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
7070
url: "https://pub.flutter-io.cn"
7171
source: hosted
72-
version: "1.2.1"
72+
version: "1.3.0"
7373
clock:
7474
dependency: transitive
7575
description:
@@ -82,10 +82,10 @@ packages:
8282
dependency: transitive
8383
description:
8484
name: collection
85-
sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
85+
sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
8686
url: "https://pub.flutter-io.cn"
8787
source: hosted
88-
version: "1.17.0"
88+
version: "1.17.1"
8989
components:
9090
dependency: "direct main"
9191
description:
@@ -105,10 +105,10 @@ packages:
105105
dependency: transitive
106106
description:
107107
name: cross_file
108-
sha256: f71079978789bc2fe78d79227f1f8cfe195b31bbd8db2399b0d15a4b96fb843b
108+
sha256: "0b0036e8cccbfbe0555fd83c1d31a6f30b77a96b598b35a5d36dd41f718695e9"
109109
url: "https://pub.flutter-io.cn"
110110
source: hosted
111-
version: "0.3.3+2"
111+
version: "0.3.3+4"
112112
crypto:
113113
dependency: transitive
114114
description:
@@ -177,10 +177,10 @@ packages:
177177
dependency: "direct main"
178178
description:
179179
name: file_picker
180-
sha256: d090ae03df98b0247b82e5928f44d1b959867049d18d73635e2e0bc3f49542b9
180+
sha256: c7a8e25ca60e7f331b153b0cb3d405828f18d3e72a6fa1d9440c86556fffc877
181181
url: "https://pub.flutter-io.cn"
182182
source: hosted
183-
version: "5.2.5"
183+
version: "5.3.0"
184184
flutter:
185185
dependency: "direct main"
186186
description: flutter
@@ -219,10 +219,10 @@ packages:
219219
dependency: transitive
220220
description:
221221
name: flutter_plugin_android_lifecycle
222-
sha256: "4bef634684b2c7f3468c77c766c831229af829a0cd2d4ee6c1b99558bd14e5d2"
222+
sha256: "950e77c2bbe1692bc0874fc7fb491b96a4dc340457f4ea1641443d0a6c1ea360"
223223
url: "https://pub.flutter-io.cn"
224224
source: hosted
225-
version: "2.0.8"
225+
version: "2.0.15"
226226
flutter_spinkit:
227227
dependency: "direct main"
228228
description:
@@ -285,18 +285,18 @@ packages:
285285
dependency: "direct main"
286286
description:
287287
name: intl
288-
sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91"
288+
sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6
289289
url: "https://pub.flutter-io.cn"
290290
source: hosted
291-
version: "0.17.0"
291+
version: "0.18.0"
292292
js:
293293
dependency: transitive
294294
description:
295295
name: js
296-
sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
296+
sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
297297
url: "https://pub.flutter-io.cn"
298298
source: hosted
299-
version: "0.6.5"
299+
version: "0.6.7"
300300
jwt_decoder:
301301
dependency: "direct main"
302302
description:
@@ -325,10 +325,10 @@ packages:
325325
dependency: transitive
326326
description:
327327
name: matcher
328-
sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
328+
sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
329329
url: "https://pub.flutter-io.cn"
330330
source: hosted
331-
version: "0.12.13"
331+
version: "0.12.15"
332332
material_color_utilities:
333333
dependency: transitive
334334
description:
@@ -341,18 +341,18 @@ packages:
341341
dependency: transitive
342342
description:
343343
name: meta
344-
sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
344+
sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
345345
url: "https://pub.flutter-io.cn"
346346
source: hosted
347-
version: "1.8.0"
347+
version: "1.9.1"
348348
mime:
349349
dependency: transitive
350350
description:
351351
name: mime
352-
sha256: dab22e92b41aa1255ea90ddc4bc2feaf35544fd0728e209638cad041a6e3928a
352+
sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e
353353
url: "https://pub.flutter-io.cn"
354354
source: hosted
355-
version: "1.0.2"
355+
version: "1.0.4"
356356
nested:
357357
dependency: transitive
358358
description:
@@ -372,58 +372,26 @@ packages:
372372
dependency: "direct main"
373373
description:
374374
name: package_info_plus
375-
sha256: f62d7253edc197fe3c88d7c2ddab82d68f555e778d55390ccc3537eca8e8d637
376-
url: "https://pub.flutter-io.cn"
377-
source: hosted
378-
version: "1.4.3+1"
379-
package_info_plus_linux:
380-
dependency: transitive
381-
description:
382-
name: package_info_plus_linux
383-
sha256: "04b575f44233d30edbb80a94e57cad9107aada334fc02aabb42b6becd13c43fc"
384-
url: "https://pub.flutter-io.cn"
385-
source: hosted
386-
version: "1.0.5"
387-
package_info_plus_macos:
388-
dependency: transitive
389-
description:
390-
name: package_info_plus_macos
391-
sha256: a2ad8b4acf4cd479d4a0afa5a74ea3f5b1c7563b77e52cc32b3ee6956d5482a6
375+
sha256: "28386bbe89ab5a7919a47cea99cdd1128e5a6e0bbd7eaafe20440ead84a15de3"
392376
url: "https://pub.flutter-io.cn"
393377
source: hosted
394-
version: "1.3.0"
378+
version: "4.0.1"
395379
package_info_plus_platform_interface:
396380
dependency: transitive
397381
description:
398382
name: package_info_plus_platform_interface
399-
sha256: f7a0c8f1e7e981bc65f8b64137a53fd3c195b18d429fba960babc59a5a1c7ae8
383+
sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6"
400384
url: "https://pub.flutter-io.cn"
401385
source: hosted
402-
version: "1.0.2"
403-
package_info_plus_web:
404-
dependency: transitive
405-
description:
406-
name: package_info_plus_web
407-
sha256: f0829327eb534789e0a16ccac8936a80beed4e2401c4d3a74f3f39094a822d3b
408-
url: "https://pub.flutter-io.cn"
409-
source: hosted
410-
version: "1.0.6"
411-
package_info_plus_windows:
412-
dependency: transitive
413-
description:
414-
name: package_info_plus_windows
415-
sha256: "79524f11c42dd9078b96d797b3cf79c0a2883a50c4920dc43da8562c115089bc"
416-
url: "https://pub.flutter-io.cn"
417-
source: hosted
418-
version: "2.1.0"
386+
version: "2.0.1"
419387
path:
420388
dependency: transitive
421389
description:
422390
name: path
423-
sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
391+
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
424392
url: "https://pub.flutter-io.cn"
425393
source: hosted
426-
version: "1.8.2"
394+
version: "1.8.3"
427395
path_parsing:
428396
dependency: transitive
429397
description:
@@ -484,10 +452,10 @@ packages:
484452
dependency: transitive
485453
description:
486454
name: path_provider_windows
487-
sha256: bcabbe399d4042b8ee687e17548d5d3f527255253b4a639f5f8d2094a9c2b45c
455+
sha256: d3f80b32e83ec208ac95253e0cd4d298e104fbc63cb29c5c69edaed43b0c69d6
488456
url: "https://pub.flutter-io.cn"
489457
source: hosted
490-
version: "2.1.3"
458+
version: "2.1.6"
491459
petitparser:
492460
dependency: transitive
493461
description:
@@ -508,10 +476,10 @@ packages:
508476
dependency: transitive
509477
description:
510478
name: plugin_platform_interface
511-
sha256: dbf0f707c78beedc9200146ad3cb0ab4d5da13c246336987be6940f026500d3a
479+
sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc"
512480
url: "https://pub.flutter-io.cn"
513481
source: hosted
514-
version: "2.1.3"
482+
version: "2.1.4"
515483
pointycastle:
516484
dependency: transitive
517485
description:
@@ -556,18 +524,18 @@ packages:
556524
dependency: "direct main"
557525
description:
558526
name: share_plus
559-
sha256: "8c6892037b1824e2d7e8f59d54b3105932899008642e6372e5079c6939b4b625"
527+
sha256: "44fc0bc2d35a8fafa1b564e1c6888bdc4fbb2d0197e4a4c21bac0e66123be9cd"
560528
url: "https://pub.flutter-io.cn"
561529
source: hosted
562-
version: "6.3.1"
530+
version: "7.0.1"
563531
share_plus_platform_interface:
564532
dependency: transitive
565533
description:
566534
name: share_plus_platform_interface
567-
sha256: "82ddd4ab9260c295e6e39612d4ff00390b9a7a21f1bb1da771e2f232d80ab8a1"
535+
sha256: "0c6e61471bd71b04a138b8b588fa388e66d8b005e6f2deda63371c5c505a0981"
568536
url: "https://pub.flutter-io.cn"
569537
source: hosted
570-
version: "3.2.0"
538+
version: "3.2.1"
571539
shared_preferences:
572540
dependency: "direct main"
573541
description:
@@ -736,10 +704,10 @@ packages:
736704
dependency: transitive
737705
description:
738706
name: test_api
739-
sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
707+
sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
740708
url: "https://pub.flutter-io.cn"
741709
source: hosted
742-
version: "0.4.16"
710+
version: "0.5.1"
743711
toggle_rotate:
744712
dependency: "direct main"
745713
description:
@@ -784,10 +752,10 @@ packages:
784752
dependency: transitive
785753
description:
786754
name: url_launcher_linux
787-
sha256: "360fa359ab06bcb4f7c5cd3123a2a9a4d3364d4575d27c4b33468bd4497dd094"
755+
sha256: "207f4ddda99b95b4d4868320a352d374b0b7e05eefad95a4a26f57da413443f5"
788756
url: "https://pub.flutter-io.cn"
789757
source: hosted
790-
version: "3.0.1"
758+
version: "3.0.5"
791759
url_launcher_macos:
792760
dependency: transitive
793761
description:
@@ -800,26 +768,26 @@ packages:
800768
dependency: transitive
801769
description:
802770
name: url_launcher_platform_interface
803-
sha256: "4eae912628763eb48fc214522e58e942fd16ce195407dbf45638239523c759a6"
771+
sha256: "6c9ca697a5ae218ce56cece69d46128169a58aa8653c1b01d26fcd4aad8c4370"
804772
url: "https://pub.flutter-io.cn"
805773
source: hosted
806-
version: "2.1.1"
774+
version: "2.1.2"
807775
url_launcher_web:
808776
dependency: transitive
809777
description:
810778
name: url_launcher_web
811-
sha256: "5669882643b96bb6d5786637cac727c6e918a790053b09245fd4513b8a07df2a"
779+
sha256: "81fe91b6c4f84f222d186a9d23c73157dc4c8e1c71489c4d08be1ad3b228f1aa"
812780
url: "https://pub.flutter-io.cn"
813781
source: hosted
814-
version: "2.0.13"
782+
version: "2.0.16"
815783
url_launcher_windows:
816784
dependency: transitive
817785
description:
818786
name: url_launcher_windows
819-
sha256: e3c3b16d3104260c10eea3b0e34272aaa57921f83148b0619f74c2eced9b7ef1
787+
sha256: "254708f17f7c20a9c8c471f67d86d76d4a3f9c1591aad1e15292008aceb82771"
820788
url: "https://pub.flutter-io.cn"
821789
source: hosted
822-
version: "3.0.1"
790+
version: "3.0.6"
823791
utils:
824792
dependency: "direct main"
825793
description:
@@ -892,10 +860,10 @@ packages:
892860
dependency: transitive
893861
description:
894862
name: win32
895-
sha256: ca121dbbadb3e43b449053feab0cdf3f2bff93b107cacf0290e3d29f717374b6
863+
sha256: "5a751eddf9db89b3e5f9d50c20ab8612296e4e8db69009788d6c8b060a84191c"
896864
url: "https://pub.flutter-io.cn"
897865
source: hosted
898-
version: "3.1.2"
866+
version: "4.1.4"
899867
window_manager:
900868
dependency: "direct main"
901869
description:
@@ -945,5 +913,5 @@ packages:
945913
source: hosted
946914
version: "1.0.1"
947915
sdks:
948-
dart: ">=2.19.0-0 <3.0.0"
916+
dart: ">=3.0.0 <4.0.0"
949917
flutter: ">=3.7.0-0"

‎pubspec.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ homepage: https://juejin.cn/user/149189281194766/posts
77

88

99
environment:
10-
sdk: ">=2.17.1 <=3.0.0"
10+
sdk: ">=3.0.0 <4.0.0"
1111

1212
dependencies:
1313
flutter:
@@ -20,7 +20,7 @@ dependencies:
2020
stream_transform: ^2.0.0
2121
equatable: ^2.0.3 # 相等辅助
2222
archive: ^3.3.6 # 解压
23-
package_info_plus: ^1.3.0 # 应用包信息
23+
package_info_plus: ^4.0.1 # 应用包信息
2424
r_upgrade: ^0.3.8+2 # 应用升级
2525

2626
sqflite: ^2.0.2+1 # 数据库
@@ -37,9 +37,9 @@ dependencies:
3737
wrapper: ^1.0.2
3838
yaml_modify: ^1.0.1
3939
url_launcher: ^6.1.9 # url
40-
share_plus: ^6.3.1 # 文字分享
40+
share_plus: ^7.0.1 # 文字分享
4141
flutter_svg: ^2.0.1
42-
intl: ^0.17.0
42+
intl: ^0.18.0
4343
platform: ^3.1.0
4444
image: ^3.1.0
4545
flutter_spinkit: ^5.1.0 # loading

‎windows/runner/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,13 @@ add_executable(${BINARY_NAME} WIN32
2020
# that need different build settings.
2121
apply_standard_settings(${BINARY_NAME})
2222

23+
# Add preprocessor definitions for the build version.
24+
target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION=\"${FLUTTER_VERSION}\"")
25+
target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}")
26+
target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}")
27+
target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}")
28+
target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}")
29+
2330
# Disable Windows macros that collide with C++ standard library functions.
2431
target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX")
2532

‎windows/runner/Runner.rc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,14 @@ IDI_APP_ICON ICON "resources\\app_icon.ico"
6060
// Version
6161
//
6262

63-
#ifdef FLUTTER_BUILD_NUMBER
64-
#define VERSION_AS_NUMBER FLUTTER_BUILD_NUMBER
63+
#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD)
64+
#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD
6565
#else
66-
#define VERSION_AS_NUMBER 1,0,0
66+
#define VERSION_AS_NUMBER 1,0,0,0
6767
#endif
6868

69-
#ifdef FLUTTER_BUILD_NAME
70-
#define VERSION_AS_STRING #FLUTTER_BUILD_NAME
69+
#if defined(FLUTTER_VERSION)
70+
#define VERSION_AS_STRING FLUTTER_VERSION
7171
#else
7272
#define VERSION_AS_STRING "1.0.0"
7373
#endif

0 commit comments

Comments
 (0)
Please sign in to comment.