Skip to content

Commit 7ebd635

Browse files
[various] Update min iOS/macOS versions (#10231)
For all packages that have not already done so: - Ensure that the minimum iOS version is 13. - Ensure that the minimum macOS version is 10.15. - Ensure that the minimum Flutter SDK version in 3.35 for anything with changes from the above. In #9849 I did the iOS plugins that had conditional logic for iOS <13, but I forgot to follow up with updating the minimum for the plugins that didn't have conditional logic. Because this changes min Dart SDKs, it causes autoformat changes. There are no actual code changes in this PR; all Dart file changes are purely the result of re-running `dart format`. This does bump the versions, even though repo policy would allow skipping version bumps for only changing min requirements, just to avoid conflating all the changes here with future releases. Part of flutter/flutter#167735 Part of flutter/flutter#167745 ## Pre-Review Checklist [^1]: Regular contributors who have demonstrated familiarity with the repository guidelines only need to comment if the PR is not auto-exempted by repo tooling.
1 parent 1c67631 commit 7ebd635

File tree

143 files changed

+633
-576
lines changed

Some content is hidden

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

143 files changed

+633
-576
lines changed

packages/file_selector/file_selector_ios/CHANGELOG.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
## NEXT
1+
## 0.5.3+3
22

3-
* Updates minimum supported SDK version to Flutter 3.29/Dart 3.7.
3+
* Updates minimum supported version to iOS 13.
4+
* Updates minimum supported SDK version to Flutter 3.35/Dart 3.9.
45

56
## 0.5.3+2
67

packages/file_selector/file_selector_ios/example/ios/Flutter/AppFrameworkInfo.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>12.0</string>
24+
<string>13.0</string>
2525
</dict>
2626
</plist>

packages/file_selector/file_selector_ios/example/ios/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Uncomment this line to define a global platform for your project
2-
# platform :ios, '12.0'
2+
# platform :ios, '13.0'
33

44
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
55
ENV['COCOAPODS_DISABLE_STATS'] = 'true'

packages/file_selector/file_selector_ios/example/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@
442442
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
443443
GCC_WARN_UNUSED_FUNCTION = YES;
444444
GCC_WARN_UNUSED_VARIABLE = YES;
445-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
445+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
446446
MTL_ENABLE_DEBUG_INFO = NO;
447447
SDKROOT = iphoneos;
448448
SUPPORTED_PLATFORMS = iphoneos;
@@ -519,7 +519,7 @@
519519
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
520520
GCC_WARN_UNUSED_FUNCTION = YES;
521521
GCC_WARN_UNUSED_VARIABLE = YES;
522-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
522+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
523523
MTL_ENABLE_DEBUG_INFO = YES;
524524
ONLY_ACTIVE_ARCH = YES;
525525
SDKROOT = iphoneos;
@@ -568,7 +568,7 @@
568568
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
569569
GCC_WARN_UNUSED_FUNCTION = YES;
570570
GCC_WARN_UNUSED_VARIABLE = YES;
571-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
571+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
572572
MTL_ENABLE_DEBUG_INFO = NO;
573573
SDKROOT = iphoneos;
574574
SUPPORTED_PLATFORMS = iphoneos;

packages/file_selector/file_selector_ios/example/lib/main.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ class MyApp extends StatelessWidget {
3030
home: const HomePage(),
3131
routes: <String, WidgetBuilder>{
3232
'/open/image': (BuildContext context) => const OpenImagePage(),
33-
'/open/images':
34-
(BuildContext context) => const OpenMultipleImagesPage(),
33+
'/open/images': (BuildContext context) =>
34+
const OpenMultipleImagesPage(),
3535
'/open/text': (BuildContext context) => const OpenTextPage(),
3636
'/open/any': (BuildContext context) => const OpenAnyPage(),
3737
},

packages/file_selector/file_selector_ios/example/lib/open_multiple_images_page.dart

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,9 @@ class MultipleImagesDisplay extends StatelessWidget {
8282
children: <Widget>[
8383
...files.map(
8484
(XFile file) => Flexible(
85-
child:
86-
kIsWeb
87-
? Image.network(file.path)
88-
: Image.file(File(file.path)),
85+
child: kIsWeb
86+
? Image.network(file.path)
87+
: Image.file(File(file.path)),
8988
),
9089
),
9190
],

packages/file_selector/file_selector_ios/example/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ publish_to: 'none'
44
version: 1.0.0
55

66
environment:
7-
sdk: ^3.7.0
8-
flutter: ">=3.29.0"
7+
sdk: ^3.9.0
8+
flutter: ">=3.35.0"
99

1010
dependencies:
1111
# The following adds the Cupertino Icons font to your application.

packages/file_selector/file_selector_ios/ios/file_selector_ios.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Displays the native iOS document picker.
1515
s.source = { :http => 'https://github.com/flutter/packages/tree/main/packages/file_selector/file_selector_ios' }
1616
s.source_files = 'file_selector_ios/Sources/file_selector_ios/**/*.swift'
1717
s.dependency 'Flutter'
18-
s.platform = :ios, '12.0'
18+
s.platform = :ios, '13.0'
1919
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
2020
s.swift_version = '5.0'
2121
s.xcconfig = {

packages/file_selector/file_selector_ios/ios/file_selector_ios/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import PackageDescription
1010
let package = Package(
1111
name: "file_selector_ios",
1212
platforms: [
13-
.iOS("12.0")
13+
.iOS("13.0")
1414
],
1515
products: [
1616
.library(name: "file-selector-ios", targets: ["file_selector_ios"])

packages/file_selector/file_selector_ios/lib/src/messages.g.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,9 @@ class FileSelectorApi {
127127
BinaryMessenger? binaryMessenger,
128128
String messageChannelSuffix = '',
129129
}) : pigeonVar_binaryMessenger = binaryMessenger,
130-
pigeonVar_messageChannelSuffix =
131-
messageChannelSuffix.isNotEmpty ? '.$messageChannelSuffix' : '';
130+
pigeonVar_messageChannelSuffix = messageChannelSuffix.isNotEmpty
131+
? '.$messageChannelSuffix'
132+
: '';
132133
final BinaryMessenger? pigeonVar_binaryMessenger;
133134

134135
static const MessageCodec<Object?> pigeonChannelCodec = _PigeonCodec();

0 commit comments

Comments
 (0)