Skip to content

Commit 9361cbb

Browse files
csongorkellercsongorkeller
committed
null-safety upgrade and support for flutter 3.x
1 parent 84c32bc commit 9361cbb

36 files changed

+487
-591
lines changed

‎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>8.0</string>
24+
<string>11.0</string>
2525
</dict>
2626
</plist>

‎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, '9.0'
2+
# platform :ios, '11.0'
33

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

‎example/ios/Podfile.lock‎

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,16 @@
11
PODS:
22
- Flutter (1.0.0)
3-
- FMDB (2.7.5):
4-
- FMDB/standard (= 2.7.5)
5-
- FMDB/standard (2.7.5)
6-
- path_provider (0.0.1):
7-
- Flutter
8-
- sqflite (0.0.2):
9-
- Flutter
10-
- FMDB (>= 2.7.5)
113

124
DEPENDENCIES:
135
- Flutter (from `Flutter`)
14-
- path_provider (from `.symlinks/plugins/path_provider/ios`)
15-
- sqflite (from `.symlinks/plugins/sqflite/ios`)
16-
17-
SPEC REPOS:
18-
trunk:
19-
- FMDB
206

217
EXTERNAL SOURCES:
228
Flutter:
239
:path: Flutter
24-
path_provider:
25-
:path: ".symlinks/plugins/path_provider/ios"
26-
sqflite:
27-
:path: ".symlinks/plugins/sqflite/ios"
2810

2911
SPEC CHECKSUMS:
30-
Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
31-
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
32-
path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c
33-
sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
12+
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
3413

35-
PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
14+
PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3
3615

3716
COCOAPODS: 1.10.1

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

