Skip to content

Commit 39781e5

Browse files
daohoangsondaohoangson
committed
Merge remote-tracking branch 'origin/master' into renovate/flutter_svg-2.x
2 parents bb367cc + c854c71 commit 39781e5

File tree

15 files changed

+332
-210
lines changed

15 files changed

+332
-210
lines changed

‎.github/workflows/backward_compatibility.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
yq e ".environment.sdk = \"${_sdkVersion}\"" -i pubspec.yaml
6666
6767
# extract Flutter version to install later
68-
_flutterVersion=$( yq e '.environment.flutter' pubspec.yaml )
68+
_flutterVersion=$( yq e '.environment.flutter' pubspec.yaml | sed -e 's/^>=//' | sed -e 's/-0$//' )
6969
echo "FLUTTER_VERSION=${_flutterVersion}" >> $GITHUB_ENV
7070
7171
# output for debugging

‎demo_app/ios/Podfile.lock‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ PODS:
99
- Flutter
1010
- just_audio (0.0.1):
1111
- Flutter
12-
- path_provider_ios (0.0.1):
12+
- path_provider_foundation (0.0.1):
1313
- Flutter
14+
- FlutterMacOS
1415
- sqflite (0.0.2):
1516
- Flutter
1617
- FMDB (>= 2.7.5)
@@ -28,7 +29,7 @@ DEPENDENCIES:
2829
- Flutter (from `Flutter`)
2930
- integration_test (from `.symlinks/plugins/integration_test/ios`)
3031
- just_audio (from `.symlinks/plugins/just_audio/ios`)
31-
- path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)
32+
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/ios`)
3233
- sqflite (from `.symlinks/plugins/sqflite/ios`)
3334
- url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
3435
- video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/ios`)
@@ -48,8 +49,8 @@ EXTERNAL SOURCES:
4849
:path: ".symlinks/plugins/integration_test/ios"
4950
just_audio:
5051
:path: ".symlinks/plugins/just_audio/ios"
51-
path_provider_ios:
52-
:path: ".symlinks/plugins/path_provider_ios/ios"
52+
path_provider_foundation:
53+
:path: ".symlinks/plugins/path_provider_foundation/ios"
5354
sqflite:
5455
:path: ".symlinks/plugins/sqflite/ios"
5556
url_launcher_ios:
@@ -67,9 +68,9 @@ SPEC CHECKSUMS:
6768
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
6869
integration_test: a1e7d09bd98eca2fc37aefd79d4f41ad37bdbbe5
6970
just_audio: baa7252489dbcf47a4c7cc9ca663e9661c99aafa
70-
path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02
71+
path_provider_foundation: 37748e03f12783f9de2cb2c4eadfaa25fe6d4852
7172
sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
72-
url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de
73+
url_launcher_ios: ae1517e5e344f5544fb090b079e11f399dfbe4d2
7374
video_player_avfoundation: e489aac24ef5cf7af82702979ed16f2a5ef84cff
7475
wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f
7576
webview_flutter_wkwebview: b7e70ef1ddded7e69c796c7390ee74180182971f

