github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: migrate macos/application_package.dart to null-safety (#87976)

Browse Source
This commit is contained in:
嘟囔 2021-08-12 05:42:05 +08:00 committed by GitHub
parent 4ad8c15f34
commit 4ef8088ce8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
packages/flutter_tools/lib/src/macos/application_package.dart
View File

@ -2,10 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// @dart = 2.8
import 'package:meta/meta.dart';
import '../application_package.dart';
import '../base/file_system.dart';
import '../base/io.dart';
@ -20,7 +16,7 @@ bool _isBundleDirectory(FileSystemEntity entity) =>
entity is Directory && entity.path.endsWith('.app');
abstract class MacOSApp extends ApplicationPackage {
MacOSApp({@required String projectBundleId}) : super(id: projectBundleId);
MacOSApp({required String projectBundleId}) : super(id: projectBundleId);
/// Creates a new [MacOSApp] from a macOS project directory.
factory MacOSApp.fromMacOSProject(MacOSProject project) {
@ -35,8 +31,8 @@ abstract class MacOSApp extends ApplicationPackage {
/// "~/Library/Developer/Xcode/DerivedData/" and contains an executable
/// which is expected to start the application and send the observatory
/// port over stdout.
factory MacOSApp.fromPrebuiltApp(FileSystemEntity applicationBinary) {
final _BundleInfo bundleInfo = _executableFromBundle(applicationBinary);
static MacOSApp? fromPrebuiltApp(FileSystemEntity applicationBinary) {
final _BundleInfo? bundleInfo = _executableFromBundle(applicationBinary);
if (bundleInfo == null) {
return null;
}
@ -50,7 +46,7 @@ abstract class MacOSApp extends ApplicationPackage {
}
/// Look up the executable name for a macOS application bundle.
static _BundleInfo _executableFromBundle(FileSystemEntity applicationBundle) {
static _BundleInfo? _executableFromBundle(FileSystemEntity applicationBundle) {
final FileSystemEntityType entityType = globals.fs.typeSync(applicationBundle.path);
if (entityType == FileSystemEntityType.notFound) {
globals.printError('File "${applicationBundle.path}" does not exist.');
@ -109,17 +105,17 @@ abstract class MacOSApp extends ApplicationPackage {
@override
String get displayName => id;
String applicationBundle(BuildMode buildMode);
String? applicationBundle(BuildMode buildMode);
String executable(BuildMode buildMode);
String? executable(BuildMode buildMode);
}
class PrebuiltMacOSApp extends MacOSApp {
PrebuiltMacOSApp({
@required this.bundleDir,
@required this.bundleName,
@required this.projectBundleId,
@required String executable,
required this.bundleDir,
required this.bundleName,
required this.projectBundleId,
required String executable,
}) : _executable = executable,
super(projectBundleId: projectBundleId);
@ -133,10 +129,10 @@ class PrebuiltMacOSApp extends MacOSApp {
String get name => bundleName;
@override
String applicationBundle(BuildMode buildMode) => bundleDir.path;
String? applicationBundle(BuildMode buildMode) => bundleDir.path;
@override
String executable(BuildMode buildMode) => _executable;
String? executable(BuildMode buildMode) => _executable;
}
class BuildableMacOSApp extends MacOSApp {
@ -148,7 +144,7 @@ class BuildableMacOSApp extends MacOSApp {
String get name => 'macOS';
@override
String applicationBundle(BuildMode buildMode) {
String? applicationBundle(BuildMode buildMode) {
final File appBundleNameFile = project.nameFile;
if (!appBundleNameFile.existsSync()) {
globals.printError('Unable to find app name. ${appBundleNameFile.path} does not exist');
@ -163,12 +159,12 @@ class BuildableMacOSApp extends MacOSApp {
}
@override
String executable(BuildMode buildMode) {
final String directory = applicationBundle(buildMode);
String? executable(BuildMode buildMode) {
final String? directory = applicationBundle(buildMode);
if (directory == null) {
return null;
}
final _BundleInfo bundleInfo = MacOSApp._executableFromBundle(globals.fs.directory(directory));
final _BundleInfo? bundleInfo = MacOSApp._executableFromBundle(globals.fs.directory(directory));
return bundleInfo?.executable;
}
}