Lines changed: 8 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 51;
6+
objectVersion = 50;
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
02368CBE223CDF6834B2E226 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 31C1A4D963B31F091CAFED43 /* Pods_Runner.framework */; };
1110
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
1211
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
1312
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
@@ -54,7 +53,6 @@
5453
isa = PBXFrameworksBuildPhase;
5554
buildActionMask = 2147483647;
5655
files = (
57-
02368CBE223CDF6834B2E226 /* Pods_Runner.framework in Frameworks */,
5856
);
5957
runOnlyForDeploymentPostprocessing = 0;
6058
};
@@ -138,7 +136,6 @@
138136
97C146EC1CF9000F007C117D /* Resources */,
139137
9705A1C41CF9048500538489 /* Embed Frameworks */,
140138
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
141-
27B78875DA8193CA5669B1C8 /* [CP] Embed Pods Frameworks */,
142139
);
143140
buildRules = (
144141
);
@@ -155,7 +152,7 @@
155152
97C146E61CF9000F007C117D /* Project object */ = {
156153
isa = PBXProject;
157154
attributes = {
158-
LastUpgradeCheck = 1020;
155+
LastUpgradeCheck = 1300;
159156
ORGANIZATIONNAME = "";
160157
TargetAttributes = {
161158
97C146ED1CF9000F007C117D = {
@@ -219,23 +216,6 @@
219216
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";
220217
showEnvVarsInLog = 0;
221218
};
222-
27B78875DA8193CA5669B1C8 /* [CP] Embed Pods Frameworks */ = {
223-
isa = PBXShellScriptBuildPhase;
224-
buildActionMask = 2147483647;
225-
files = (
226-
);
227-
inputFileListPaths = (
228-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
229-
);
230-
name = "[CP] Embed Pods Frameworks";
231-
outputFileListPaths = (
232-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
233-
);
234-
runOnlyForDeploymentPostprocessing = 0;
235-
shellPath = /bin/sh;
236-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
237-
showEnvVarsInLog = 0;
238-
};
239219
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
240220
isa = PBXShellScriptBuildPhase;
241221
buildActionMask = 2147483647;
@@ -339,7 +319,7 @@
339319
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
340320
GCC_WARN_UNUSED_FUNCTION = YES;
341321
GCC_WARN_UNUSED_VARIABLE = YES;
342-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
322+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
343323
MTL_ENABLE_DEBUG_INFO = NO;
344324
SDKROOT = iphoneos;
345325
SUPPORTED_PLATFORMS = iphoneos;
@@ -355,7 +335,7 @@
355335
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
356336
CLANG_ENABLE_MODULES = YES;
357337
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
358-
DEVELOPMENT_TEAM = NY2M76PS2V;
338+
DEVELOPMENT_TEAM = "";
359339
ENABLE_BITCODE = NO;
360340
INFOPLIST_FILE = Runner/Info.plist;
361341
LD_RUNPATH_SEARCH_PATHS = (
@@ -417,7 +397,7 @@
417397
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
418398
GCC_WARN_UNUSED_FUNCTION = YES;
419399
GCC_WARN_UNUSED_VARIABLE = YES;
420-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
400+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
421401
MTL_ENABLE_DEBUG_INFO = YES;
422402
ONLY_ACTIVE_ARCH = YES;
423403
SDKROOT = iphoneos;
@@ -466,7 +446,7 @@
466446
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
467447
GCC_WARN_UNUSED_FUNCTION = YES;
468448
GCC_WARN_UNUSED_VARIABLE = YES;
469-
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
449+
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
470450
MTL_ENABLE_DEBUG_INFO = NO;
471451
SDKROOT = iphoneos;
472452
SUPPORTED_PLATFORMS = iphoneos;
@@ -484,7 +464,7 @@
484464
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
485465
CLANG_ENABLE_MODULES = YES;
486466
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
487-
DEVELOPMENT_TEAM = NY2M76PS2V;
467+
DEVELOPMENT_TEAM = "";
488468
ENABLE_BITCODE = NO;
489469
INFOPLIST_FILE = Runner/Info.plist;
490470
LD_RUNPATH_SEARCH_PATHS = (
@@ -507,7 +487,7 @@
507487
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
508488
CLANG_ENABLE_MODULES = YES;
509489
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
510-
DEVELOPMENT_TEAM = NY2M76PS2V;
490+
DEVELOPMENT_TEAM = "";
511491
ENABLE_BITCODE = NO;
512492
INFOPLIST_FILE = Runner/Info.plist;
513493
LD_RUNPATH_SEARCH_PATHS = (

‎example/ios/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 = "1020"
3+
LastUpgradeVersion = "1300"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎example/ios/Runner/Info.plist‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,7 @@
4141
</array>
4242
<key>UIViewControllerBasedStatusBarAppearance</key>
4343
<false/>
44+
<key>CADisableMinimumFrameDurationOnPhone</key>
45+
<true/>
4446
</dict>
4547
</plist>

‎example/lib/main.dart‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,20 @@ import 'package:example/screens/prebuilt_widgets_demo_screen.dart';
22
import 'package:flutter/material.dart';
33

44
void main() {
5-
runApp(MyApp());
5+
runApp(const MyApp());
66
}
77

88
class MyApp extends StatelessWidget {
9+
const MyApp({super.key});
10+
911
@override
1012
Widget build(BuildContext context) {
1113
return MaterialApp(
1214
title: 'Flutter Demo',
1315
theme: ThemeData(
1416
primarySwatch: Colors.blue,
1517
),
16-
home: PrebuiltWidgetsScreen(),
18+
home: const PrebuiltWidgetsScreen(),
1719
);
1820
}
1921
}

‎example/lib/modules/location_view_widget.dart‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,29 @@ import 'package:flutter/material.dart';
22
import 'package:intl/intl.dart';
33

44
class LocationViewWidget extends StatelessWidget {
5-
LocationViewWidget({
6-
this.title,
7-
this.color,
5+
const LocationViewWidget({
6+
super.key,
7+
required this.title,
8+
required this.color,
89
});
910

1011
final Color color;
1112
final String title;
1213

1314
@override
1415
Widget build(BuildContext context) {
15-
final DateTime _now = DateTime.now();
16-
final String _currentDate = DateFormat('yyyy/MM/dd – kk:mm').format(_now);
17-
return Container(
18-
child: Column(
19-
children: [
20-
Text('${title.toUpperCase()}' ?? '',
21-
style: TextStyle(
22-
fontSize: 40,
23-
fontWeight: FontWeight.w300,
24-
color: color,
25-
)),
26-
Text(_currentDate.toString() ?? '')
27-
],
28-
),
16+
final DateTime now = DateTime.now();
17+
final String currentDate = DateFormat('yyyy/MM/dd – kk:mm').format(now);
18+
return Column(
19+
children: [
20+
Text(title.toUpperCase(),
21+
style: TextStyle(
22+
fontSize: 40,
23+
fontWeight: FontWeight.w300,
24+
color: color,
25+
)),
26+
Text(currentDate.toString())
27+
],
2928
);
3029
}
3130
}

0 commit comments

Comments
 (0)