‎demo_app/ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 50;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -200,6 +200,7 @@
200200
/* Begin PBXShellScriptBuildPhase section */
201201
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
202202
isa = PBXShellScriptBuildPhase;
203+
alwaysOutOfDate = 1;
203204
buildActionMask = 2147483647;
204205
files = (
205206
);
@@ -214,6 +215,7 @@
214215
};
215216
9740EEB61CF901F6004384FC /* Run Script */ = {
216217
isa = PBXShellScriptBuildPhase;
218+
alwaysOutOfDate = 1;
217219
buildActionMask = 2147483647;
218220
files = (
219221
);

‎demo_app/ios/Runner/Info.plist‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,7 @@
4545
<false/>
4646
<key>CADisableMinimumFrameDurationOnPhone</key>
4747
<true/>
48+
<key>UIApplicationSupportsIndirectInputEvents</key>
49+
<true/>
4850
</dict>
4951
</plist>

‎demo_app/lib/screens/golden.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class Golden extends StatelessWidget {
3434
if (withEnhanced)
3535
Text(
3636
'flutter_widget_from_html_core:\n',
37-
style: Theme.of(context).textTheme.caption,
37+
style: Theme.of(context).textTheme.bodySmall,
3838
),
3939
LimitedBox(
4040
maxHeight: 400,
@@ -50,7 +50,7 @@ class Golden extends StatelessWidget {
5050
const Divider(),
5151
Text(
5252
'flutter_widget_from_html:\n',
53-
style: Theme.of(context).textTheme.caption,
53+
style: Theme.of(context).textTheme.bodySmall,
5454
),
5555
LimitedBox(
5656
maxHeight: 400,

‎demo_app/macos/Flutter/GeneratedPluginRegistrant.swift‎

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

88
import audio_session
99
import just_audio
10-
import path_provider_macos
10+
import path_provider_foundation
1111
import sqflite
1212
import url_launcher_macos
1313
import wakelock_macos

‎demo_app/macos/Podfile.lock‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ PODS:
77
- FMDB/standard (2.7.5)
88
- just_audio (0.0.1):
99
- FlutterMacOS
10-
- path_provider_macos (0.0.1):
10+
- path_provider_foundation (0.0.1):
11+
- Flutter
1112
- FlutterMacOS
1213
- sqflite (0.0.2):
1314
- FlutterMacOS
@@ -21,7 +22,7 @@ DEPENDENCIES:
2122
- audio_session (from `Flutter/ephemeral/.symlinks/plugins/audio_session/macos`)
2223
- FlutterMacOS (from `Flutter/ephemeral`)
2324
- just_audio (from `Flutter/ephemeral/.symlinks/plugins/just_audio/macos`)
24-
- path_provider_macos (from `Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos`)
25+
- path_provider_foundation (from `Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/macos`)
2526
- sqflite (from `Flutter/ephemeral/.symlinks/plugins/sqflite/macos`)
2627
- url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`)
2728
- wakelock_macos (from `Flutter/ephemeral/.symlinks/plugins/wakelock_macos/macos`)
@@ -37,8 +38,8 @@ EXTERNAL SOURCES:
3738
:path: Flutter/ephemeral
3839
just_audio:
3940
:path: Flutter/ephemeral/.symlinks/plugins/just_audio/macos
40-
path_provider_macos:
41-
:path: Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos
41+
path_provider_foundation:
42+
:path: Flutter/ephemeral/.symlinks/plugins/path_provider_foundation/macos
4243
sqflite:
4344
:path: Flutter/ephemeral/.symlinks/plugins/sqflite/macos
4445
url_launcher_macos:
@@ -48,12 +49,12 @@ EXTERNAL SOURCES:
4849

4950
SPEC CHECKSUMS:
5051
audio_session: dea1f41890dbf1718f04a56f1d6150fd50039b72
51-
FlutterMacOS: ae6af50a8ea7d6103d888583d46bd8328a7e9811
52+
FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
5253
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
5354
just_audio: 9b67ca7b97c61cfc9784ea23cd8cc55eb226d489
54-
path_provider_macos: 3c0c3b4b0d4a76d2bf989a913c2de869c5641a19
55+
path_provider_foundation: 37748e03f12783f9de2cb2c4eadfaa25fe6d4852
5556
sqflite: a5789cceda41d54d23f31d6de539d65bb14100ea
56-
url_launcher_macos: 597e05b8e514239626bcf4a850fcf9ef5c856ec3
57+
url_launcher_macos: c04e4fa86382d4f94f6b38f14625708be3ae52e2
5758
wakelock_macos: bc3f2a9bd8d2e6c89fee1e1822e7ddac3bd004a9
5859

5960
PODFILE CHECKSUM: 290b89638b803a41d96e2a2c02a9e1e635956f78

‎demo_app/macos/Runner.xcodeproj/project.pbxproj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 51;
6+
objectVersion = 54;
77
objects = {
88

99
/* Begin PBXAggregateTarget section */
@@ -278,6 +278,7 @@
278278
};
279279
3399D490228B24CF009A79C7 /* ShellScript */ = {
280280
isa = PBXShellScriptBuildPhase;
281+
alwaysOutOfDate = 1;
281282
buildActionMask = 2147483647;
282283
files = (
283284
);
@@ -404,7 +405,7 @@
404405
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
405406
GCC_WARN_UNUSED_FUNCTION = YES;
406407
GCC_WARN_UNUSED_VARIABLE = YES;
407-
MACOSX_DEPLOYMENT_TARGET = 10.11;
408+
MACOSX_DEPLOYMENT_TARGET = 10.14;
408409
MTL_ENABLE_DEBUG_INFO = NO;
409410
SDKROOT = macosx;
410411
SWIFT_COMPILATION_MODE = wholemodule;
@@ -483,7 +484,7 @@
483484
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
484485
GCC_WARN_UNUSED_FUNCTION = YES;
485486
GCC_WARN_UNUSED_VARIABLE = YES;
486-
MACOSX_DEPLOYMENT_TARGET = 10.11;
487+
MACOSX_DEPLOYMENT_TARGET = 10.14;
487488
MTL_ENABLE_DEBUG_INFO = YES;
488489
ONLY_ACTIVE_ARCH = YES;
489490
SDKROOT = macosx;
@@ -530,7 +531,7 @@
530531
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
531532
GCC_WARN_UNUSED_FUNCTION = YES;
532533
GCC_WARN_UNUSED_VARIABLE = YES;
533-
MACOSX_DEPLOYMENT_TARGET = 10.11;
534+
MACOSX_DEPLOYMENT_TARGET = 10.14;
534535
MTL_ENABLE_DEBUG_INFO = NO;
535536
SDKROOT = macosx;
536537
SWIFT_COMPILATION_MODE = wholemodule;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1000"
3+
LastUpgradeVersion = "1300"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

0 commit comments

Comments
 (0)