Skip to content

Commit 7c33aa2

Browse files
jmagmanKyleFin
jmagman
authored and
KyleFin
committed
[quick_actions] Bump minimum Flutter version and iOS deployment target (flutter#4356)
1 parent b46dbcd commit 7c33aa2

File tree

6 files changed

+67
-37
lines changed

6 files changed

+67
-37
lines changed

‎packages/quick_actions/quick_actions/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.6.0+7
2+
3+
* Update minimum Flutter SDK to 2.5 and iOS deployment target to 9.0.
4+
15
## 0.6.0+6
26

37
* Updated Android lint settings.

‎packages/quick_actions/quick_actions/example/ios/Flutter/AppFrameworkInfo.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@
2525
<string>arm64</string>
2626
</array>
2727
<key>MinimumOSVersion</key>
28-
<string>8.0</string>
28+
<string>9.0</string>
2929
</dict>
3030
</plist>

‎packages/quick_actions/quick_actions/example/ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
1111
33E20B3526EFCDFC00A4A191 /* RunnerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 33E20B3426EFCDFC00A4A191 /* RunnerTests.m */; };
1212
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
13+
50EB54C1FE43DB743F5DEC7C /* libPods-RunnerTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D1A69703A518C37D73BF8B91 /* libPods-RunnerTests.a */; };
1314
686BE83025E58CCF00862533 /* RunnerUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = 686BE82F25E58CCF00862533 /* RunnerUITests.m */; };
1415
83C36CAF23D629E5ABE75B2A /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CCC799F2B0AB50A9C34344F0 /* libPods-Runner.a */; };
1516
978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; };
@@ -63,6 +64,7 @@
6364
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
6465
7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
6566
7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
67+
96F949A6B78E2DC62B93C4F8 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
6668
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
6769
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
6870
97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -71,7 +73,9 @@
7173
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
7274
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
7375
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
76+
9D27FE1F0F21D4D47DDA16DE /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
7477
CCC799F2B0AB50A9C34344F0 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; };
78+
D1A69703A518C37D73BF8B91 /* libPods-RunnerTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RunnerTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
7579
F0609304FBCAEC2289164BD5 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
7680
/* End PBXFileReference section */
7781

