Skip to content

Commit 79b1977

Browse files
hoc081098hoc081098
authored
Stable null safety (#6)
* stable null safety * up * fix ios example * fix lint * README.md * CHANGELOG.md
1 parent b70c8e4 commit 79b1977

File tree

21 files changed

+159
-86
lines changed

21 files changed

+159
-86
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 2.0.0 - Apr 01, 2021
2+
3+
* Stable release for null safety.
4+
15
## 2.0.0-nullsafety.0 - Feb 28, 2021
26

37
* **Breaking**

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ import 'package:sqlbrite/sqlbrite.dart';
4444
```dart
4545
final Database db = await openDb();
4646
final briteDb = BriteDatabase(db);
47+
final briteDb = BriteDatabase(db, logger: null); // disable logging.
4748
```
4849

4950
### 2. Using

‎analysis_options.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include: package:pedantic/analysis_options.1.9.0.yaml
1+
include: package:pedantic/analysis_options.1.11.0.yaml
22
analyzer:
33
strong-mode:
44
implicit-casts: false

‎example/analysis_options.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include: package:pedantic/analysis_options.1.9.0.yaml
1+
include: package:pedantic/analysis_options.1.11.0.yaml
22
linter:
33
rules:
44
- prefer_final_locals

‎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, '10.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: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
PODS:
2+
- 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)
11+
12+
DEPENDENCIES:
13+
- 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
20+
21+
EXTERNAL SOURCES:
22+
Flutter:
23+
:path: Flutter
24+
path_provider:
25+
:path: ".symlinks/plugins/path_provider/ios"
26+
sqflite:
27+
:path: ".symlinks/plugins/sqflite/ios"
28+
29+
SPEC CHECKSUMS:
30+
Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
31+
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
32+
path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c
33+
sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
34+
35+
PODFILE CHECKSUM: fe0e1ee7f3d1f7d00b11b474b62dd62134535aea
36+
37+
COCOAPODS: 1.10.1

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

Lines changed: 74 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,11 @@
99
/* Begin PBXBuildFile section */
1010
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
1111
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
12-
3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
13-
3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1412
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
15-
9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; };
16-
9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1713
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
1814
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
1915
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
16+
E455A3183E30569DB332CB82 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5608425C1B1F6C73B9AF27E9 /* Pods_Runner.framework */; };
2017
/* End PBXBuildFile section */
2118

2219
/* Begin PBXCopyFilesBuildPhase section */
@@ -26,8 +23,6 @@
2623
dstPath = "";
2724
dstSubfolderSpec = 10;
2825
files = (
29-
3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */,
30-
9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */,
3126
);
3227
name = "Embed Frameworks";
3328
runOnlyForDeploymentPostprocessing = 0;
@@ -38,13 +33,15 @@
3833
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
3934
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
4035
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
41-
3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
36+
5608425C1B1F6C73B9AF27E9 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
37+
6B1EBE01177D4E26837F5134 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
4238
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
4339
74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
4440
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
41+
7C4D39C21F099DA7710601C2 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
42+
9692AF2B1693814E3F49C852 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
4543
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
4644
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
47-
9740EEBA1CF902C7004384FC /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = Flutter/Flutter.framework; sourceTree = "<group>"; };
4845
97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
4946
97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
5047
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -57,20 +54,28 @@
5754
isa = PBXFrameworksBuildPhase;
5855
buildActionMask = 2147483647;
5956
files = (
60-
9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */,
61-
3B80C3941E831B6300D905FE /* App.framework in Frameworks */,
57+
E455A3183E30569DB332CB82 /* Pods_Runner.framework in Frameworks */,
6258
);
6359
runOnlyForDeploymentPostprocessing = 0;
6460
};
6561
/* End PBXFrameworksBuildPhase section */
6662

6763
/* Begin PBXGroup section */
64+
879C032DFA5C15948E11E829 /* Pods */ = {
65+
isa = PBXGroup;
66+
children = (
67+
6B1EBE01177D4E26837F5134 /* Pods-Runner.debug.xcconfig */,
68+
9692AF2B1693814E3F49C852 /* Pods-Runner.release.xcconfig */,
69+
7C4D39C21F099DA7710601C2 /* Pods-Runner.profile.xcconfig */,
70+
);
71+
name = Pods;
72+
path = Pods;
73+
sourceTree = "<group>";
74+
};
6875
9740EEB11CF90186004384FC /* Flutter */ = {
6976
isa = PBXGroup;
7077
children = (
71-
3B80C3931E831B6300D905FE /* App.framework */,
7278
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
73-
9740EEBA1CF902C7004384FC /* Flutter.framework */,
7479
9740EEB21CF90195004384FC /* Debug.xcconfig */,
7580
7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
7681
9740EEB31CF90195004384FC /* Generated.xcconfig */,
@@ -84,6 +89,8 @@
8489
9740EEB11CF90186004384FC /* Flutter */,
8590
97C146F01CF9000F007C117D /* Runner */,
8691
97C146EF1CF9000F007C117D /* Products */,
92+
879C032DFA5C15948E11E829 /* Pods */,
93+
F92F21D3B5C556454AC885D8 /* Frameworks */,
8794
);
8895
sourceTree = "<group>";
8996
};
@@ -118,19 +125,29 @@
118125
name = "Supporting Files";
119126
sourceTree = "<group>";
120127
};
128+
F92F21D3B5C556454AC885D8 /* Frameworks */ = {
129+
isa = PBXGroup;
130+
children = (
131+
5608425C1B1F6C73B9AF27E9 /* Pods_Runner.framework */,
132+
);
133+
name = Frameworks;
134+
sourceTree = "<group>";
135+
};
121136
/* End PBXGroup section */
122137

