From 777cbd7fbf8a6047b15798cc81ccd66baa040b40 Mon Sep 17 00:00:00 2001 From: Emmanuel Garcia Date: Fri, 19 Feb 2021 12:59:22 -0800 Subject: [PATCH 01/18] Add implements value to the pubspec --- packages/path_provider/path_provider_linux/CHANGELOG.md | 4 ++++ packages/path_provider/path_provider_linux/pubspec.yaml | 3 ++- packages/path_provider/path_provider_macos/CHANGELOG.md | 4 ++++ packages/path_provider/path_provider_macos/pubspec.yaml | 3 ++- packages/path_provider/path_provider_windows/pubspec.yaml | 3 ++- .../shared_preferences/shared_preferences_linux/CHANGELOG.md | 4 ++++ .../shared_preferences/shared_preferences_linux/pubspec.yaml | 3 ++- .../shared_preferences/shared_preferences_macos/CHANGELOG.md | 4 ++++ .../shared_preferences/shared_preferences_macos/pubspec.yaml | 3 ++- .../shared_preferences_windows/CHANGELOG.md | 3 +++ .../shared_preferences_windows/pubspec.yaml | 5 +++-- packages/url_launcher/url_launcher_linux/CHANGELOG.md | 4 ++++ packages/url_launcher/url_launcher_linux/pubspec.yaml | 3 ++- packages/url_launcher/url_launcher_macos/CHANGELOG.md | 4 ++++ packages/url_launcher/url_launcher_macos/pubspec.yaml | 3 ++- packages/url_launcher/url_launcher_windows/CHANGELOG.md | 4 ++++ packages/url_launcher/url_launcher_windows/pubspec.yaml | 3 ++- 17 files changed, 50 insertions(+), 10 deletions(-) diff --git a/packages/path_provider/path_provider_linux/CHANGELOG.md b/packages/path_provider/path_provider_linux/CHANGELOG.md index 126aadcffeb4..cbed897fee7a 100644 --- a/packages/path_provider/path_provider_linux/CHANGELOG.md +++ b/packages/path_provider/path_provider_linux/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.0.0-nullsafety.1 + +* Add `implements` to pubspec.yaml. + ## 2.0.0-nullsafety * Update version to (semi-belatedly) meet 1.0-consistency promise. diff --git a/packages/path_provider/path_provider_linux/pubspec.yaml b/packages/path_provider/path_provider_linux/pubspec.yaml index c6940b1158ee..bdb29a77bbf5 100644 --- a/packages/path_provider/path_provider_linux/pubspec.yaml +++ b/packages/path_provider/path_provider_linux/pubspec.yaml @@ -1,10 +1,11 @@ name: path_provider_linux description: linux implementation of the path_provider plugin -version: 2.0.0-nullsafety +version: 2.0.0-nullsafety.1 homepage: https://github.com/flutter/plugins/tree/master/packages/path_provider/path_provider_linux flutter: plugin: + implements: path_provider platforms: linux: dartPluginClass: PathProviderLinux diff --git a/packages/path_provider/path_provider_macos/CHANGELOG.md b/packages/path_provider/path_provider_macos/CHANGELOG.md index de7ab3e94f9d..1e112a277105 100644 --- a/packages/path_provider/path_provider_macos/CHANGELOG.md +++ b/packages/path_provider/path_provider_macos/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.0.0-nullsafety.1 + +* Add `implements` to pubspec.ymal. + ## 2.0.0-nullsafety * Update version to (semi-belatedly) meet 1.0-consistency promise. diff --git a/packages/path_provider/path_provider_macos/pubspec.yaml b/packages/path_provider/path_provider_macos/pubspec.yaml index bab79c27a94c..a647f616db00 100644 --- a/packages/path_provider/path_provider_macos/pubspec.yaml +++ b/packages/path_provider/path_provider_macos/pubspec.yaml @@ -1,10 +1,11 @@ name: path_provider_macos description: macOS implementation of the path_provider plugin -version: 2.0.0-nullsafety +version: 2.0.0-nullsafety.1 homepage: https://github.com/flutter/plugins/tree/master/packages/path_provider/path_provider_macos flutter: plugin: + implements: path_provider platforms: macos: pluginClass: PathProviderPlugin diff --git a/packages/path_provider/path_provider_windows/pubspec.yaml b/packages/path_provider/path_provider_windows/pubspec.yaml index eb7d1087d5f5..dafa6db6e023 100644 --- a/packages/path_provider/path_provider_windows/pubspec.yaml +++ b/packages/path_provider/path_provider_windows/pubspec.yaml @@ -1,10 +1,11 @@ name: path_provider_windows description: Windows implementation of the path_provider plugin homepage: https://github.com/flutter/plugins/tree/master/packages/path_provider/path_provider_windows -version: 2.0.0-nullsafety +version: 2.0.0-nullsafety.1 flutter: plugin: + implements: path_provider platforms: windows: dartPluginClass: PathProviderWindows diff --git a/packages/shared_preferences/shared_preferences_linux/CHANGELOG.md b/packages/shared_preferences/shared_preferences_linux/CHANGELOG.md index 1d287cf57401..4aaf94923244 100644 --- a/packages/shared_preferences/shared_preferences_linux/CHANGELOG.md +++ b/packages/shared_preferences/shared_preferences_linux/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.0.0-nullsafety.1 + +* Add `implements` to the pubspec. + ## 2.0.0-nullsafety * Update version for consistency. diff --git a/packages/shared_preferences/shared_preferences_linux/pubspec.yaml b/packages/shared_preferences/shared_preferences_linux/pubspec.yaml index ee2288a79b4a..06fa71c44b4f 100644 --- a/packages/shared_preferences/shared_preferences_linux/pubspec.yaml +++ b/packages/shared_preferences/shared_preferences_linux/pubspec.yaml @@ -1,10 +1,11 @@ name: shared_preferences_linux description: Linux implementation of the shared_preferences plugin -version: 2.0.0-nullsafety +version: 2.0.0-nullsafety.1 homepage: https://github.com/flutter/plugins/tree/master/packages/shared_preferences/shared_preferences_linux flutter: plugin: + implements: shared_preferences platforms: linux: dartPluginClass: SharedPreferencesLinux diff --git a/packages/shared_preferences/shared_preferences_macos/CHANGELOG.md b/packages/shared_preferences/shared_preferences_macos/CHANGELOG.md index 002e1b7224ea..fdd78992cb24 100644 --- a/packages/shared_preferences/shared_preferences_macos/CHANGELOG.md +++ b/packages/shared_preferences/shared_preferences_macos/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.0.0-nullsafety.1 + +* Add `implements` to the pubspec. + ## 2.0.0-nullsafety * Update version to (semi-belatedly) meet 1.0-consistency promise. diff --git a/packages/shared_preferences/shared_preferences_macos/pubspec.yaml b/packages/shared_preferences/shared_preferences_macos/pubspec.yaml index 4f014ecb8929..cc1746d39865 100644 --- a/packages/shared_preferences/shared_preferences_macos/pubspec.yaml +++ b/packages/shared_preferences/shared_preferences_macos/pubspec.yaml @@ -1,10 +1,11 @@ name: shared_preferences_macos description: macOS implementation of the shared_preferences plugin. -version: 2.0.0-nullsafety +version: 2.0.0-nullsafety.1 homepage: https://github.com/flutter/plugins/tree/master/packages/shared_preferences/shared_preferences_macos flutter: plugin: + implements: shared_preferences platforms: macos: pluginClass: SharedPreferencesPlugin diff --git a/packages/shared_preferences/shared_preferences_windows/CHANGELOG.md b/packages/shared_preferences/shared_preferences_windows/CHANGELOG.md index d6a5fb336fe5..ca2a66ff328e 100644 --- a/packages/shared_preferences/shared_preferences_windows/CHANGELOG.md +++ b/packages/shared_preferences/shared_preferences_windows/CHANGELOG.md @@ -1,3 +1,6 @@ +## 2.0.0-nullsafety.1 + +* Add `implements` to the pubspec. ## 2.0.0-nullsafety diff --git a/packages/shared_preferences/shared_preferences_windows/pubspec.yaml b/packages/shared_preferences/shared_preferences_windows/pubspec.yaml index 0b95c0c0d14a..aee245f31e7e 100644 --- a/packages/shared_preferences/shared_preferences_windows/pubspec.yaml +++ b/packages/shared_preferences/shared_preferences_windows/pubspec.yaml @@ -1,11 +1,12 @@ name: shared_preferences_windows description: Windows implementation of shared_preferences homepage: https://github.com/flutter/plugins/tree/master/packages/shared_preferences/shared_preferences_windows -version: 2.0.0-nullsafety +version: 2.0.0-nullsafety.1 flutter: plugin: + implements: shared_preferences platforms: windows: dartPluginClass: SharedPreferencesWindows @@ -16,9 +17,9 @@ environment: flutter: ">=1.12.8" dependencies: - shared_preferences_platform_interface: ^2.0.0-nullsafety flutter: sdk: flutter + shared_preferences_platform_interface: ^2.0.0-nullsafety file: ^6.0.0-nullsafety.4 meta: ^1.1.7 path: ^1.6.4 diff --git a/packages/url_launcher/url_launcher_linux/CHANGELOG.md b/packages/url_launcher/url_launcher_linux/CHANGELOG.md index bd3c15cb31fb..2a75b1895e00 100644 --- a/packages/url_launcher/url_launcher_linux/CHANGELOG.md +++ b/packages/url_launcher/url_launcher_linux/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.0.0-nullsafety.1 + +* Set `implementation` in pubspec.yaml + ## 2.0.0-nullsafety * Update version for consistency with other implementations. diff --git a/packages/url_launcher/url_launcher_linux/pubspec.yaml b/packages/url_launcher/url_launcher_linux/pubspec.yaml index 37a074a57436..7397078db119 100644 --- a/packages/url_launcher/url_launcher_linux/pubspec.yaml +++ b/packages/url_launcher/url_launcher_linux/pubspec.yaml @@ -1,10 +1,11 @@ name: url_launcher_linux description: Linux implementation of the url_launcher plugin. -version: 2.0.0-nullsafety +version: 2.0.0-nullsafety.1 homepage: https://github.com/flutter/plugins/tree/master/packages/url_launcher/url_launcher_linux flutter: plugin: + implements: url_launcher platforms: linux: pluginClass: UrlLauncherPlugin diff --git a/packages/url_launcher/url_launcher_macos/CHANGELOG.md b/packages/url_launcher/url_launcher_macos/CHANGELOG.md index 5835c15f64e0..d7481a040526 100644 --- a/packages/url_launcher/url_launcher_macos/CHANGELOG.md +++ b/packages/url_launcher/url_launcher_macos/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.0.0-nullsafety.1 + +* Set `implementation` in pubspec.yaml + ## 2.0.0-nullsafety * Update version to (semi-belatedly) meet 1.0-consistency promise. diff --git a/packages/url_launcher/url_launcher_macos/pubspec.yaml b/packages/url_launcher/url_launcher_macos/pubspec.yaml index bd918bfda24e..58d954d93aef 100644 --- a/packages/url_launcher/url_launcher_macos/pubspec.yaml +++ b/packages/url_launcher/url_launcher_macos/pubspec.yaml @@ -1,10 +1,11 @@ name: url_launcher_macos description: macOS implementation of the url_launcher plugin. -version: 2.0.0-nullsafety +version: 2.0.0-nullsafety.1 homepage: https://github.com/flutter/plugins/tree/master/packages/url_launcher/url_launcher_macos flutter: plugin: + implements: url_launcher platforms: macos: pluginClass: UrlLauncherPlugin diff --git a/packages/url_launcher/url_launcher_windows/CHANGELOG.md b/packages/url_launcher/url_launcher_windows/CHANGELOG.md index b57785524d08..5ff2feb8a642 100644 --- a/packages/url_launcher/url_launcher_windows/CHANGELOG.md +++ b/packages/url_launcher/url_launcher_windows/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.0.0-nullsafety.1 + +* Set `implementation` in pubspec.yaml + ## 2.0.0-nullsafety * Update version to (semi-belatedly) meet 1.0-consistency promise. diff --git a/packages/url_launcher/url_launcher_windows/pubspec.yaml b/packages/url_launcher/url_launcher_windows/pubspec.yaml index 368c3f831c2a..7984f01e0154 100644 --- a/packages/url_launcher/url_launcher_windows/pubspec.yaml +++ b/packages/url_launcher/url_launcher_windows/pubspec.yaml @@ -1,10 +1,11 @@ name: url_launcher_windows description: Windows implementation of the url_launcher plugin. -version: 2.0.0-nullsafety +version: 2.0.0-nullsafety.1 homepage: https://github.com/flutter/plugins/tree/master/packages/url_launcher/url_launcher_windows flutter: plugin: + implements: url_launcher platforms: windows: pluginClass: UrlLauncherPlugin From 39b405d29dcc2eafc5f922764800daf102e8b101 Mon Sep 17 00:00:00 2001 From: Emmanuel Garcia Date: Fri, 19 Feb 2021 14:48:44 -0800 Subject: [PATCH 02/18] registerWith --- .../connectivity_macos/CHANGELOG.md | 4 ++++ .../connectivity_macos/pubspec.yaml | 3 ++- packages/package_info/CHANGELOG.md | 4 ++++ packages/package_info/pubspec.yaml | 3 ++- .../flutter/generated_plugin_registrant.cc | 4 +++- .../flutter/generated_plugin_registrant.cc | 4 +++- .../path_provider_linux/CHANGELOG.md | 1 + .../lib/path_provider_linux.dart | 2 +- .../test/path_provider_linux_test.dart | 2 +- .../path_provider_windows/CHANGELOG.md | 5 +++++ .../lib/src/path_provider_windows_real.dart | 5 +++++ .../shared_preferences_linux/CHANGELOG.md | 1 + .../lib/shared_preferences_linux.dart | 5 +++++ .../shared_preferences_windows/CHANGELOG.md | 1 + .../lib/shared_preferences_windows.dart | 5 +++++ .../shared_preferences_windows/pubspec.yaml | 1 - .../macos/Runner.xcodeproj/project.pbxproj | 21 ++++++------------- .../contents.xcworkspacedata | 3 +++ 18 files changed, 52 insertions(+), 22 deletions(-) diff --git a/packages/connectivity/connectivity_macos/CHANGELOG.md b/packages/connectivity/connectivity_macos/CHANGELOG.md index 8547db3441c3..2012e4e4391f 100644 --- a/packages/connectivity/connectivity_macos/CHANGELOG.md +++ b/packages/connectivity/connectivity_macos/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.0.0-nullsafety.1 + +* Add `implements` to pubspec.yaml. + ## 2.0.0-nullsafety * Update version to (semi-belatedly) meet 1.0-consistency promise. diff --git a/packages/connectivity/connectivity_macos/pubspec.yaml b/packages/connectivity/connectivity_macos/pubspec.yaml index 0a22a8ba5f53..6bf9f5543344 100644 --- a/packages/connectivity/connectivity_macos/pubspec.yaml +++ b/packages/connectivity/connectivity_macos/pubspec.yaml @@ -1,10 +1,11 @@ name: connectivity_macos description: macOS implementation of the connectivity plugin. -version: 2.0.0-nullsafety +version: 2.0.0-nullsafety.1 homepage: https://github.com/flutter/plugins/tree/master/packages/connectivity/connectivity_macos flutter: plugin: + implements: connectivity platforms: macos: pluginClass: ConnectivityPlugin diff --git a/packages/package_info/CHANGELOG.md b/packages/package_info/CHANGELOG.md index ddf01f0f3999..3eaddbc8565e 100644 --- a/packages/package_info/CHANGELOG.md +++ b/packages/package_info/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.0.0-nullsafety.1 + +* Add `implements` to pubspec.yaml. + ## 2.0.0-nullsafety * Update version to (semi-belatedly) meet 1.0-consistency promise. diff --git a/packages/package_info/pubspec.yaml b/packages/package_info/pubspec.yaml index 67fbc5f626db..bbeeaa77b512 100644 --- a/packages/package_info/pubspec.yaml +++ b/packages/package_info/pubspec.yaml @@ -2,10 +2,11 @@ name: package_info description: Flutter plugin for querying information about the application package, such as CFBundleVersion on iOS or versionCode on Android. homepage: https://github.com/flutter/plugins/tree/master/packages/package_info -version: 2.0.0-nullsafety +version: 2.0.0-nullsafety.1 flutter: plugin: + implements: package_info platforms: android: package: io.flutter.plugins.packageinfo diff --git a/packages/path_provider/path_provider/example/linux/flutter/generated_plugin_registrant.cc b/packages/path_provider/path_provider/example/linux/flutter/generated_plugin_registrant.cc index 890de29bbab1..d38195aa0412 100644 --- a/packages/path_provider/path_provider/example/linux/flutter/generated_plugin_registrant.cc +++ b/packages/path_provider/path_provider/example/linux/flutter/generated_plugin_registrant.cc @@ -4,4 +4,6 @@ #include "generated_plugin_registrant.h" -void fl_register_plugins(FlPluginRegistry* registry) {} + +void fl_register_plugins(FlPluginRegistry* registry) { +} diff --git a/packages/path_provider/path_provider/example/windows/flutter/generated_plugin_registrant.cc b/packages/path_provider/path_provider/example/windows/flutter/generated_plugin_registrant.cc index a6177ab0b72b..4bfa0f3a3a75 100644 --- a/packages/path_provider/path_provider/example/windows/flutter/generated_plugin_registrant.cc +++ b/packages/path_provider/path_provider/example/windows/flutter/generated_plugin_registrant.cc @@ -4,4 +4,6 @@ #include "generated_plugin_registrant.h" -void RegisterPlugins(flutter::PluginRegistry* registry) {} + +void RegisterPlugins(flutter::PluginRegistry* registry) { +} diff --git a/packages/path_provider/path_provider_linux/CHANGELOG.md b/packages/path_provider/path_provider_linux/CHANGELOG.md index cbed897fee7a..5ba7ac89be23 100644 --- a/packages/path_provider/path_provider_linux/CHANGELOG.md +++ b/packages/path_provider/path_provider_linux/CHANGELOG.md @@ -1,6 +1,7 @@ ## 2.0.0-nullsafety.1 * Add `implements` to pubspec.yaml. +* Add `registerWith` method to the main Dart class. ## 2.0.0-nullsafety diff --git a/packages/path_provider/path_provider_linux/lib/path_provider_linux.dart b/packages/path_provider/path_provider_linux/lib/path_provider_linux.dart index e35b73bf3766..9261a23209cb 100644 --- a/packages/path_provider/path_provider_linux/lib/path_provider_linux.dart +++ b/packages/path_provider/path_provider_linux/lib/path_provider_linux.dart @@ -13,7 +13,7 @@ import 'package:path_provider_platform_interface/path_provider_platform_interfac /// This class implements the `package:path_provider` functionality for linux class PathProviderLinux extends PathProviderPlatform { /// Registers this class as the default instance of [PathProviderPlatform] - static void register() { + static void registerWith() { PathProviderPlatform.instance = PathProviderLinux(); } diff --git a/packages/path_provider/path_provider_linux/test/path_provider_linux_test.dart b/packages/path_provider/path_provider_linux/test/path_provider_linux_test.dart index be831b92211f..c3c0ee795d32 100644 --- a/packages/path_provider/path_provider_linux/test/path_provider_linux_test.dart +++ b/packages/path_provider/path_provider_linux/test/path_provider_linux_test.dart @@ -7,7 +7,7 @@ import 'package:path_provider_platform_interface/path_provider_platform_interfac void main() { TestWidgetsFlutterBinding.ensureInitialized(); - PathProviderLinux.register(); + PathProviderLinux.registerWith(); setUp(() {}); diff --git a/packages/path_provider/path_provider_windows/CHANGELOG.md b/packages/path_provider/path_provider_windows/CHANGELOG.md index 2e1701cc53bf..d15acd41da66 100644 --- a/packages/path_provider/path_provider_windows/CHANGELOG.md +++ b/packages/path_provider/path_provider_windows/CHANGELOG.md @@ -1,3 +1,8 @@ +## 2.0.0-nullsafety.1 + +* Add `implements` to pubspec.yaml. +* Add `registerWith()` to the Dart main class. + ## 2.0.0-nullsafety * Update version to (semi-belatedly) meet 1.0-consistency promise. diff --git a/packages/path_provider/path_provider_windows/lib/src/path_provider_windows_real.dart b/packages/path_provider/path_provider_windows/lib/src/path_provider_windows_real.dart index db2ad9da207c..4503b01ecddf 100644 --- a/packages/path_provider/path_provider_windows/lib/src/path_provider_windows_real.dart +++ b/packages/path_provider/path_provider_windows/lib/src/path_provider_windows_real.dart @@ -47,6 +47,11 @@ class VersionInfoQuerier { /// /// This class implements the `package:path_provider` functionality for Windows. class PathProviderWindows extends PathProviderPlatform { + /// Registers the Windows implementation. + static void registerWith() { + // TODO(stuartmorgan): Fill this up. + } + /// The object to use for performing VerQueryValue calls. @visibleForTesting VersionInfoQuerier versionInfoQuerier = VersionInfoQuerier(); diff --git a/packages/shared_preferences/shared_preferences_linux/CHANGELOG.md b/packages/shared_preferences/shared_preferences_linux/CHANGELOG.md index 4aaf94923244..9934818b3b36 100644 --- a/packages/shared_preferences/shared_preferences_linux/CHANGELOG.md +++ b/packages/shared_preferences/shared_preferences_linux/CHANGELOG.md @@ -1,6 +1,7 @@ ## 2.0.0-nullsafety.1 * Add `implements` to the pubspec. +* Add `registerWith` to the Dart main class. ## 2.0.0-nullsafety diff --git a/packages/shared_preferences/shared_preferences_linux/lib/shared_preferences_linux.dart b/packages/shared_preferences/shared_preferences_linux/lib/shared_preferences_linux.dart index 5a694658cdf5..5159d84a555e 100644 --- a/packages/shared_preferences/shared_preferences_linux/lib/shared_preferences_linux.dart +++ b/packages/shared_preferences/shared_preferences_linux/lib/shared_preferences_linux.dart @@ -19,6 +19,11 @@ class SharedPreferencesLinux extends SharedPreferencesStorePlatform { /// The default instance of [SharedPreferencesLinux] to use. static SharedPreferencesLinux instance = SharedPreferencesLinux(); + /// Registers the Linux implementation. + static void registerWith() { + // TODO(stuartmorgan): Fill this up. + } + /// Local copy of preferences Map? _cachedPreferences; diff --git a/packages/shared_preferences/shared_preferences_windows/CHANGELOG.md b/packages/shared_preferences/shared_preferences_windows/CHANGELOG.md index ca2a66ff328e..1ba49508605f 100644 --- a/packages/shared_preferences/shared_preferences_windows/CHANGELOG.md +++ b/packages/shared_preferences/shared_preferences_windows/CHANGELOG.md @@ -1,6 +1,7 @@ ## 2.0.0-nullsafety.1 * Add `implements` to the pubspec. +* Add `registerWith` to the Dart main class. ## 2.0.0-nullsafety diff --git a/packages/shared_preferences/shared_preferences_windows/lib/shared_preferences_windows.dart b/packages/shared_preferences/shared_preferences_windows/lib/shared_preferences_windows.dart index b2678c49782b..4f6ec724c45c 100644 --- a/packages/shared_preferences/shared_preferences_windows/lib/shared_preferences_windows.dart +++ b/packages/shared_preferences/shared_preferences_windows/lib/shared_preferences_windows.dart @@ -18,6 +18,11 @@ class SharedPreferencesWindows extends SharedPreferencesStorePlatform { /// The default instance of [SharedPreferencesWindows] to use. static SharedPreferencesWindows instance = SharedPreferencesWindows(); + /// Registers the Windows implementation. + static void registerWith() { + // TODO(stuartmorgan): Fill this up. + } + /// File system used to store to disk. Exposed for testing only. @visibleForTesting FileSystem fs = LocalFileSystem(); diff --git a/packages/shared_preferences/shared_preferences_windows/pubspec.yaml b/packages/shared_preferences/shared_preferences_windows/pubspec.yaml index aee245f31e7e..0a9c4828eec2 100644 --- a/packages/shared_preferences/shared_preferences_windows/pubspec.yaml +++ b/packages/shared_preferences/shared_preferences_windows/pubspec.yaml @@ -3,7 +3,6 @@ description: Windows implementation of shared_preferences homepage: https://github.com/flutter/plugins/tree/master/packages/shared_preferences/shared_preferences_windows version: 2.0.0-nullsafety.1 - flutter: plugin: implements: shared_preferences diff --git a/packages/url_launcher/url_launcher_macos/example/macos/Runner.xcodeproj/project.pbxproj b/packages/url_launcher/url_launcher_macos/example/macos/Runner.xcodeproj/project.pbxproj index a95e62daada1..7ba08f504768 100644 --- a/packages/url_launcher/url_launcher_macos/example/macos/Runner.xcodeproj/project.pbxproj +++ b/packages/url_launcher/url_launcher_macos/example/macos/Runner.xcodeproj/project.pbxproj @@ -26,10 +26,6 @@ 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; - 33D1A10422148B71006C7A3E /* FlutterMacOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 33D1A10322148B71006C7A3E /* FlutterMacOS.framework */; }; - 33D1A10522148B93006C7A3E /* FlutterMacOS.framework in Bundle Framework */ = {isa = PBXBuildFile; fileRef = 33D1A10322148B71006C7A3E /* FlutterMacOS.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - D73912F022F37F9E000D13A0 /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D73912EF22F37F9E000D13A0 /* App.framework */; }; - D73912F222F3801D000D13A0 /* App.framework in Bundle Framework */ = {isa = PBXBuildFile; fileRef = D73912EF22F37F9E000D13A0 /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; DD4A1B9DEDBB72C87CD7AE27 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5067D74CB28D28AE3B3DD05B /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ @@ -50,8 +46,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - D73912F222F3801D000D13A0 /* App.framework in Bundle Framework */, - 33D1A10522148B93006C7A3E /* FlutterMacOS.framework in Bundle Framework */, ); name = "Bundle Framework"; runOnlyForDeploymentPostprocessing = 0; @@ -70,7 +64,6 @@ 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Debug.xcconfig"; sourceTree = ""; }; 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Release.xcconfig"; sourceTree = ""; }; 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Flutter-Generated.xcconfig"; path = "ephemeral/Flutter-Generated.xcconfig"; sourceTree = ""; }; - 33D1A10322148B71006C7A3E /* FlutterMacOS.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FlutterMacOS.framework; path = Flutter/ephemeral/FlutterMacOS.framework; sourceTree = SOURCE_ROOT; }; 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; @@ -80,7 +73,6 @@ 899489AD6AA35AECA4E2BEA6 /* 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 = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; B36FDC1D769C9045B8821207 /* 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 = ""; }; - D73912EF22F37F9E000D13A0 /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/ephemeral/App.framework; sourceTree = SOURCE_ROOT; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -88,8 +80,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - D73912F022F37F9E000D13A0 /* App.framework in Frameworks */, - 33D1A10422148B71006C7A3E /* FlutterMacOS.framework in Frameworks */, DD4A1B9DEDBB72C87CD7AE27 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -145,8 +135,6 @@ 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */, 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */, 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */, - D73912EF22F37F9E000D13A0 /* App.framework */, - 33D1A10322148B71006C7A3E /* FlutterMacOS.framework */, ); path = Flutter; sourceTree = ""; @@ -281,7 +269,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "echo \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename\n"; + shellScript = "echo \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh embed\n"; }; 33CC111E2044C6BF0003C045 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; @@ -308,10 +296,13 @@ buildActionMask = 2147483647; files = ( ); - inputFileListPaths = ( + inputPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/url_launcher_macos/url_launcher_macos.framework", ); name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( + outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher_macos.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; diff --git a/packages/url_launcher/url_launcher_macos/example/macos/Runner.xcworkspace/contents.xcworkspacedata b/packages/url_launcher/url_launcher_macos/example/macos/Runner.xcworkspace/contents.xcworkspacedata index 1d526a16ed0f..21a3cc14c74e 100644 --- a/packages/url_launcher/url_launcher_macos/example/macos/Runner.xcworkspace/contents.xcworkspacedata +++ b/packages/url_launcher/url_launcher_macos/example/macos/Runner.xcworkspace/contents.xcworkspacedata @@ -4,4 +4,7 @@ + + From 1a1ac3eab74be0c579168cf7680218af07420365 Mon Sep 17 00:00:00 2001 From: Emmanuel Garcia Date: Fri, 19 Feb 2021 15:01:26 -0800 Subject: [PATCH 03/18] Format --- .../example/linux/flutter/generated_plugin_registrant.cc | 4 +--- .../example/windows/flutter/generated_plugin_registrant.cc | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/path_provider/path_provider/example/linux/flutter/generated_plugin_registrant.cc b/packages/path_provider/path_provider/example/linux/flutter/generated_plugin_registrant.cc index d38195aa0412..890de29bbab1 100644 --- a/packages/path_provider/path_provider/example/linux/flutter/generated_plugin_registrant.cc +++ b/packages/path_provider/path_provider/example/linux/flutter/generated_plugin_registrant.cc @@ -4,6 +4,4 @@ #include "generated_plugin_registrant.h" - -void fl_register_plugins(FlPluginRegistry* registry) { -} +void fl_register_plugins(FlPluginRegistry* registry) {} diff --git a/packages/path_provider/path_provider/example/windows/flutter/generated_plugin_registrant.cc b/packages/path_provider/path_provider/example/windows/flutter/generated_plugin_registrant.cc index 4bfa0f3a3a75..a6177ab0b72b 100644 --- a/packages/path_provider/path_provider/example/windows/flutter/generated_plugin_registrant.cc +++ b/packages/path_provider/path_provider/example/windows/flutter/generated_plugin_registrant.cc @@ -4,6 +4,4 @@ #include "generated_plugin_registrant.h" - -void RegisterPlugins(flutter::PluginRegistry* registry) { -} +void RegisterPlugins(flutter::PluginRegistry* registry) {} From 0011f7faf085eb2fc3cc4ef03150b122bfc7493a Mon Sep 17 00:00:00 2001 From: Emmanuel Garcia Date: Fri, 19 Feb 2021 16:57:15 -0800 Subject: [PATCH 04/18] Set instances --- .../lib/src/path_provider_windows_real.dart | 2 +- .../lib/shared_preferences_linux.dart | 5 +---- .../lib/shared_preferences_windows.dart | 5 +---- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/packages/path_provider/path_provider_windows/lib/src/path_provider_windows_real.dart b/packages/path_provider/path_provider_windows/lib/src/path_provider_windows_real.dart index 4503b01ecddf..2c2a43f00101 100644 --- a/packages/path_provider/path_provider_windows/lib/src/path_provider_windows_real.dart +++ b/packages/path_provider/path_provider_windows/lib/src/path_provider_windows_real.dart @@ -49,7 +49,7 @@ class VersionInfoQuerier { class PathProviderWindows extends PathProviderPlatform { /// Registers the Windows implementation. static void registerWith() { - // TODO(stuartmorgan): Fill this up. + PathProviderPlatform.instance = PathProviderWindows(); } /// The object to use for performing VerQueryValue calls. diff --git a/packages/shared_preferences/shared_preferences_linux/lib/shared_preferences_linux.dart b/packages/shared_preferences/shared_preferences_linux/lib/shared_preferences_linux.dart index 5159d84a555e..9e1320802f22 100644 --- a/packages/shared_preferences/shared_preferences_linux/lib/shared_preferences_linux.dart +++ b/packages/shared_preferences/shared_preferences_linux/lib/shared_preferences_linux.dart @@ -16,12 +16,9 @@ import 'package:shared_preferences_platform_interface/shared_preferences_platfor /// /// This class implements the `package:shared_preferences` functionality for Linux. class SharedPreferencesLinux extends SharedPreferencesStorePlatform { - /// The default instance of [SharedPreferencesLinux] to use. - static SharedPreferencesLinux instance = SharedPreferencesLinux(); - /// Registers the Linux implementation. static void registerWith() { - // TODO(stuartmorgan): Fill this up. + SharedPreferencesStorePlatform.instance = SharedPreferencesLinux(); } /// Local copy of preferences diff --git a/packages/shared_preferences/shared_preferences_windows/lib/shared_preferences_windows.dart b/packages/shared_preferences/shared_preferences_windows/lib/shared_preferences_windows.dart index 4f6ec724c45c..16716eea4476 100644 --- a/packages/shared_preferences/shared_preferences_windows/lib/shared_preferences_windows.dart +++ b/packages/shared_preferences/shared_preferences_windows/lib/shared_preferences_windows.dart @@ -15,12 +15,9 @@ import 'package:path_provider_windows/path_provider_windows.dart'; /// /// This class implements the `package:shared_preferences` functionality for Windows. class SharedPreferencesWindows extends SharedPreferencesStorePlatform { - /// The default instance of [SharedPreferencesWindows] to use. - static SharedPreferencesWindows instance = SharedPreferencesWindows(); - /// Registers the Windows implementation. static void registerWith() { - // TODO(stuartmorgan): Fill this up. + SharedPreferencesStorePlatform.instance = SharedPreferencesWindows(); } /// File system used to store to disk. Exposed for testing only. From f98ac67eb28fa7972c6f7bad8b9903662f27a284 Mon Sep 17 00:00:00 2001 From: Emmanuel Garcia Date: Fri, 19 Feb 2021 17:16:03 -0800 Subject: [PATCH 05/18] Update test --- .../example/integration_test/shared_preferences_test.dart | 3 ++- .../shared_preferences_linux/example/lib/main.dart | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/shared_preferences/shared_preferences_linux/example/integration_test/shared_preferences_test.dart b/packages/shared_preferences/shared_preferences_linux/example/integration_test/shared_preferences_test.dart index 019dc248a918..eacae5ff6e95 100644 --- a/packages/shared_preferences/shared_preferences_linux/example/integration_test/shared_preferences_test.dart +++ b/packages/shared_preferences/shared_preferences_linux/example/integration_test/shared_preferences_test.dart @@ -9,6 +9,7 @@ import 'dart:async'; import 'package:flutter_test/flutter_test.dart'; import 'package:integration_test/integration_test.dart'; import 'package:shared_preferences_linux/shared_preferences_linux.dart'; +import 'package:shared_preferences_platform_interface/shared_preferences_platform_interface.dart'; void main() { IntegrationTestWidgetsFlutterBinding.ensureInitialized(); @@ -33,7 +34,7 @@ void main() { SharedPreferencesLinux preferences; setUp(() async { - preferences = SharedPreferencesLinux.instance; + preferences = SharedPreferencesStorePlatform.instance; }); tearDown(() { diff --git a/packages/shared_preferences/shared_preferences_linux/example/lib/main.dart b/packages/shared_preferences/shared_preferences_linux/example/lib/main.dart index ab664cd652ff..acbca2fa837c 100644 --- a/packages/shared_preferences/shared_preferences_linux/example/lib/main.dart +++ b/packages/shared_preferences/shared_preferences_linux/example/lib/main.dart @@ -8,6 +8,7 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:shared_preferences_linux/shared_preferences_linux.dart'; +import 'package:shared_preferences_platform_interface/shared_preferences_platform_interface.dart'; void main() { runApp(MyApp()); @@ -31,7 +32,7 @@ class SharedPreferencesDemo extends StatefulWidget { } class SharedPreferencesDemoState extends State { - final prefs = SharedPreferencesLinux.instance; + final prefs = SharedPreferencesStorePlatform.instance; late Future _counter; Future _incrementCounter() async { From c2347599349061ce67efd2e7bb11cd906e361a6e Mon Sep 17 00:00:00 2001 From: Emmanuel Garcia Date: Fri, 19 Feb 2021 19:57:45 -0800 Subject: [PATCH 06/18] Fixes --- packages/package_info/pubspec.yaml | 2 +- .../example/integration_test/shared_preferences_test.dart | 3 +-- .../shared_preferences_linux/example/lib/main.dart | 1 - .../example/integration_test/shared_preferences_test.dart | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/package_info/pubspec.yaml b/packages/package_info/pubspec.yaml index 8d96c7a4c9b9..ae9ca8c55887 100644 --- a/packages/package_info/pubspec.yaml +++ b/packages/package_info/pubspec.yaml @@ -6,7 +6,6 @@ version: 2.0.1 flutter: plugin: - implements: package_info platforms: android: package: io.flutter.plugins.packageinfo @@ -14,6 +13,7 @@ flutter: ios: pluginClass: FLTPackageInfoPlugin macos: + default_package: package_info pluginClass: FLTPackageInfoPlugin dependencies: diff --git a/packages/shared_preferences/shared_preferences_linux/example/integration_test/shared_preferences_test.dart b/packages/shared_preferences/shared_preferences_linux/example/integration_test/shared_preferences_test.dart index eacae5ff6e95..0969faca6f2e 100644 --- a/packages/shared_preferences/shared_preferences_linux/example/integration_test/shared_preferences_test.dart +++ b/packages/shared_preferences/shared_preferences_linux/example/integration_test/shared_preferences_test.dart @@ -9,7 +9,6 @@ import 'dart:async'; import 'package:flutter_test/flutter_test.dart'; import 'package:integration_test/integration_test.dart'; import 'package:shared_preferences_linux/shared_preferences_linux.dart'; -import 'package:shared_preferences_platform_interface/shared_preferences_platform_interface.dart'; void main() { IntegrationTestWidgetsFlutterBinding.ensureInitialized(); @@ -34,7 +33,7 @@ void main() { SharedPreferencesLinux preferences; setUp(() async { - preferences = SharedPreferencesStorePlatform.instance; + preferences = SharedPreferencesLinux(); }); tearDown(() { diff --git a/packages/shared_preferences/shared_preferences_linux/example/lib/main.dart b/packages/shared_preferences/shared_preferences_linux/example/lib/main.dart index acbca2fa837c..dd53cfd7b3e9 100644 --- a/packages/shared_preferences/shared_preferences_linux/example/lib/main.dart +++ b/packages/shared_preferences/shared_preferences_linux/example/lib/main.dart @@ -7,7 +7,6 @@ import 'dart:async'; import 'package:flutter/material.dart'; -import 'package:shared_preferences_linux/shared_preferences_linux.dart'; import 'package:shared_preferences_platform_interface/shared_preferences_platform_interface.dart'; void main() { diff --git a/packages/shared_preferences/shared_preferences_windows/example/integration_test/shared_preferences_test.dart b/packages/shared_preferences/shared_preferences_windows/example/integration_test/shared_preferences_test.dart index 027daa6eaeb1..0e1fde4aed98 100644 --- a/packages/shared_preferences/shared_preferences_windows/example/integration_test/shared_preferences_test.dart +++ b/packages/shared_preferences/shared_preferences_windows/example/integration_test/shared_preferences_test.dart @@ -32,7 +32,7 @@ void main() { SharedPreferencesWindows preferences; setUp(() async { - preferences = SharedPreferencesWindows.instance; + preferences = SharedPreferencesWindows(); }); tearDown(() { From 5efaf5c7edecd4e7d392f1a3f60a9f7c486d95b6 Mon Sep 17 00:00:00 2001 From: Emmanuel Garcia Date: Mon, 22 Feb 2021 15:45:54 -0800 Subject: [PATCH 07/18] Revert changes --- .../shared_preferences_windows/pubspec.yaml | 2 +- .../url_launcher_linux/CHANGELOG.md | 4 ---- .../url_launcher_linux/pubspec.yaml | 2 +- .../macos/Runner.xcodeproj/project.pbxproj | 21 +++++++++++++------ .../contents.xcworkspacedata | 3 --- .../url_launcher_macos/pubspec.yaml | 2 +- .../url_launcher_windows/CHANGELOG.md | 2 +- .../url_launcher_windows/pubspec.yaml | 2 +- 8 files changed, 20 insertions(+), 18 deletions(-) diff --git a/packages/shared_preferences/shared_preferences_windows/pubspec.yaml b/packages/shared_preferences/shared_preferences_windows/pubspec.yaml index 124bc0e6abd8..58b27bc17e6f 100644 --- a/packages/shared_preferences/shared_preferences_windows/pubspec.yaml +++ b/packages/shared_preferences/shared_preferences_windows/pubspec.yaml @@ -26,6 +26,6 @@ dependencies: path_provider_windows: ^2.0.0 dev_dependencies: - flutter_test:p + flutter_test: sdk: flutter pedantic: ^1.10.0 diff --git a/packages/url_launcher/url_launcher_linux/CHANGELOG.md b/packages/url_launcher/url_launcher_linux/CHANGELOG.md index e4cc9e10d1c1..ec9fad53437c 100644 --- a/packages/url_launcher/url_launcher_linux/CHANGELOG.md +++ b/packages/url_launcher/url_launcher_linux/CHANGELOG.md @@ -1,7 +1,3 @@ -## 2.0.1 - -* Set `implementation` in pubspec.yaml - ## 2.0.0 * Migrate to null safety. diff --git a/packages/url_launcher/url_launcher_linux/pubspec.yaml b/packages/url_launcher/url_launcher_linux/pubspec.yaml index d5296ce708e9..cc974094b2d0 100644 --- a/packages/url_launcher/url_launcher_linux/pubspec.yaml +++ b/packages/url_launcher/url_launcher_linux/pubspec.yaml @@ -1,6 +1,6 @@ name: url_launcher_linux description: Linux implementation of the url_launcher plugin. -version: 2.0.1 +version: 2.0.0 homepage: https://github.com/flutter/plugins/tree/master/packages/url_launcher/url_launcher_linux flutter: diff --git a/packages/url_launcher/url_launcher_macos/example/macos/Runner.xcodeproj/project.pbxproj b/packages/url_launcher/url_launcher_macos/example/macos/Runner.xcodeproj/project.pbxproj index 7ba08f504768..a95e62daada1 100644 --- a/packages/url_launcher/url_launcher_macos/example/macos/Runner.xcodeproj/project.pbxproj +++ b/packages/url_launcher/url_launcher_macos/example/macos/Runner.xcodeproj/project.pbxproj @@ -26,6 +26,10 @@ 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; + 33D1A10422148B71006C7A3E /* FlutterMacOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 33D1A10322148B71006C7A3E /* FlutterMacOS.framework */; }; + 33D1A10522148B93006C7A3E /* FlutterMacOS.framework in Bundle Framework */ = {isa = PBXBuildFile; fileRef = 33D1A10322148B71006C7A3E /* FlutterMacOS.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + D73912F022F37F9E000D13A0 /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D73912EF22F37F9E000D13A0 /* App.framework */; }; + D73912F222F3801D000D13A0 /* App.framework in Bundle Framework */ = {isa = PBXBuildFile; fileRef = D73912EF22F37F9E000D13A0 /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; DD4A1B9DEDBB72C87CD7AE27 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5067D74CB28D28AE3B3DD05B /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ @@ -46,6 +50,8 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( + D73912F222F3801D000D13A0 /* App.framework in Bundle Framework */, + 33D1A10522148B93006C7A3E /* FlutterMacOS.framework in Bundle Framework */, ); name = "Bundle Framework"; runOnlyForDeploymentPostprocessing = 0; @@ -64,6 +70,7 @@ 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Debug.xcconfig"; sourceTree = ""; }; 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Release.xcconfig"; sourceTree = ""; }; 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Flutter-Generated.xcconfig"; path = "ephemeral/Flutter-Generated.xcconfig"; sourceTree = ""; }; + 33D1A10322148B71006C7A3E /* FlutterMacOS.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FlutterMacOS.framework; path = Flutter/ephemeral/FlutterMacOS.framework; sourceTree = SOURCE_ROOT; }; 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; @@ -73,6 +80,7 @@ 899489AD6AA35AECA4E2BEA6 /* 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 = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; B36FDC1D769C9045B8821207 /* 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 = ""; }; + D73912EF22F37F9E000D13A0 /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/ephemeral/App.framework; sourceTree = SOURCE_ROOT; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -80,6 +88,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D73912F022F37F9E000D13A0 /* App.framework in Frameworks */, + 33D1A10422148B71006C7A3E /* FlutterMacOS.framework in Frameworks */, DD4A1B9DEDBB72C87CD7AE27 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -135,6 +145,8 @@ 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */, 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */, 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */, + D73912EF22F37F9E000D13A0 /* App.framework */, + 33D1A10322148B71006C7A3E /* FlutterMacOS.framework */, ); path = Flutter; sourceTree = ""; @@ -269,7 +281,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "echo \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh embed\n"; + shellScript = "echo \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename\n"; }; 33CC111E2044C6BF0003C045 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; @@ -296,13 +308,10 @@ buildActionMask = 2147483647; files = ( ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/url_launcher_macos/url_launcher_macos.framework", + inputFileListPaths = ( ); name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher_macos.framework", + outputFileListPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; diff --git a/packages/url_launcher/url_launcher_macos/example/macos/Runner.xcworkspace/contents.xcworkspacedata b/packages/url_launcher/url_launcher_macos/example/macos/Runner.xcworkspace/contents.xcworkspacedata index 21a3cc14c74e..1d526a16ed0f 100644 --- a/packages/url_launcher/url_launcher_macos/example/macos/Runner.xcworkspace/contents.xcworkspacedata +++ b/packages/url_launcher/url_launcher_macos/example/macos/Runner.xcworkspace/contents.xcworkspacedata @@ -4,7 +4,4 @@ - - diff --git a/packages/url_launcher/url_launcher_macos/pubspec.yaml b/packages/url_launcher/url_launcher_macos/pubspec.yaml index 4e23f48a65b4..6b5e6cf2a825 100644 --- a/packages/url_launcher/url_launcher_macos/pubspec.yaml +++ b/packages/url_launcher/url_launcher_macos/pubspec.yaml @@ -1,6 +1,6 @@ name: url_launcher_macos description: macOS implementation of the url_launcher plugin. -version: 2.0.1 +version: 2.0.0 homepage: https://github.com/flutter/plugins/tree/master/packages/url_launcher/url_launcher_macos flutter: diff --git a/packages/url_launcher/url_launcher_windows/CHANGELOG.md b/packages/url_launcher/url_launcher_windows/CHANGELOG.md index 9c66b66bcbe1..e906254eef44 100644 --- a/packages/url_launcher/url_launcher_windows/CHANGELOG.md +++ b/packages/url_launcher/url_launcher_windows/CHANGELOG.md @@ -1,4 +1,4 @@ -## 2.0.1 +## 2.0.0 * Migrate to null-safety. * Update the example app: remove the deprecated `RaisedButton` and `FlatButton` widgets. diff --git a/packages/url_launcher/url_launcher_windows/pubspec.yaml b/packages/url_launcher/url_launcher_windows/pubspec.yaml index 6132cf65280d..e5b611f86af0 100644 --- a/packages/url_launcher/url_launcher_windows/pubspec.yaml +++ b/packages/url_launcher/url_launcher_windows/pubspec.yaml @@ -1,6 +1,6 @@ name: url_launcher_windows description: Windows implementation of the url_launcher plugin. -version: 2.0.1 +version: 2.0.0 homepage: https://github.com/flutter/plugins/tree/master/packages/url_launcher/url_launcher_windows flutter: From ef1240df677904742291dd922aeff1b0ffaaa1e0 Mon Sep 17 00:00:00 2001 From: Emmanuel Garcia Date: Mon, 22 Feb 2021 16:51:52 -0800 Subject: [PATCH 08/18] Fix Windows import --- .../shared_preferences_windows/example/lib/main.dart | 3 ++- .../shared_preferences_windows/example/pubspec.yaml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/shared_preferences/shared_preferences_windows/example/lib/main.dart b/packages/shared_preferences/shared_preferences_windows/example/lib/main.dart index f0dc155aee4a..179604d64bab 100644 --- a/packages/shared_preferences/shared_preferences_windows/example/lib/main.dart +++ b/packages/shared_preferences/shared_preferences_windows/example/lib/main.dart @@ -7,6 +7,7 @@ import 'dart:async'; import 'package:flutter/material.dart'; +import 'package:shared_preferences_platform_interface/shared_preferences_platform_interface.dart'; import 'package:shared_preferences_windows/shared_preferences_windows.dart'; void main() { @@ -31,7 +32,7 @@ class SharedPreferencesDemo extends StatefulWidget { } class SharedPreferencesDemoState extends State { - final prefs = SharedPreferencesWindows.instance; + final prefs = SharedPreferencesStorePlatform.instance; late Future _counter; Future _incrementCounter() async { diff --git a/packages/shared_preferences/shared_preferences_windows/example/pubspec.yaml b/packages/shared_preferences/shared_preferences_windows/example/pubspec.yaml index 6725259c4bdc..5d8042cee1e7 100644 --- a/packages/shared_preferences/shared_preferences_windows/example/pubspec.yaml +++ b/packages/shared_preferences/shared_preferences_windows/example/pubspec.yaml @@ -8,6 +8,7 @@ environment: dependencies: flutter: sdk: flutter + shared_preferences_platform_interface: ^2.0.0 shared_preferences_windows: ^2.0.0 dependency_overrides: From c696cc55615418b2ed68decdf8b309da14742296 Mon Sep 17 00:00:00 2001 From: Emmanuel Garcia Date: Mon, 22 Feb 2021 18:25:02 -0800 Subject: [PATCH 09/18] Revert changes to package_info --- packages/package_info/CHANGELOG.md | 4 ---- packages/package_info/pubspec.yaml | 3 +-- packages/url_launcher/url_launcher_macos/CHANGELOG.md | 4 ---- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/packages/package_info/CHANGELOG.md b/packages/package_info/CHANGELOG.md index 68844252bd9d..14a9e26639d9 100644 --- a/packages/package_info/CHANGELOG.md +++ b/packages/package_info/CHANGELOG.md @@ -1,7 +1,3 @@ -## 2.0.1 - -* Add `implements` to pubspec.yaml. - ## 2.0.0 * Migrate to null safety. diff --git a/packages/package_info/pubspec.yaml b/packages/package_info/pubspec.yaml index ae9ca8c55887..2769af1f83d5 100644 --- a/packages/package_info/pubspec.yaml +++ b/packages/package_info/pubspec.yaml @@ -2,7 +2,7 @@ name: package_info description: Flutter plugin for querying information about the application package, such as CFBundleVersion on iOS or versionCode on Android. homepage: https://github.com/flutter/plugins/tree/master/packages/package_info -version: 2.0.1 +version: 2.0.0 flutter: plugin: @@ -13,7 +13,6 @@ flutter: ios: pluginClass: FLTPackageInfoPlugin macos: - default_package: package_info pluginClass: FLTPackageInfoPlugin dependencies: diff --git a/packages/url_launcher/url_launcher_macos/CHANGELOG.md b/packages/url_launcher/url_launcher_macos/CHANGELOG.md index 0c17ade63ce6..6b0820fd5588 100644 --- a/packages/url_launcher/url_launcher_macos/CHANGELOG.md +++ b/packages/url_launcher/url_launcher_macos/CHANGELOG.md @@ -1,7 +1,3 @@ -## 2.0.1 - -* Set `implementation` in pubspec.yaml - ## 2.0.0 * Migrate to null safety. From fe65ba5057a29a387c230f169f907c703c71c5fb Mon Sep 17 00:00:00 2001 From: Emmanuel Garcia Date: Tue, 23 Feb 2021 12:29:22 -0800 Subject: [PATCH 10/18] Linter --- .../example/integration_test/shared_preferences_test.dart | 2 +- .../shared_preferences_windows/example/lib/main.dart | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/shared_preferences/shared_preferences_linux/example/integration_test/shared_preferences_test.dart b/packages/shared_preferences/shared_preferences_linux/example/integration_test/shared_preferences_test.dart index 0969faca6f2e..d7f719898bf4 100644 --- a/packages/shared_preferences/shared_preferences_linux/example/integration_test/shared_preferences_test.dart +++ b/packages/shared_preferences/shared_preferences_linux/example/integration_test/shared_preferences_test.dart @@ -32,7 +32,7 @@ void main() { SharedPreferencesLinux preferences; - setUp(() async { + setUp(() { preferences = SharedPreferencesLinux(); }); diff --git a/packages/shared_preferences/shared_preferences_windows/example/lib/main.dart b/packages/shared_preferences/shared_preferences_windows/example/lib/main.dart index 179604d64bab..dd53cfd7b3e9 100644 --- a/packages/shared_preferences/shared_preferences_windows/example/lib/main.dart +++ b/packages/shared_preferences/shared_preferences_windows/example/lib/main.dart @@ -8,7 +8,6 @@ import 'dart:async'; import 'package:flutter/material.dart'; import 'package:shared_preferences_platform_interface/shared_preferences_platform_interface.dart'; -import 'package:shared_preferences_windows/shared_preferences_windows.dart'; void main() { runApp(MyApp()); From 6e6d3abcf08c331d289fc646c8da97e090e33007 Mon Sep 17 00:00:00 2001 From: Emmanuel Garcia Date: Tue, 23 Feb 2021 14:14:29 -0800 Subject: [PATCH 11/18] Remove manual registration --- .../path_provider/lib/path_provider.dart | 38 ++++--------------- .../lib/shared_preferences.dart | 31 +++------------ .../flutter/generated_plugin_registrant.cc | 4 +- 3 files changed, 16 insertions(+), 57 deletions(-) diff --git a/packages/path_provider/path_provider/lib/path_provider.dart b/packages/path_provider/path_provider/lib/path_provider.dart index da9c0b3d48a3..d431ac35cd88 100644 --- a/packages/path_provider/path_provider/lib/path_provider.dart +++ b/packages/path_provider/path_provider/lib/path_provider.dart @@ -18,8 +18,6 @@ export 'package:path_provider_platform_interface/path_provider_platform_interfac @Deprecated('This is no longer necessary, and is now a no-op') set disablePathProviderPlatformOverride(bool override) {} -bool _manualDartRegistrationNeeded = true; - /// An exception thrown when a directory that should always be available on /// the current platform cannot be obtained. class MissingPlatformDirectoryException implements Exception { @@ -41,26 +39,6 @@ class MissingPlatformDirectoryException implements Exception { } } -PathProviderPlatform get _platform { - // This is to manually endorse Dart implementations until automatic - // registration of Dart plugins is implemented. For details see - // https://github.com/flutter/flutter/issues/52267. - if (_manualDartRegistrationNeeded) { - // Only do the initial registration if it hasn't already been overridden - // with a non-default instance. - if (!kIsWeb && PathProviderPlatform.instance is MethodChannelPathProvider) { - if (Platform.isLinux) { - PathProviderPlatform.instance = PathProviderLinux(); - } else if (Platform.isWindows) { - PathProviderPlatform.instance = PathProviderWindows(); - } - } - _manualDartRegistrationNeeded = false; - } - - return PathProviderPlatform.instance; -} - /// Path to the temporary directory on the device that is not backed up and is /// suitable for storing caches of downloaded files. /// @@ -76,7 +54,7 @@ PathProviderPlatform get _platform { /// Throws a `MissingPlatformDirectoryException` if the system is unable to /// provide the directory. Future getTemporaryDirectory() async { - final String? path = await _platform.getTemporaryPath(); + final String? path = await PathProviderPlatform.instance.getTemporaryPath(); if (path == null) { throw MissingPlatformDirectoryException( 'Unable to get temporary directory'); @@ -98,7 +76,7 @@ Future getTemporaryDirectory() async { /// Throws a `MissingPlatformDirectoryException` if the system is unable to /// provide the directory. Future getApplicationSupportDirectory() async { - final String? path = await _platform.getApplicationSupportPath(); + final String? path = await PathProviderPlatform.instance.getApplicationSupportPath(); if (path == null) { throw MissingPlatformDirectoryException( 'Unable to get application support directory'); @@ -116,7 +94,7 @@ Future getApplicationSupportDirectory() async { /// Throws a `MissingPlatformDirectoryException` if the system is unable to /// provide the directory on a supported platform. Future getLibraryDirectory() async { - final String? path = await _platform.getLibraryPath(); + final String? path = await PathProviderPlatform.instance.getLibraryPath(); if (path == null) { throw MissingPlatformDirectoryException('Unable to get library directory'); } @@ -136,7 +114,7 @@ Future getLibraryDirectory() async { /// Throws a `MissingPlatformDirectoryException` if the system is unable to /// provide the directory. Future getApplicationDocumentsDirectory() async { - final String? path = await _platform.getApplicationDocumentsPath(); + final String? path = await PathProviderPlatform.instance.getApplicationDocumentsPath(); if (path == null) { throw MissingPlatformDirectoryException( 'Unable to get application documents directory'); @@ -153,7 +131,7 @@ Future getApplicationDocumentsDirectory() async { /// /// On Android this uses the `getExternalFilesDir(null)`. Future getExternalStorageDirectory() async { - final String? path = await _platform.getExternalStoragePath(); + final String? path = await PathProviderPlatform.instance.getExternalStoragePath(); if (path == null) { return null; } @@ -174,7 +152,7 @@ Future getExternalStorageDirectory() async { /// On Android this returns Context.getExternalCacheDirs() or /// Context.getExternalCacheDir() on API levels below 19. Future?> getExternalCacheDirectories() async { - final List? paths = await _platform.getExternalCachePaths(); + final List? paths = await PathProviderPlatform.instance.getExternalCachePaths(); if (paths == null) { return null; } @@ -200,7 +178,7 @@ Future?> getExternalStorageDirectories({ StorageDirectory? type, }) async { final List? paths = - await _platform.getExternalStoragePaths(type: type); + await PathProviderPlatform.instance.getExternalStoragePaths(type: type); if (paths == null) { return null; } @@ -214,7 +192,7 @@ Future?> getExternalStorageDirectories({ /// On Android and on iOS, this function throws an [UnsupportedError] as no equivalent /// path exists. Future getDownloadsDirectory() async { - final String? path = await _platform.getDownloadsPath(); + final String? path = await PathProviderPlatform.instance.getDownloadsPath(); if (path == null) { return null; } diff --git a/packages/shared_preferences/shared_preferences/lib/shared_preferences.dart b/packages/shared_preferences/shared_preferences/lib/shared_preferences.dart index 2f4ebe730351..ac1f1b4d79ab 100644 --- a/packages/shared_preferences/shared_preferences/lib/shared_preferences.dart +++ b/packages/shared_preferences/shared_preferences/lib/shared_preferences.dart @@ -23,28 +23,6 @@ class SharedPreferences { static Completer? _completer; static bool _manualDartRegistrationNeeded = true; - static SharedPreferencesStorePlatform get _store { - // This is to manually endorse the Linux implementation until automatic - // registration of dart plugins is implemented. For details see - // https://github.com/flutter/flutter/issues/52267. - if (_manualDartRegistrationNeeded) { - // Only do the initial registration if it hasn't already been overridden - // with a non-default instance. - if (!kIsWeb && - SharedPreferencesStorePlatform.instance - is MethodChannelSharedPreferencesStore) { - if (Platform.isLinux) { - SharedPreferencesStorePlatform.instance = SharedPreferencesLinux(); - } else if (Platform.isWindows) { - SharedPreferencesStorePlatform.instance = SharedPreferencesWindows(); - } - } - _manualDartRegistrationNeeded = false; - } - - return SharedPreferencesStorePlatform.instance; - } - /// Loads and parses the [SharedPreferences] for this app from disk. /// /// Because this is reading from disk, it shouldn't be awaited in @@ -140,7 +118,7 @@ class SharedPreferences { Future remove(String key) { final String prefixedKey = '$_prefix$key'; _preferenceCache.remove(key); - return _store.remove(prefixedKey); + return SharedPreferencesStorePlatform.instance.remove(prefixedKey); } Future _setValue(String valueType, String key, Object value) { @@ -152,7 +130,7 @@ class SharedPreferences { } else { _preferenceCache[key] = value; } - return _store.setValue(valueType, prefixedKey, value); + return SharedPreferencesStorePlatform.instance.setValue(valueType, prefixedKey, value); } /// Always returns true. @@ -163,7 +141,7 @@ class SharedPreferences { /// Completes with true once the user preferences for the app has been cleared. Future clear() { _preferenceCache.clear(); - return _store.clear(); + return SharedPreferencesStorePlatform.instance.clear(); } /// Fetches the latest values from the host platform. @@ -178,7 +156,8 @@ class SharedPreferences { } static Future> _getSharedPreferencesMap() async { - final Map fromSystem = await _store.getAll(); + final Map fromSystem = + await SharedPreferencesStorePlatform.instance.getAll(); assert(fromSystem != null); // Strip the flutter. prefix from the returned preferences. final Map preferencesMap = {}; diff --git a/packages/shared_preferences/shared_preferences_windows/example/windows/flutter/generated_plugin_registrant.cc b/packages/shared_preferences/shared_preferences_windows/example/windows/flutter/generated_plugin_registrant.cc index a6177ab0b72b..4bfa0f3a3a75 100644 --- a/packages/shared_preferences/shared_preferences_windows/example/windows/flutter/generated_plugin_registrant.cc +++ b/packages/shared_preferences/shared_preferences_windows/example/windows/flutter/generated_plugin_registrant.cc @@ -4,4 +4,6 @@ #include "generated_plugin_registrant.h" -void RegisterPlugins(flutter::PluginRegistry* registry) {} + +void RegisterPlugins(flutter::PluginRegistry* registry) { +} From 730b6ccd828d53bcf75d0f113c2d5169058ed338 Mon Sep 17 00:00:00 2001 From: Emmanuel Garcia Date: Tue, 23 Feb 2021 15:25:06 -0800 Subject: [PATCH 12/18] Dependency overrides --- packages/path_provider/path_provider/pubspec.yaml | 9 +++++++++ .../shared_preferences/shared_preferences/pubspec.yaml | 10 ++++++++++ .../windows/flutter/generated_plugin_registrant.cc | 4 +--- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/packages/path_provider/path_provider/pubspec.yaml b/packages/path_provider/path_provider/pubspec.yaml index 81941dac67b1..8d03a507bce0 100644 --- a/packages/path_provider/path_provider/pubspec.yaml +++ b/packages/path_provider/path_provider/pubspec.yaml @@ -26,6 +26,15 @@ dependencies: path_provider_linux: ^2.0.0 path_provider_windows: ^2.0.0 +# TODO(egarciad): Bump dependencies above and remove the overrides. +dependency_overrides: + path_provider_macos: + path: ../path_provider_macos + path_provider_linux: + path: ../path_provider_linux + path_provider_windows: + path: ../path_provider_windows + dev_dependencies: integration_test: path: ../../integration_test diff --git a/packages/shared_preferences/shared_preferences/pubspec.yaml b/packages/shared_preferences/shared_preferences/pubspec.yaml index 583600d6a78b..9a0c6176272b 100644 --- a/packages/shared_preferences/shared_preferences/pubspec.yaml +++ b/packages/shared_preferences/shared_preferences/pubspec.yaml @@ -34,6 +34,16 @@ dependencies: shared_preferences_web: ^2.0.0 shared_preferences_windows: ^2.0.0 +# TODO(egarciad): Bump dependencies above and remove the overrides. +dependency_overrides: + shared_preferences_linux: + path: ../shared_preferences_linux + shared_preferences_macos: + path: ../shared_preferences_macos + shared_preferences_windows: + path: ../shared_preferences_windows + + dev_dependencies: flutter_test: sdk: flutter diff --git a/packages/shared_preferences/shared_preferences_windows/example/windows/flutter/generated_plugin_registrant.cc b/packages/shared_preferences/shared_preferences_windows/example/windows/flutter/generated_plugin_registrant.cc index 4bfa0f3a3a75..a6177ab0b72b 100644 --- a/packages/shared_preferences/shared_preferences_windows/example/windows/flutter/generated_plugin_registrant.cc +++ b/packages/shared_preferences/shared_preferences_windows/example/windows/flutter/generated_plugin_registrant.cc @@ -4,6 +4,4 @@ #include "generated_plugin_registrant.h" - -void RegisterPlugins(flutter::PluginRegistry* registry) { -} +void RegisterPlugins(flutter::PluginRegistry* registry) {} From 1fe6814ad54e3cad0234b9a0107f24e27e26fa0e Mon Sep 17 00:00:00 2001 From: Emmanuel Garcia Date: Tue, 23 Feb 2021 16:51:54 -0800 Subject: [PATCH 13/18] Fixes and new tests --- .../integration_test/path_provider_test.dart | 11 ++++++ .../path_provider/example/pubspec.yaml | 9 +++++ .../path_provider/lib/path_provider.dart | 19 +++++----- .../path_provider/path_provider/pubspec.yaml | 9 ----- .../lib/src/path_provider_windows_stub.dart | 5 +++ .../shared_preferences/example/pubspec.yaml | 9 +++++ .../lib/shared_preferences.dart | 9 +---- .../shared_preferences/pubspec.yaml | 10 ----- .../shared_preferences_test.dart | 4 +- .../shared_preferences_test.dart | 37 +++++++++++++------ 10 files changed, 74 insertions(+), 48 deletions(-) diff --git a/packages/path_provider/path_provider/example/integration_test/path_provider_test.dart b/packages/path_provider/path_provider/example/integration_test/path_provider_test.dart index 2b12c82f959b..977c65609ba3 100644 --- a/packages/path_provider/path_provider/example/integration_test/path_provider_test.dart +++ b/packages/path_provider/path_provider/example/integration_test/path_provider_test.dart @@ -9,11 +9,22 @@ import 'dart:async'; import 'dart:io'; import 'package:flutter_test/flutter_test.dart'; import 'package:path_provider/path_provider.dart'; +import 'package:path_provider_platform_interface/path_provider_platform_interface.dart'; +import 'package:path_provider_linux/path_provider_linux.dart'; +import 'package:path_provider_windows/path_provider_windows.dart'; import 'package:integration_test/integration_test.dart'; void main() { IntegrationTestWidgetsFlutterBinding.ensureInitialized(); + test('path provider instance on Windows', () { + expect(PathProviderPlatform.instance, isA()); + }, skip: !Platform.isWindows); + + test('path provider instance on Linux', () { + expect(PathProviderPlatform.instance, isA()); + }, skip: !Platform.isLinux); + testWidgets('getTemporaryDirectory', (WidgetTester tester) async { final Directory result = await getTemporaryDirectory(); _verifySampleFile(result, 'temporaryDirectory'); diff --git a/packages/path_provider/path_provider/example/pubspec.yaml b/packages/path_provider/path_provider/example/pubspec.yaml index 68c751a81843..c6c5931ff254 100644 --- a/packages/path_provider/path_provider/example/pubspec.yaml +++ b/packages/path_provider/path_provider/example/pubspec.yaml @@ -12,6 +12,15 @@ dependencies: # the parent directory to use the current plugin's version. path: ../ +# TODO(egarciad): Remove the overrides once the packages are published. +dependency_overrides: + path_provider_macos: + path: ../../path_provider_macos + path_provider_linux: + path: ../../path_provider_linux + path_provider_windows: + path: ../../path_provider_windows + dev_dependencies: integration_test: path: ../../../integration_test diff --git a/packages/path_provider/path_provider/lib/path_provider.dart b/packages/path_provider/path_provider/lib/path_provider.dart index d431ac35cd88..7c21d707ffa9 100644 --- a/packages/path_provider/path_provider/lib/path_provider.dart +++ b/packages/path_provider/path_provider/lib/path_provider.dart @@ -3,13 +3,10 @@ // found in the LICENSE file. import 'dart:async'; -import 'dart:io' show Directory, Platform; +import 'dart:io' show Directory; -import 'package:flutter/foundation.dart' show kIsWeb, visibleForTesting; -import 'package:path_provider_linux/path_provider_linux.dart'; -import 'package:path_provider_windows/path_provider_windows.dart'; +import 'package:flutter/foundation.dart' show visibleForTesting; import 'package:path_provider_platform_interface/path_provider_platform_interface.dart'; -import 'package:path_provider_platform_interface/src/method_channel_path_provider.dart'; export 'package:path_provider_platform_interface/path_provider_platform_interface.dart' show StorageDirectory; @@ -76,7 +73,8 @@ Future getTemporaryDirectory() async { /// Throws a `MissingPlatformDirectoryException` if the system is unable to /// provide the directory. Future getApplicationSupportDirectory() async { - final String? path = await PathProviderPlatform.instance.getApplicationSupportPath(); + final String? path = + await PathProviderPlatform.instance.getApplicationSupportPath(); if (path == null) { throw MissingPlatformDirectoryException( 'Unable to get application support directory'); @@ -114,7 +112,8 @@ Future getLibraryDirectory() async { /// Throws a `MissingPlatformDirectoryException` if the system is unable to /// provide the directory. Future getApplicationDocumentsDirectory() async { - final String? path = await PathProviderPlatform.instance.getApplicationDocumentsPath(); + final String? path = + await PathProviderPlatform.instance.getApplicationDocumentsPath(); if (path == null) { throw MissingPlatformDirectoryException( 'Unable to get application documents directory'); @@ -131,7 +130,8 @@ Future getApplicationDocumentsDirectory() async { /// /// On Android this uses the `getExternalFilesDir(null)`. Future getExternalStorageDirectory() async { - final String? path = await PathProviderPlatform.instance.getExternalStoragePath(); + final String? path = + await PathProviderPlatform.instance.getExternalStoragePath(); if (path == null) { return null; } @@ -152,7 +152,8 @@ Future getExternalStorageDirectory() async { /// On Android this returns Context.getExternalCacheDirs() or /// Context.getExternalCacheDir() on API levels below 19. Future?> getExternalCacheDirectories() async { - final List? paths = await PathProviderPlatform.instance.getExternalCachePaths(); + final List? paths = + await PathProviderPlatform.instance.getExternalCachePaths(); if (paths == null) { return null; } diff --git a/packages/path_provider/path_provider/pubspec.yaml b/packages/path_provider/path_provider/pubspec.yaml index 8d03a507bce0..81941dac67b1 100644 --- a/packages/path_provider/path_provider/pubspec.yaml +++ b/packages/path_provider/path_provider/pubspec.yaml @@ -26,15 +26,6 @@ dependencies: path_provider_linux: ^2.0.0 path_provider_windows: ^2.0.0 -# TODO(egarciad): Bump dependencies above and remove the overrides. -dependency_overrides: - path_provider_macos: - path: ../path_provider_macos - path_provider_linux: - path: ../path_provider_linux - path_provider_windows: - path: ../path_provider_windows - dev_dependencies: integration_test: path: ../../integration_test diff --git a/packages/path_provider/path_provider_windows/lib/src/path_provider_windows_stub.dart b/packages/path_provider/path_provider_windows/lib/src/path_provider_windows_stub.dart index 1a0e84e8f0da..f2048983ad52 100644 --- a/packages/path_provider/path_provider_windows/lib/src/path_provider_windows_stub.dart +++ b/packages/path_provider/path_provider_windows/lib/src/path_provider_windows_stub.dart @@ -12,6 +12,11 @@ import 'package:path_provider_platform_interface/path_provider_platform_interfac /// path_provider will also depend on path_provider_windows, not just at the /// pubspec level but the code level. class PathProviderWindows extends PathProviderPlatform { + /// Registers the Windows implementation. + static void registerWith() { + PathProviderPlatform.instance = PathProviderWindows(); + } + /// Errors on attempted instantiation of the stub. It exists only to satisfy /// compile-time dependencies, and should never actually be created. PathProviderWindows() { diff --git a/packages/shared_preferences/shared_preferences/example/pubspec.yaml b/packages/shared_preferences/shared_preferences/example/pubspec.yaml index 84692d76e5a1..b4579efd06c0 100644 --- a/packages/shared_preferences/shared_preferences/example/pubspec.yaml +++ b/packages/shared_preferences/shared_preferences/example/pubspec.yaml @@ -19,6 +19,15 @@ dev_dependencies: path: ../../../integration_test pedantic: ^1.10.0 +# TODO(egarciad): Bump dependencies above and remove the overrides. +dependency_overrides: + shared_preferences_linux: + path: ../../shared_preferences_linux + shared_preferences_macos: + path: ../../shared_preferences_macos + shared_preferences_windows: + path: ../../shared_preferences_windows + flutter: uses-material-design: true diff --git a/packages/shared_preferences/shared_preferences/lib/shared_preferences.dart b/packages/shared_preferences/shared_preferences/lib/shared_preferences.dart index ac1f1b4d79ab..5342951efde8 100644 --- a/packages/shared_preferences/shared_preferences/lib/shared_preferences.dart +++ b/packages/shared_preferences/shared_preferences/lib/shared_preferences.dart @@ -3,14 +3,9 @@ // found in the LICENSE file. import 'dart:async'; -import 'dart:io' show Platform; -import 'package:flutter/foundation.dart' show kIsWeb; import 'package:meta/meta.dart'; -import 'package:shared_preferences_linux/shared_preferences_linux.dart'; -import 'package:shared_preferences_platform_interface/method_channel_shared_preferences.dart'; import 'package:shared_preferences_platform_interface/shared_preferences_platform_interface.dart'; -import 'package:shared_preferences_windows/shared_preferences_windows.dart'; /// Wraps NSUserDefaults (on iOS) and SharedPreferences (on Android), providing /// a persistent store for simple data. @@ -21,7 +16,6 @@ class SharedPreferences { static const String _prefix = 'flutter.'; static Completer? _completer; - static bool _manualDartRegistrationNeeded = true; /// Loads and parses the [SharedPreferences] for this app from disk. /// @@ -130,7 +124,8 @@ class SharedPreferences { } else { _preferenceCache[key] = value; } - return SharedPreferencesStorePlatform.instance.setValue(valueType, prefixedKey, value); + return SharedPreferencesStorePlatform.instance + .setValue(valueType, prefixedKey, value); } /// Always returns true. diff --git a/packages/shared_preferences/shared_preferences/pubspec.yaml b/packages/shared_preferences/shared_preferences/pubspec.yaml index 9a0c6176272b..583600d6a78b 100644 --- a/packages/shared_preferences/shared_preferences/pubspec.yaml +++ b/packages/shared_preferences/shared_preferences/pubspec.yaml @@ -34,16 +34,6 @@ dependencies: shared_preferences_web: ^2.0.0 shared_preferences_windows: ^2.0.0 -# TODO(egarciad): Bump dependencies above and remove the overrides. -dependency_overrides: - shared_preferences_linux: - path: ../shared_preferences_linux - shared_preferences_macos: - path: ../shared_preferences_macos - shared_preferences_windows: - path: ../shared_preferences_windows - - dev_dependencies: flutter_test: sdk: flutter diff --git a/packages/shared_preferences/shared_preferences_linux/example/integration_test/shared_preferences_test.dart b/packages/shared_preferences/shared_preferences_linux/example/integration_test/shared_preferences_test.dart index d7f719898bf4..a861c06a365e 100644 --- a/packages/shared_preferences/shared_preferences_linux/example/integration_test/shared_preferences_test.dart +++ b/packages/shared_preferences/shared_preferences_linux/example/integration_test/shared_preferences_test.dart @@ -36,8 +36,8 @@ void main() { preferences = SharedPreferencesLinux(); }); - tearDown(() { - preferences.clear(); + tearDown(() async { + await preferences.clear(); }); testWidgets('reading', (WidgetTester _) async { diff --git a/packages/shared_preferences/shared_preferences_windows/example/integration_test/shared_preferences_test.dart b/packages/shared_preferences/shared_preferences_windows/example/integration_test/shared_preferences_test.dart index 0e1fde4aed98..5f543a61340e 100644 --- a/packages/shared_preferences/shared_preferences_windows/example/integration_test/shared_preferences_test.dart +++ b/packages/shared_preferences/shared_preferences_windows/example/integration_test/shared_preferences_test.dart @@ -4,7 +4,6 @@ // @dart=2.9 -import 'dart:async'; import 'package:flutter_test/flutter_test.dart'; import 'package:shared_preferences_windows/shared_preferences_windows.dart'; import 'package:integration_test/integration_test.dart'; @@ -31,12 +30,12 @@ void main() { SharedPreferencesWindows preferences; - setUp(() async { + setUp(() { preferences = SharedPreferencesWindows(); }); - tearDown(() { - preferences.clear(); + tearDown(() async { + expect(await preferences.clear(), isTrue); }); testWidgets('reading', (WidgetTester _) async { @@ -49,15 +48,31 @@ void main() { }); testWidgets('writing', (WidgetTester _) async { - await Future.wait(>[ - preferences.setValue( + expect( + await preferences.setValue( 'String', 'String', kTestValues2['flutter.String']), - preferences.setValue('Bool', 'bool', kTestValues2['flutter.bool']), - preferences.setValue('Int', 'int', kTestValues2['flutter.int']), - preferences.setValue( + isTrue, + ); + expect( + await preferences.setValue( + 'Bool', 'bool', kTestValues2['flutter.bool']), + isTrue, + ); + expect( + await preferences.setValue('Int', 'int', kTestValues2['flutter.int']), + isTrue, + ); + expect( + await preferences.setValue( 'Double', 'double', kTestValues2['flutter.double']), - preferences.setValue('StringList', 'List', kTestValues2['flutter.List']) - ]); + isTrue, + ); + expect( + await preferences.setValue( + 'StringList', 'List', kTestValues2['flutter.List']), + isTrue, + ); + final Map values = await preferences.getAll(); expect(values['String'], kTestValues2['flutter.String']); expect(values['bool'], kTestValues2['flutter.bool']); From 9e039276c4c7cd81bf61bcf269f9ce58385e6c95 Mon Sep 17 00:00:00 2001 From: Emmanuel Garcia Date: Tue, 27 Apr 2021 15:03:57 -0700 Subject: [PATCH 14/18] Analyzer --- .../path_provider/path_provider/lib/path_provider.dart | 8 ++------ .../lib/src/path_provider_windows_stub.dart | 8 ++++---- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/packages/path_provider/path_provider/lib/path_provider.dart b/packages/path_provider/path_provider/lib/path_provider.dart index 38d3ae3296b8..9cd88324639e 100644 --- a/packages/path_provider/path_provider/lib/path_provider.dart +++ b/packages/path_provider/path_provider/lib/path_provider.dart @@ -3,14 +3,10 @@ // found in the LICENSE file. import 'dart:async'; -import 'dart:io' show Directory, Platform; +import 'dart:io' show Directory; -import 'package:flutter/foundation.dart' show kIsWeb, visibleForTesting; -import 'package:path_provider_linux/path_provider_linux.dart'; +import 'package:flutter/foundation.dart' show visibleForTesting; import 'package:path_provider_platform_interface/path_provider_platform_interface.dart'; -// ignore: implementation_imports -import 'package:path_provider_platform_interface/src/method_channel_path_provider.dart'; -import 'package:path_provider_windows/path_provider_windows.dart'; export 'package:path_provider_platform_interface/path_provider_platform_interface.dart' show StorageDirectory; diff --git a/packages/path_provider/path_provider_windows/lib/src/path_provider_windows_stub.dart b/packages/path_provider/path_provider_windows/lib/src/path_provider_windows_stub.dart index 8912ee6cbd90..bc851831bf54 100644 --- a/packages/path_provider/path_provider_windows/lib/src/path_provider_windows_stub.dart +++ b/packages/path_provider/path_provider_windows/lib/src/path_provider_windows_stub.dart @@ -12,15 +12,15 @@ import 'package:path_provider_platform_interface/path_provider_platform_interfac /// path_provider will also depend on path_provider_windows, not just at the /// pubspec level but the code level. class PathProviderWindows extends PathProviderPlatform { + /// Errors on attempted instantiation of the stub. It exists only to satisfy + /// compile-time dependencies, and should never actually be created. + PathProviderWindows() : assert(false); + /// Registers the Windows implementation. static void registerWith() { PathProviderPlatform.instance = PathProviderWindows(); } - /// Errors on attempted instantiation of the stub. It exists only to satisfy - /// compile-time dependencies, and should never actually be created. - PathProviderWindows() : assert(false); - /// Stub; see comment on VersionInfoQuerier. VersionInfoQuerier versionInfoQuerier = VersionInfoQuerier(); From 17937625bd8467530e221bf200383c46877eda7e Mon Sep 17 00:00:00 2001 From: Emmanuel Garcia Date: Tue, 27 Apr 2021 15:52:50 -0700 Subject: [PATCH 15/18] Fix test --- .../example/integration_test/shared_preferences_test.dart | 8 +++++--- .../example/integration_test/shared_preferences_test.dart | 2 +- .../example/integration_test/shared_preferences_test.dart | 7 ++++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/packages/shared_preferences/shared_preferences_linux/example/integration_test/shared_preferences_test.dart b/packages/shared_preferences/shared_preferences_linux/example/integration_test/shared_preferences_test.dart index 0f4cbb2bee62..42fe7854c860 100644 --- a/packages/shared_preferences/shared_preferences_linux/example/integration_test/shared_preferences_test.dart +++ b/packages/shared_preferences/shared_preferences_linux/example/integration_test/shared_preferences_test.dart @@ -8,7 +8,7 @@ import 'dart:async'; import 'package:flutter_test/flutter_test.dart'; import 'package:integration_test/integration_test.dart'; -import 'package:shared_preferences_linux/shared_preferences_linux.dart'; +import 'package:shared_preferences_platform_interface/shared_preferences_platform_interface.dart'; void main() { IntegrationTestWidgetsFlutterBinding.ensureInitialized(); @@ -30,10 +30,12 @@ void main() { 'flutter.List': ['baz', 'quox'], }; - SharedPreferencesLinux preferences; + + SharedPreferencesStorePlatform preferences; setUp(() { - preferences = SharedPreferencesLinux(); + preferences = SharedPreferencesStorePlatform.instance; + expect(preferences.runtimeType.toString(), equals('SharedPreferencesLinux')); }); tearDown(() async { diff --git a/packages/shared_preferences/shared_preferences_macos/example/integration_test/shared_preferences_test.dart b/packages/shared_preferences/shared_preferences_macos/example/integration_test/shared_preferences_test.dart index 722aee3da50a..295689a1d33f 100644 --- a/packages/shared_preferences/shared_preferences_macos/example/integration_test/shared_preferences_test.dart +++ b/packages/shared_preferences/shared_preferences_macos/example/integration_test/shared_preferences_test.dart @@ -31,7 +31,7 @@ void main() { SharedPreferencesStorePlatform preferences; - setUp(() async { + setUp(() { preferences = SharedPreferencesStorePlatform.instance; }); diff --git a/packages/shared_preferences/shared_preferences_windows/example/integration_test/shared_preferences_test.dart b/packages/shared_preferences/shared_preferences_windows/example/integration_test/shared_preferences_test.dart index e87a77d7aea8..8b07dbb87bf0 100644 --- a/packages/shared_preferences/shared_preferences_windows/example/integration_test/shared_preferences_test.dart +++ b/packages/shared_preferences/shared_preferences_windows/example/integration_test/shared_preferences_test.dart @@ -5,8 +5,8 @@ // @dart=2.9 import 'package:flutter_test/flutter_test.dart'; -import 'package:shared_preferences_windows/shared_preferences_windows.dart'; import 'package:integration_test/integration_test.dart'; +import 'package:shared_preferences_platform_interface/shared_preferences_platform_interface.dart'; void main() { IntegrationTestWidgetsFlutterBinding.ensureInitialized(); @@ -28,10 +28,11 @@ void main() { 'flutter.List': ['baz', 'quox'], }; - SharedPreferencesWindows preferences; + SharedPreferencesStorePlatform preferences; setUp(() { - preferences = SharedPreferencesWindows(); + preferences = SharedPreferencesStorePlatform.instance; + expect(preferences.runtimeType.toString(), equals('SharedPreferencesWindows')); }); tearDown(() async { From 7a76dbf75a2615f8bd909ef1a5dbc8202d3b2c50 Mon Sep 17 00:00:00 2001 From: Emmanuel Garcia Date: Tue, 27 Apr 2021 18:26:44 -0700 Subject: [PATCH 16/18] Format --- .../example/integration_test/shared_preferences_test.dart | 4 ++-- .../example/integration_test/shared_preferences_test.dart | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/shared_preferences/shared_preferences_linux/example/integration_test/shared_preferences_test.dart b/packages/shared_preferences/shared_preferences_linux/example/integration_test/shared_preferences_test.dart index 42fe7854c860..d9a6ad3c1d1f 100644 --- a/packages/shared_preferences/shared_preferences_linux/example/integration_test/shared_preferences_test.dart +++ b/packages/shared_preferences/shared_preferences_linux/example/integration_test/shared_preferences_test.dart @@ -30,12 +30,12 @@ void main() { 'flutter.List': ['baz', 'quox'], }; - SharedPreferencesStorePlatform preferences; setUp(() { preferences = SharedPreferencesStorePlatform.instance; - expect(preferences.runtimeType.toString(), equals('SharedPreferencesLinux')); + expect( + preferences.runtimeType.toString(), equals('SharedPreferencesLinux')); }); tearDown(() async { diff --git a/packages/shared_preferences/shared_preferences_windows/example/integration_test/shared_preferences_test.dart b/packages/shared_preferences/shared_preferences_windows/example/integration_test/shared_preferences_test.dart index 8b07dbb87bf0..2531b3048192 100644 --- a/packages/shared_preferences/shared_preferences_windows/example/integration_test/shared_preferences_test.dart +++ b/packages/shared_preferences/shared_preferences_windows/example/integration_test/shared_preferences_test.dart @@ -32,7 +32,8 @@ void main() { setUp(() { preferences = SharedPreferencesStorePlatform.instance; - expect(preferences.runtimeType.toString(), equals('SharedPreferencesWindows')); + expect(preferences.runtimeType.toString(), + equals('SharedPreferencesWindows')); }); tearDown(() async { From 83d80698d8966d80778b4b561adb677d1f86aaa2 Mon Sep 17 00:00:00 2001 From: Emmanuel Garcia Date: Tue, 27 Apr 2021 18:57:37 -0700 Subject: [PATCH 17/18] Test instance type --- .../path_provider/path_provider/lib/path_provider.dart | 5 +++++ .../example/integration_test/shared_preferences_test.dart | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/path_provider/path_provider/lib/path_provider.dart b/packages/path_provider/path_provider/lib/path_provider.dart index 9cd88324639e..838d7d54c997 100644 --- a/packages/path_provider/path_provider/lib/path_provider.dart +++ b/packages/path_provider/path_provider/lib/path_provider.dart @@ -36,6 +36,11 @@ class MissingPlatformDirectoryException implements Exception { } } +void main() { + +} + + /// Path to the temporary directory on the device that is not backed up and is /// suitable for storing caches of downloaded files. /// diff --git a/packages/shared_preferences/shared_preferences_linux/example/integration_test/shared_preferences_test.dart b/packages/shared_preferences/shared_preferences_linux/example/integration_test/shared_preferences_test.dart index d9a6ad3c1d1f..4763c4d669e0 100644 --- a/packages/shared_preferences/shared_preferences_linux/example/integration_test/shared_preferences_test.dart +++ b/packages/shared_preferences/shared_preferences_linux/example/integration_test/shared_preferences_test.dart @@ -8,6 +8,7 @@ import 'dart:async'; import 'package:flutter_test/flutter_test.dart'; import 'package:integration_test/integration_test.dart'; +import 'package:shared_preferences_linux/shared_preferences_linux.dart'; import 'package:shared_preferences_platform_interface/shared_preferences_platform_interface.dart'; void main() { @@ -34,14 +35,16 @@ void main() { setUp(() { preferences = SharedPreferencesStorePlatform.instance; - expect( - preferences.runtimeType.toString(), equals('SharedPreferencesLinux')); }); tearDown(() async { await preferences.clear(); }); + test('instance is Linux implementation', () { + expect(preferences, isA()); + }); + testWidgets('reading', (WidgetTester _) async { final all = await preferences.getAll(); expect(all['String'], isNull); From cc1275fae9e1bcf21f7c1714ffc433243a80de12 Mon Sep 17 00:00:00 2001 From: Emmanuel Garcia Date: Tue, 27 Apr 2021 19:19:28 -0700 Subject: [PATCH 18/18] Format --- packages/path_provider/path_provider/lib/path_provider.dart | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/path_provider/path_provider/lib/path_provider.dart b/packages/path_provider/path_provider/lib/path_provider.dart index 838d7d54c997..d00bd3ec0333 100644 --- a/packages/path_provider/path_provider/lib/path_provider.dart +++ b/packages/path_provider/path_provider/lib/path_provider.dart @@ -36,10 +36,7 @@ class MissingPlatformDirectoryException implements Exception { } } -void main() { - -} - +void main() {} /// Path to the temporary directory on the device that is not backed up and is /// suitable for storing caches of downloaded files.