@@ -80,6 +84,7 @@
8084
isa = PBXFrameworksBuildPhase;
8185
buildActionMask = 2147483647;
8286
files = (
87+
50EB54C1FE43DB743F5DEC7C /* libPods-RunnerTests.a in Frameworks */,
8388
);
8489
runOnlyForDeploymentPostprocessing = 0;
8590
};
@@ -181,6 +186,7 @@
181186
isa = PBXGroup;
182187
children = (
183188
CCC799F2B0AB50A9C34344F0 /* libPods-Runner.a */,
189+
D1A69703A518C37D73BF8B91 /* libPods-RunnerTests.a */,
184190
);
185191
name = Frameworks;
186192
sourceTree = "<group>";
@@ -190,6 +196,8 @@
190196
children = (
191197
5278439583922091276A37C9 /* Pods-Runner.debug.xcconfig */,
192198
F0609304FBCAEC2289164BD5 /* Pods-Runner.release.xcconfig */,
199+
9D27FE1F0F21D4D47DDA16DE /* Pods-RunnerTests.debug.xcconfig */,
200+
96F949A6B78E2DC62B93C4F8 /* Pods-RunnerTests.release.xcconfig */,
193201
);
194202
name = Pods;
195203
sourceTree = "<group>";
@@ -201,6 +209,7 @@
201209
isa = PBXNativeTarget;
202210
buildConfigurationList = 33E20B3B26EFCDFC00A4A191 /* Build configuration list for PBXNativeTarget "RunnerTests" */;
203211
buildPhases = (
212+
3B2E8279C112D7129C8D23F1 /* [CP] Check Pods Manifest.lock */,
204213
33E20B2E26EFCDFC00A4A191 /* Sources */,
205214
33E20B2F26EFCDFC00A4A191 /* Frameworks */,
206215
33E20B3026EFCDFC00A4A191 /* Resources */,
@@ -340,6 +349,28 @@
340349
shellPath = /bin/sh;
341350
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
342351
};
352+
3B2E8279C112D7129C8D23F1 /* [CP] Check Pods Manifest.lock */ = {
353+
isa = PBXShellScriptBuildPhase;
354+
buildActionMask = 2147483647;
355+
files = (
356+
);
357+
inputFileListPaths = (
358+
);
359+
inputPaths = (
360+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
361+
"${PODS_ROOT}/Manifest.lock",
362+
);
363+
name = "[CP] Check Pods Manifest.lock";
364+
outputFileListPaths = (
365+
);
366+
outputPaths = (
367+
"$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt",
368+
);
369+
runOnlyForDeploymentPostprocessing = 0;
370+
shellPath = /bin/sh;
371+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
372+
showEnvVarsInLog = 0;
373+
};
343374
9740EEB61CF901F6004384FC /* Run Script */ = {
344375
isa = PBXShellScriptBuildPhase;
345376
buildActionMask = 2147483647;
@@ -438,6 +469,7 @@
438469
/* Begin XCBuildConfiguration section */
439470
33E20B3926EFCDFC00A4A191 /* Debug */ = {
440471
isa = XCBuildConfiguration;
472+
baseConfigurationReference = 9D27FE1F0F21D4D47DDA16DE /* Pods-RunnerTests.debug.xcconfig */;
441473
buildSettings = {
442474
BUNDLE_LOADER = "$(TEST_HOST)";
443475
INFOPLIST_FILE = RunnerTests/Info.plist;
@@ -450,6 +482,7 @@
450482
};
451483
33E20B3A26EFCDFC00A4A191 /* Release */ = {
452484
isa = XCBuildConfiguration;
485+
baseConfigurationReference = 96F949A6B78E2DC62B93C4F8 /* Pods-RunnerTests.release.xcconfig */;
453486
buildSettings = {
454487
BUNDLE_LOADER = "$(TEST_HOST)";
455488
INFOPLIST_FILE = RunnerTests/Info.plist;
@@ -553,7 +586,7 @@
553586
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
554587
GCC_WARN_UNUSED_FUNCTION = YES;
555588
GCC_WARN_UNUSED_VARIABLE = YES;
556-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
589+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
557590
MTL_ENABLE_DEBUG_INFO = YES;
558591
ONLY_ACTIVE_ARCH = YES;
559592
SDKROOT = iphoneos;
@@ -603,7 +636,7 @@
603636
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
604637
GCC_WARN_UNUSED_FUNCTION = YES;
605638
GCC_WARN_UNUSED_VARIABLE = YES;
606-
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
639+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
607640
MTL_ENABLE_DEBUG_INFO = NO;
608641
SDKROOT = iphoneos;
609642
TARGETED_DEVICE_FAMILY = "1,2";

‎packages/quick_actions/quick_actions/ios/Classes/FLTQuickActionsPlugin.m‎

Lines changed: 22 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,16 @@ + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
2424
}
2525

2626
- (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result {
27-
if (@available(iOS 9.0, *)) {
28-
if ([call.method isEqualToString:@"setShortcutItems"]) {
29-
_setShortcutItems(call.arguments);
30-
result(nil);
31-
} else if ([call.method isEqualToString:@"clearShortcutItems"]) {
32-
[UIApplication sharedApplication].shortcutItems = @[];
33-
result(nil);
34-
} else if ([call.method isEqualToString:@"getLaunchAction"]) {
35-
result(nil);
36-
} else {
37-
result(FlutterMethodNotImplemented);
38-
}
39-
} else {
40-
NSLog(@"Shortcuts are not supported prior to iOS 9.");
27+
if ([call.method isEqualToString:@"setShortcutItems"]) {
28+
_setShortcutItems(call.arguments);
29+
result(nil);
30+
} else if ([call.method isEqualToString:@"clearShortcutItems"]) {
31+
[UIApplication sharedApplication].shortcutItems = @[];
4132
result(nil);
33+
} else if ([call.method isEqualToString:@"getLaunchAction"]) {
34+
result(nil);
35+
} else {
36+
result(FlutterMethodNotImplemented);
4237
}
4338
}
4439

@@ -57,21 +52,19 @@ - (BOOL)application:(UIApplication *)application
5752

5853
- (BOOL)application:(UIApplication *)application
5954
didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
60-
if (@available(iOS 9.0, *)) {
61-
UIApplicationShortcutItem *shortcutItem =
62-
launchOptions[UIApplicationLaunchOptionsShortcutItemKey];
63-
if (shortcutItem) {
64-
// Keep hold of the shortcut type and handle it in the
65-
// `applicationDidBecomeActure:` method once the Dart MethodChannel
66-
// is initialized.
67-
self.shortcutType = shortcutItem.type;
68-
69-
// Return NO to indicate we handled the quick action to ensure
70-
// the `application:performActionFor:` method is not called (as
71-
// per Apple's documentation:
72-
// https://developer.apple.com/documentation/uikit/uiapplicationdelegate/1622935-application?language=objc).
73-
return NO;
74-
}
55+
UIApplicationShortcutItem *shortcutItem =
56+
launchOptions[UIApplicationLaunchOptionsShortcutItemKey];
57+
if (shortcutItem) {
58+
// Keep hold of the shortcut type and handle it in the
59+
// `applicationDidBecomeActure:` method once the Dart MethodChannel
60+
// is initialized.
61+
self.shortcutType = shortcutItem.type;
62+
63+
// Return NO to indicate we handled the quick action to ensure
64+
// the `application:performActionFor:` method is not called (as
65+
// per Apple's documentation:
66+
// https://developer.apple.com/documentation/uikit/uiapplicationdelegate/1622935-application?language=objc).
67+
return NO;
7568
}
7669
return YES;
7770
}

‎packages/quick_actions/quick_actions/ios/quick_actions.podspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ Downloaded by pub (not CocoaPods).
1717
s.source_files = 'Classes/**/*'
1818
s.public_header_files = 'Classes/**/*.h'
1919
s.dependency 'Flutter'
20-
s.platform = :ios, '8.0'
21-
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'VALID_ARCHS[sdk=iphonesimulator*]' => 'x86_64' }
20+
s.platform = :ios, '9.0'
21+
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
2222
end

‎packages/quick_actions/quick_actions/pubspec.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ description: Flutter plugin for creating shortcuts on home screen, also known as
33
Quick Actions on iOS and App Shortcuts on Android.
44
repository: https://github.com/flutter/plugins/tree/master/packages/quick_actions/quick_actions
55
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+quick_actions%22
6-
version: 0.6.0+6
6+
version: 0.6.0+7
77

88
environment:
9-
sdk: ">=2.12.0 <3.0.0"
10-
flutter: ">=2.0.0"
9+
sdk: ">=2.14.0 <3.0.0"
10+
flutter: ">=2.5.0"
1111

1212
flutter:
1313
plugin:

0 commit comments

Comments
 (0)