Skip to content

Commit f9af786

Browse files
authored
Add support for Flutter 3.29 (#1396)
* Add lint ignore for color deprecated members * Temporary disable dart format check on GitHub Actions * Add missing docs explaining `ignore` * Update webview platform mocks * fwfh_cached_network_image requires Flutter >3.10 * fwfh_chewie requires Flutter >3.10 * fwfh_just_audio requires Flutter >3.10 * fwfh_svg requires Flutter >3.10 * fwfh_url_launcher requires Flutter >3.10
1 parent 0fa344e commit f9af786

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+464
-518
lines changed

.github/workflows/demo_app.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ jobs:
7171
run: |
7272
set -e
7373
74+
npm install --global vercel@latest
75+
7476
cd ./build/web
7577
echo '{' >vercel.json
7678
echo ' "headers": [ { "source": "/(.*)", "headers": [' >>vercel.json

.github/workflows/flutter.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@ jobs:
2727
uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1 # v2.16.0
2828
with:
2929
cache: true
30-
- run: dart format --set-exit-if-changed --output none .
30+
31+
# TODO: investigate why this fail on GitHub Actions
32+
# - run: dart format --set-exit-if-changed --output none .
33+
3134
- name: Run chromedriver
3235
run: |
3336
set -e

demo_app/integration_test/auto_resize_test.dart

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ void main() {
2424
});
2525

2626
final webViewTestCases = ValueVariant(const {
27-
WebViewTestCase(0.5, false),
28-
WebViewTestCase(1.0, false),
29-
WebViewTestCase(2.0, false),
30-
WebViewTestCase(1.0, true),
27+
WebViewTestCase(input: 0.5, issue375: false),
28+
WebViewTestCase(input: 1.0, issue375: false),
29+
WebViewTestCase(input: 2.0, issue375: false),
30+
WebViewTestCase(input: 1.0, issue375: true),
3131
});
3232

