Skip to content

This upgrades to null safety and Flutter 2.0 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jonmountjoy wants to merge 8 commits into
base: master
Choose a base branch
from
Open

This upgrades to null safety and Flutter 2.0 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f77b254
Deps for Flutter 2.0
jonmountjoy Mar 10, 2021
3ab16ea
Upgrades for null safety
jonmountjoy Apr 5, 2021
af6b5c0
version bump
jonmountjoy Jul 8, 2021
61a4fe5
version bump
jonmountjoy Jul 30, 2021
8199dfb
Udpate deps
jonmountjoy Aug 21, 2021
1502d16
bump for flutter 3
jonmountjoy May 16, 2022
6570f30
bump deps
jonmountjoy Oct 27, 2022
1031d19
bumpdeps
jonmountjoy Dec 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .flutter-plugins-dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"firebase_core","path":"/Users/vaibhavbhasin/.pub-cache/hosted/pub.dartlang.org/firebase_core-0.5.2/","dependencies":[]},{"name":"firebase_storage","path":"/Users/vaibhavbhasin/.pub-cache/hosted/pub.dartlang.org/firebase_storage-5.0.1/","dependencies":["firebase_core"]},{"name":"path_provider","path":"/Users/vaibhavbhasin/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.24/","dependencies":[]}],"android":[{"name":"firebase_core","path":"/Users/vaibhavbhasin/.pub-cache/hosted/pub.dartlang.org/firebase_core-0.5.2/","dependencies":[]},{"name":"firebase_storage","path":"/Users/vaibhavbhasin/.pub-cache/hosted/pub.dartlang.org/firebase_storage-5.0.1/","dependencies":["firebase_core"]},{"name":"path_provider","path":"/Users/vaibhavbhasin/.pub-cache/hosted/pub.dartlang.org/path_provider-1.6.24/","dependencies":[]}],"macos":[{"name":"firebase_core","path":"/Users/vaibhavbhasin/.pub-cache/hosted/pub.dartlang.org/firebase_core-0.5.2/","dependencies":[]},{"name":"firebase_storage","path":"/Users/vaibhavbhasin/.pub-cache/hosted/pub.dartlang.org/firebase_storage-5.0.1/","dependencies":["firebase_core"]},{"name":"path_provider_macos","path":"/Users/vaibhavbhasin/.pub-cache/hosted/pub.dartlang.org/path_provider_macos-0.0.4+6/","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"/Users/vaibhavbhasin/.pub-cache/hosted/pub.dartlang.org/path_provider_linux-0.0.1+2/","dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"/Users/vaibhavbhasin/.pub-cache/hosted/pub.dartlang.org/path_provider_windows-0.0.4+3/","dependencies":[]}],"web":[{"name":"firebase_core_web","path":"/Users/vaibhavbhasin/.pub-cache/hosted/pub.dartlang.org/firebase_core_web-0.2.1/","dependencies":[]}]},"dependencyGraph":[{"name":"firebase_core","dependencies":["firebase_core_web"]},{"name":"firebase_core_web","dependencies":[]},{"name":"firebase_storage","dependencies":["firebase_core"]},{"name":"path_provider","dependencies":["path_provider_macos","path_provider_linux","path_provider_windows"]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]},{"name":"path_provider_windows","dependencies":[]}],"date_created":"2020-11-12 13:40:10.347145","version":"1.20.3"}
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"firebase_core","path":"/Users/jonmountjoy/.pub-cache/hosted/pub.dartlang.org/firebase_core-2.1.0/","native_build":true,"dependencies":[]},{"name":"firebase_storage","path":"/Users/jonmountjoy/.pub-cache/hosted/pub.dartlang.org/firebase_storage-11.0.2/","native_build":true,"dependencies":["firebase_core"]},{"name":"path_provider_ios","path":"/Users/jonmountjoy/.pub-cache/hosted/pub.dartlang.org/path_provider_ios-2.0.9/","native_build":true,"dependencies":[]}],"android":[{"name":"firebase_core","path":"/Users/jonmountjoy/.pub-cache/hosted/pub.dartlang.org/firebase_core-2.1.0/","native_build":true,"dependencies":[]},{"name":"firebase_storage","path":"/Users/jonmountjoy/.pub-cache/hosted/pub.dartlang.org/firebase_storage-11.0.2/","native_build":true,"dependencies":["firebase_core"]},{"name":"path_provider_android","path":"/Users/jonmountjoy/.pub-cache/hosted/pub.dartlang.org/path_provider_android-2.0.14/","native_build":true,"dependencies":[]}],"macos":[{"name":"firebase_core","path":"/Users/jonmountjoy/.pub-cache/hosted/pub.dartlang.org/firebase_core-2.1.0/","native_build":true,"dependencies":[]},{"name":"firebase_storage","path":"/Users/jonmountjoy/.pub-cache/hosted/pub.dartlang.org/firebase_storage-11.0.2/","native_build":true,"dependencies":["firebase_core"]},{"name":"path_provider_macos","path":"/Users/jonmountjoy/.pub-cache/hosted/pub.dartlang.org/path_provider_macos-2.0.6/","native_build":true,"dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"/Users/jonmountjoy/.pub-cache/hosted/pub.dartlang.org/path_provider_linux-2.1.6/","native_build":false,"dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"/Users/jonmountjoy/.pub-cache/hosted/pub.dartlang.org/path_provider_windows-2.0.6/","native_build":false,"dependencies":[]}],"web":[{"name":"cloud_firestore_web","path":"/Users/jonmountjoy/.pub-cache/hosted/pub.dartlang.org/cloud_firestore_web-3.0.2/","dependencies":["firebase_core_web"]},{"name":"firebase_core_web","path":"/Users/jonmountjoy/.pub-cache/hosted/pub.dartlang.org/firebase_core_web-2.0.0/","dependencies":[]},{"name":"firebase_storage_web","path":"/Users/jonmountjoy/.pub-cache/hosted/pub.dartlang.org/firebase_storage_web-3.3.12/","dependencies":["firebase_core_web"]}]},"dependencyGraph":[{"name":"cloud_firestore_web","dependencies":["firebase_core","firebase_core_web"]},{"name":"firebase_core","dependencies":["firebase_core_web"]},{"name":"firebase_core_web","dependencies":[]},{"name":"firebase_storage","dependencies":["firebase_core","firebase_storage_web"]},{"name":"firebase_storage_web","dependencies":["firebase_core","firebase_core_web"]},{"name":"path_provider","dependencies":["path_provider_android","path_provider_ios","path_provider_linux","path_provider_macos","path_provider_windows"]},{"name":"path_provider_android","dependencies":[]},{"name":"path_provider_ios","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_macos","dependencies":[]},{"name":"path_provider_windows","dependencies":[]}],"date_created":"2022-10-27 13:22:52.529310","version":"3.3.5"}
Binary file added example/flutter_app/assets/placeholder.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion example/flutter_app/ios/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Uncomment this line to define a global platform for your project
# platform :ios, '9.0'
platform :ios, '10.0'

# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
Expand Down
88 changes: 88 additions & 0 deletions example/flutter_app/ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
PODS:
- Firebase/CoreOnly (7.3.0):
- FirebaseCore (= 7.3.0)
- Firebase/Storage (7.3.0):
- Firebase/CoreOnly
- FirebaseStorage (~> 7.3.0)
- firebase_core (1.0.2):
- Firebase/CoreOnly (= 7.3.0)
- Flutter
- firebase_storage (8.0.1):
- Firebase/Storage (= 7.3.0)
- firebase_core
- Flutter
- FirebaseCore (7.3.0):
- FirebaseCoreDiagnostics (~> 7.0)
- GoogleUtilities/Environment (~> 7.0)
- GoogleUtilities/Logger (~> 7.0)
- FirebaseCoreDiagnostics (7.8.0):
- GoogleDataTransport (~> 8.0)
- GoogleUtilities/Environment (~> 7.0)
- GoogleUtilities/Logger (~> 7.0)
- nanopb (~> 2.30907.0)
- FirebaseStorage (7.3.0):
- FirebaseCore (~> 7.0)
- GTMSessionFetcher/Core (~> 1.4)
- Flutter (1.0.0)
- GoogleDataTransport (8.2.0):
- nanopb (~> 2.30907.0)
- GoogleUtilities/Environment (7.2.2):
- PromisesObjC (~> 1.2)
- GoogleUtilities/Logger (7.2.2):
- GoogleUtilities/Environment
- GTMSessionFetcher/Core (1.5.0)
- nanopb (2.30907.0):
- nanopb/decode (= 2.30907.0)
- nanopb/encode (= 2.30907.0)
- nanopb/decode (2.30907.0)
- nanopb/encode (2.30907.0)
- path_provider (0.0.1):
- Flutter
- PromisesObjC (1.2.12)

DEPENDENCIES:
- firebase_core (from `.symlinks/plugins/firebase_core/ios`)
- firebase_storage (from `.symlinks/plugins/firebase_storage/ios`)
- Flutter (from `Flutter`)
- path_provider (from `.symlinks/plugins/path_provider/ios`)

SPEC REPOS:
trunk:
- Firebase
- FirebaseCore
- FirebaseCoreDiagnostics
- FirebaseStorage
- GoogleDataTransport
- GoogleUtilities
- GTMSessionFetcher
- nanopb
- PromisesObjC

EXTERNAL SOURCES:
firebase_core:
:path: ".symlinks/plugins/firebase_core/ios"
firebase_storage:
:path: ".symlinks/plugins/firebase_storage/ios"
Flutter:
:path: Flutter
path_provider:
:path: ".symlinks/plugins/path_provider/ios"