123138
/* Begin PBXNativeTarget section */
124139
97C146ED1CF9000F007C117D /* Runner */ = {
125140
isa = PBXNativeTarget;
126141
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
127142
buildPhases = (
143+
BB503EEBEB195677D7ABA4A5 /* [CP] Check Pods Manifest.lock */,
128144
9740EEB61CF901F6004384FC /* Run Script */,
129145
97C146EA1CF9000F007C117D /* Sources */,
130146
97C146EB1CF9000F007C117D /* Frameworks */,
131147
97C146EC1CF9000F007C117D /* Resources */,
132148
9705A1C41CF9048500538489 /* Embed Frameworks */,
133149
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
150+
F2DA78CBB7CCF663B0DA8A04 /* [CP] Embed Pods Frameworks */,
134151
);
135152
buildRules = (
136153
);
@@ -201,7 +218,7 @@
201218
);
202219
runOnlyForDeploymentPostprocessing = 0;
203220
shellPath = /bin/sh;
204-
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin";
221+
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
205222
};
206223
9740EEB61CF901F6004384FC /* Run Script */ = {
207224
isa = PBXShellScriptBuildPhase;
@@ -217,6 +234,50 @@
217234
shellPath = /bin/sh;
218235
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
219236
};
237+
BB503EEBEB195677D7ABA4A5 /* [CP] Check Pods Manifest.lock */ = {
238+
isa = PBXShellScriptBuildPhase;
239+
buildActionMask = 2147483647;
240+
files = (
241+
);
242+
inputFileListPaths = (
243+
);
244+
inputPaths = (
245+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
246+
"${PODS_ROOT}/Manifest.lock",
247+
);
248+
name = "[CP] Check Pods Manifest.lock";
249+
outputFileListPaths = (
250+
);
251+
outputPaths = (
252+
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
253+
);
254+
runOnlyForDeploymentPostprocessing = 0;
255+
shellPath = /bin/sh;
256+
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";
257+
showEnvVarsInLog = 0;
258+
};
259+
F2DA78CBB7CCF663B0DA8A04 /* [CP] Embed Pods Frameworks */ = {
260+
isa = PBXShellScriptBuildPhase;
261+
buildActionMask = 2147483647;
262+
files = (
263+
);
264+
inputPaths = (
265+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
266+
"${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework",
267+
"${BUILT_PRODUCTS_DIR}/path_provider/path_provider.framework",
268+
"${BUILT_PRODUCTS_DIR}/sqflite/sqflite.framework",
269+
);
270+
name = "[CP] Embed Pods Frameworks";
271+
outputPaths = (
272+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FMDB.framework",
273+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider.framework",
274+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqflite.framework",
275+
);
276+
runOnlyForDeploymentPostprocessing = 0;
277+
shellPath = /bin/sh;
278+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
279+
showEnvVarsInLog = 0;
280+
};
220281
/* End PBXShellScriptBuildPhase section */
221282

222283
/* Begin PBXSourcesBuildPhase section */
@@ -253,7 +314,6 @@
253314
/* Begin XCBuildConfiguration section */
254315
249021D3217E4FDB00AE95B9 /* Profile */ = {
255316
isa = XCBuildConfiguration;
256-
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
257317
buildSettings = {
258318
ALWAYS_SEARCH_USER_PATHS = NO;
259319
CLANG_ANALYZER_NONNULL = YES;
@@ -330,7 +390,6 @@
330390
};
331391
97C147031CF9000F007C117D /* Debug */ = {
332392
isa = XCBuildConfiguration;
333-
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
334393
buildSettings = {
335394
ALWAYS_SEARCH_USER_PATHS = NO;
336395
CLANG_ANALYZER_NONNULL = YES;
@@ -386,7 +445,6 @@
386445
};
387446
97C147041CF9000F007C117D /* Release */ = {
388447
isa = XCBuildConfiguration;
389-
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
390448
buildSettings = {
391449
ALWAYS_SEARCH_USER_PATHS = NO;
392450
CLANG_ANALYZER_NONNULL = YES;

‎example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎example/ios/Runner.xcworkspace/contents.xcworkspacedata‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎example/lib/data/app_db.dart‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import 'package:example/data/item.dart';
22
import 'package:flutter/foundation.dart';
33
import 'package:path/path.dart';
44
import 'package:path_provider/path_provider.dart';
5-
import 'package:sqflite/sqflite.dart';
65
import 'package:sqlbrite/sqlbrite.dart';
76

87
import 'faker.dart';

0 commit comments

Comments
 (0)