3333
patrolTest(
@@ -64,8 +64,10 @@ class WebViewTestCase {
6464
final double input;
6565
final bool issue375;
6666

67-
// ignore: avoid_positional_boolean_parameters
68-
const WebViewTestCase(this.input, this.issue375);
67+
const WebViewTestCase({
68+
required this.input,
69+
required this.issue375,
70+
});
6971

7072
Future<_AspectRatioTest> run(PatrolIntegrationTester $) async {
7173
final html = '''

demo_app/ios/Podfile.lock

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ PODS:
55
- Flutter (1.0.0)
66
- just_audio (0.0.1):
77
- Flutter
8+
- FlutterMacOS
89
- package_info_plus (0.4.5):
910
- Flutter
1011
- path_provider_foundation (0.0.1):
@@ -31,7 +32,7 @@ PODS:
3132
DEPENDENCIES:
3233
- audio_session (from `.symlinks/plugins/audio_session/ios`)
3334
- Flutter (from `Flutter`)
34-
- just_audio (from `.symlinks/plugins/just_audio/ios`)
35+
- just_audio (from `.symlinks/plugins/just_audio/darwin`)
3536
- package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
3637
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
3738
- patrol (from `.symlinks/plugins/patrol/darwin`)
@@ -51,7 +52,7 @@ EXTERNAL SOURCES:
5152
Flutter:
5253
:path: Flutter
5354
just_audio:
54-
:path: ".symlinks/plugins/just_audio/ios"
55+
:path: ".symlinks/plugins/just_audio/darwin"
5556
package_info_plus:
5657
:path: ".symlinks/plugins/package_info_plus/ios"
5758
path_provider_foundation:
@@ -70,19 +71,19 @@ EXTERNAL SOURCES:
7071
:path: ".symlinks/plugins/webview_flutter_wkwebview/darwin"
7172

7273
SPEC CHECKSUMS:
73-
audio_session: 088d2483ebd1dc43f51d253d4a1c517d9a2e7207
74+
audio_session: 9bb7f6c970f21241b19f5a3658097ae459681ba0
7475
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
7576
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
76-
just_audio: baa7252489dbcf47a4c7cc9ca663e9661c99aafa
77-
package_info_plus: c0502532a26c7662a62a356cebe2692ec5fe4ec4
78-
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
79-
patrol: 0564cee315ff6c86fb802b3647db05cc2d3d0624
80-
sqflite_darwin: 5a7236e3b501866c1c9befc6771dfd73ffb8702d
81-
url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
82-
video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3
83-
wakelock_plus: 78ec7c5b202cab7761af8e2b2b3d0671be6c4ae1
84-
webview_flutter_wkwebview: 0982481e3d9c78fd5c6f62a002fcd24fc791f1e4
77+
just_audio: 4e391f57b79cad2b0674030a00453ca5ce817eed
78+
package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
79+
path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
80+
patrol: dd82ffedfee3aba87c1d0ed2daad0b77bfb8ee1f
81+
sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
82+
url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
83+
video_player_avfoundation: 2cef49524dd1f16c5300b9cd6efd9611ce03639b
84+
wakelock_plus: 04623e3f525556020ebd4034310f20fe7fda8b49
85+
webview_flutter_wkwebview: 1821ceac936eba6f7984d89a9f3bcb4dea99ebb2
8586

86-
PODFILE CHECKSUM: 819463e6a0290f5a72f145ba7cde16e8b6ef0796
87+
PODFILE CHECKSUM: 4047b237a92efec4e335c96f6d2daf630bacba96
8788

88-
COCOAPODS: 1.15.2
89+
COCOAPODS: 1.16.2

demo_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
ignoresPersistentStateOnLaunch = "NO"
7070
debugDocumentVersioning = "YES"
7171
debugServiceExtension = "internal"
72+
enableGPUValidationMode = "1"
7273
allowLocationSimulation = "YES">
7374
<BuildableProductRunnable
7475
runnableDebuggingMode = "0">

demo_app/macos/Flutter/GeneratedPluginRegistrant.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
2626
UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
2727
FVPVideoPlayerPlugin.register(with: registry.registrar(forPlugin: "FVPVideoPlayerPlugin"))
2828
WakelockPlusMacosPlugin.register(with: registry.registrar(forPlugin: "WakelockPlusMacosPlugin"))
29-
FLTWebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "FLTWebViewFlutterPlugin"))
29+
WebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "WebViewFlutterPlugin"))
3030
}

demo_app/macos/Podfile.lock

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ PODS:
44
- CocoaAsyncSocket (7.6.5)
55
- FlutterMacOS (1.0.0)
66
- just_audio (0.0.1):
7+
- Flutter
78
- FlutterMacOS
89
- package_info_plus (0.0.1):
910
- FlutterMacOS
@@ -31,7 +32,7 @@ PODS:
3132
DEPENDENCIES:
3233
- audio_session (from `Flutter/ephemeral/.symlinks/plugins/audio_session/macos`)
3334
- FlutterMacOS (from `Flutter/ephemeral`)
34-
- just_audio (from `Flutter/ephemeral/.symlinks/plugins/just_audio/macos`)
35+
- just_audio (from `Flutter/ephemeral/.symlinks/plugins/just_audio/darwin`)
3536
- package_info_plus (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos`)
3637
- path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/darwin`)
3738
- patrol (from `Flutter/ephemeral/.symlinks/plugins/patrol/darwin`)
@@ -51,7 +52,7 @@ EXTERNAL SOURCES:
5152
FlutterMacOS:
5253
:path: Flutter/ephemeral
5354
just_audio:
54-
:path: Flutter/ephemeral/.symlinks/plugins/just_audio/macos
55+
:path: Flutter/ephemeral/.symlinks/plugins/just_audio/darwin
5556
package_info_plus:
5657
:path: Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos
5758
path_provider_foundation:
@@ -70,19 +71,19 @@ EXTERNAL SOURCES:
7071
:path: Flutter/ephemeral/.symlinks/plugins/webview_flutter_wkwebview/darwin
7172

7273
SPEC CHECKSUMS:
73-
audio_session: dea1f41890dbf1718f04a56f1d6150fd50039b72
74+
audio_session: eaca2512cf2b39212d724f35d11f46180ad3a33e
7475
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
7576
FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
76-
just_audio: 9b67ca7b97c61cfc9784ea23cd8cc55eb226d489
77-
package_info_plus: 12f1c5c2cfe8727ca46cbd0b26677728972d9a5b
78-
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
79-
patrol: 0564cee315ff6c86fb802b3647db05cc2d3d0624
80-
sqflite_darwin: 5a7236e3b501866c1c9befc6771dfd73ffb8702d
81-
url_launcher_macos: c82c93949963e55b228a30115bd219499a6fe404
82-
video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3
83-
wakelock_plus: 4783562c9a43d209c458cb9b30692134af456269
84-
webview_flutter_wkwebview: 0982481e3d9c78fd5c6f62a002fcd24fc791f1e4
77+
just_audio: 4e391f57b79cad2b0674030a00453ca5ce817eed
78+
package_info_plus: f0052d280d17aa382b932f399edf32507174e870
79+
path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
80+
patrol: dd82ffedfee3aba87c1d0ed2daad0b77bfb8ee1f
81+
sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
82+
url_launcher_macos: 0fba8ddabfc33ce0a9afe7c5fef5aab3d8d2d673
83+
video_player_avfoundation: 2cef49524dd1f16c5300b9cd6efd9611ce03639b
84+
wakelock_plus: 21ddc249ac4b8d018838dbdabd65c5976c308497
85+
webview_flutter_wkwebview: 1821ceac936eba6f7984d89a9f3bcb4dea99ebb2
8586

8687
PODFILE CHECKSUM: 236401fc2c932af29a9fcf0e97baeeb2d750d367
8788

88-
COCOAPODS: 1.15.2
89+
COCOAPODS: 1.16.2

demo_app/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
ignoresPersistentStateOnLaunch = "NO"
6060
debugDocumentVersioning = "YES"
6161
debugServiceExtension = "internal"
62+
enableGPUValidationMode = "1"
6263
allowLocationSimulation = "YES">
6364
<BuildableProductRunnable
6465
runnableDebuggingMode = "0">

demo_app/macos/Runner/AppDelegate.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,8 @@ class AppDelegate: FlutterAppDelegate {
66
override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
77
return true
88
}
9+
10+
override func applicationSupportsSecureRestorableState(_ app: NSApplication) -> Bool {
11+
return true
12+
}
913
}

0 commit comments

Comments
 (0)