SPEC CHECKSUMS:
Firebase: 26223c695fe322633274198cb19dca8cb7e54416
firebase_core: e6cbb0d1f7091edfcae31559e58224bfc1e455dc
firebase_storage: 8b44822d4aa2dc43bde4b0755e00f06e76188380
FirebaseCore: 4d3c72622ce0e2106aaa07bb4b2935ba2c370972
FirebaseCoreDiagnostics: 066f996579cf097bdad3d7dc9a918d6b9e129c50
FirebaseStorage: 5002b1895bfe74a5ce92ad54f966e6162d0da2e5
Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
GoogleDataTransport: 1024b1a4dfbd7a0e92cb20d7e0a6f1fb66b449a4
GoogleUtilities: 31c5b01f978a70c6cff2afc6272b3f1921614b43
GTMSessionFetcher: b3503b20a988c4e20cc189aa798fd18220133f52
nanopb: 59221d7f958fb711001e6a449489542d92ae113e
path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c
PromisesObjC: 3113f7f76903778cf4a0586bd1ab89329a0b7b97

PODFILE CHECKSUM: fe0e1ee7f3d1f7d00b11b474b62dd62134535aea

COCOAPODS: 1.10.1
68 changes: 68 additions & 0 deletions example/flutter_app/ios/Runner.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
805CE2A0B33A35AFBFAB075A /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA4174B99B0023F6470A88DF /* Pods_Runner.framework */; };
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
Expand All @@ -31,7 +32,9 @@
/* Begin PBXFileReference section */
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
1B5DBA8F0F7AB90C4B587728 /* 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>"; };
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
48D89A8F18C2C438C83EAC68 /* 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>"; };
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
Expand All @@ -42,19 +45,30 @@
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
A8A5BE5753495BC639EF8686 /* 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>"; };
EA4174B99B0023F6470A88DF /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
97C146EB1CF9000F007C117D /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
805CE2A0B33A35AFBFAB075A /* Pods_Runner.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
7CBC5C45987096D13B6E4457 /* Frameworks */ = {
isa = PBXGroup;
children = (
EA4174B99B0023F6470A88DF /* Pods_Runner.framework */,
);
name = Frameworks;
sourceTree = "<group>";
};
9740EEB11CF90186004384FC /* Flutter */ = {
isa = PBXGroup;
children = (
Expand All @@ -72,6 +86,8 @@
9740EEB11CF90186004384FC /* Flutter */,
97C146F01CF9000F007C117D /* Runner */,
97C146EF1CF9000F007C117D /* Products */,
E22D22C3B2534677BCCC99CF /* Pods */,
7CBC5C45987096D13B6E4457 /* Frameworks */,
);
sourceTree = "<group>";
};
Expand All @@ -98,19 +114,32 @@
path = Runner;
sourceTree = "<group>";
};
E22D22C3B2534677BCCC99CF /* Pods */ = {
isa = PBXGroup;
children = (
A8A5BE5753495BC639EF8686 /* Pods-Runner.debug.xcconfig */,
48D89A8F18C2C438C83EAC68 /* Pods-Runner.release.xcconfig */,
1B5DBA8F0F7AB90C4B587728 /* Pods-Runner.profile.xcconfig */,
);
name = Pods;
path = Pods;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
97C146ED1CF9000F007C117D /* Runner */ = {
isa = PBXNativeTarget;
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
buildPhases = (
8CF51205BFD5C7F5D15AB8F8 /* [CP] Check Pods Manifest.lock */,
9740EEB61CF901F6004384FC /* Run Script */,
97C146EA1CF9000F007C117D /* Sources */,
97C146EB1CF9000F007C117D /* Frameworks */,
97C146EC1CF9000F007C117D /* Resources */,
9705A1C41CF9048500538489 /* Embed Frameworks */,
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
54D66864A177ED9E4A9DD9BE /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -183,6 +212,45 @@
shellPath = /bin/sh;
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
};
54D66864A177ED9E4A9DD9BE /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
8CF51205BFD5C7F5D15AB8F8 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputFileListPaths = (
);
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
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";
showEnvVarsInLog = 0;
};
9740EEB61CF901F6004384FC /* Run Script */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down
2 changes: 1 addition & 1 deletion example/flutter_app/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions example/flutter_app/ios/Runner.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions example/flutter_app/lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class MyApp extends StatelessWidget {
}

class MyHomePage extends StatefulWidget {
MyHomePage({Key key, this.title}) : super(key: key);
MyHomePage({Key? key, this.title}) : super(key: key);

// This widget is the home page of your application. It is stateful, meaning
// that it has a State object (defined below) that contains fields that affect
Expand All @@ -43,7 +43,7 @@ class MyHomePage extends StatefulWidget {
// used by the build method of the State. Fields in a Widget subclass are
// always marked "final".

final String title;
final String? title;

@override
_MyHomePageState createState() => _MyHomePageState();
Expand Down Expand Up @@ -76,7 +76,7 @@ class _MyHomePageState extends State<MyHomePage> {
// Here we take the value from the MyHomePage object that was created by
// the App.build method, and use it to set our appbar title.
title: Text(
widget.title,
widget.title!,
style: TextStyle(color: CupertinoColors.black),
),
),
Expand Down
Loading