[share_plus] migrate to null safety (#116)

* migrated platform interface

* migrated windows

* migrated web

* migrated linux

* migrated share_plus

* fix tests

* flutter format

* renamed web integration tests to avoid issues with package validation

Author: miquelbeltran

packages/share_plus/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.0.0-nullsafety.0
+
+- Migrated to null safety
+
 ## 1.2.0
 
 - Add Web support (`share_plus_web`)

packages/share_plus/lib/share_plus.dart

@@ -22,7 +22,7 @@ class Share {
   }
 
   static bool _disablePlatformOverride = false;
-  static SharePlatform __platform;
+  static SharePlatform? __platform;
 
   // This is to manually endorse the Linux plugin until automatic registration
   // of dart plugins is implemented.
@@ -38,7 +38,7 @@ class Share {
       }
       __platform ??= SharePlatform.instance;
     }
-    return __platform;
+    return __platform!;
   }
 
   /// Summons the platform's share sheet to share text.
@@ -58,10 +58,9 @@ class Share {
   /// from [MethodChannel].
   static Future<void> share(
     String text, {
-    String subject,
-    Rect sharePositionOrigin,
+    String? subject,
+    Rect? sharePositionOrigin,
   }) {
-    assert(text != null);
     assert(text.isNotEmpty);
     return _platform.share(
       text,
@@ -84,14 +83,13 @@ class Share {
   /// from [MethodChannel].
   static Future<void> shareFiles(
     List<String> paths, {
-    List<String> mimeTypes,
-    String subject,
-    String text,
-    Rect sharePositionOrigin,
+    List<String>? mimeTypes,
+    String? subject,
+    String? text,
+    Rect? sharePositionOrigin,
   }) {
-    assert(paths != null);
     assert(paths.isNotEmpty);
-    assert(paths.every((element) => element != null && element.isNotEmpty));
+    assert(paths.every((element) => element.isNotEmpty));
     return _platform.shareFiles(
       paths,
       mimeTypes: mimeTypes,

packages/share_plus/pubspec.yaml

@@ -1,6 +1,6 @@
 name: share_plus
 description: Flutter plugin for sharing content via the platform share UI, using the ACTION_SEND intent on Android and UIActivityViewController on iOS.
-version: 1.2.0
+version: 2.0.0-nullsafety.0
 homepage: https://plus.fluttercommunity.dev/
 repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/
 
@@ -21,22 +21,19 @@ flutter:
 
 dependencies:
   meta: ^1.0.5
-  mime: ^0.9.7
+  mime: ^1.0.0-nullsafety
   flutter:
     sdk: flutter
-  share_plus_platform_interface: ^1.2.0
-  share_plus_linux: ^1.1.0
-  share_plus_windows: ^0.1.0
-  share_plus_web: ^0.1.0
+  share_plus_platform_interface: ^2.0.0-nullsafety
+  share_plus_linux: ^2.0.0-nullsafety
+  share_plus_windows: ^0.2.0-nullsafety
+  share_plus_web: ^0.2.0-nullsafety
 
 dev_dependencies:
-  test: ^1.3.0
-  mockito: ^3.0.0
   flutter_test:
     sdk: flutter
-  url_launcher: ^5.7.2
   pedantic: ^1.9.2
 
 environment:
-  sdk: ">=2.1.0 <3.0.0"
+  sdk: ">=2.12.0-0 <3.0.0"
   flutter: ">=1.12.13+hotfix.5 <2.0.0"

packages/share_plus_linux/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.0.0-nullsafety.0
+
+- Migrated to null safety
+
 ## 1.1.0
 
 - Transfer to plus-plugins monorepo

packages/share_plus_linux/lib/share_plus_linux.dart

@@ -12,8 +12,8 @@ class ShareLinux extends SharePlatform {
   @override
   Future<void> share(
     String text, {
-    String subject,
-    Rect sharePositionOrigin,
+    String? subject,
+    Rect? sharePositionOrigin,
   }) {
     final uri = Uri.encodeFull('mailto:?subject=$subject&body=$text');
     return launch(uri);
@@ -23,10 +23,10 @@ class ShareLinux extends SharePlatform {
   @override
   Future<void> shareFiles(
     List<String> paths, {
-    List<String> mimeTypes,
-    String subject,
-    String text,
-    Rect sharePositionOrigin,
+    List<String>? mimeTypes,
+    String? subject,
+    String? text,
+    Rect? sharePositionOrigin,
   }) {
     throw UnimplementedError('shareFiles() has not been implemented on Linux.');
   }

packages/share_plus_linux/pubspec.yaml

@@ -1,20 +1,20 @@
 name: share_plus_linux
 description: Linux implementation of the share_plus plugin
-version: 1.1.0
+version: 2.0.0-nullsafety.0
 homepage: https://plus.fluttercommunity.dev/
 repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/
 
 environment:
-  sdk: ">=2.7.0 <3.0.0"
+  sdk: ">=2.12.0-0 <3.0.0"
   flutter: ">=1.17.0 <2.0.0"
 
 dependencies:
-  share_plus_platform_interface: ^1.1.0
-  file: '>=5.2.1 <=6.0.0'
+  share_plus_platform_interface: ^2.0.0-nullsafety
+  file: ^6.0.0-nullsafety
   flutter:
     sdk: flutter
   meta: ^1.2.3
-  url_launcher: ^5.7.2
+  url_launcher: ^6.0.0-nullsafety
 
 dev_dependencies:
   flutter_test:

packages/share_plus_platform_interface/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.0.0-nullsafety.0
+
+- Migrated to null safety
+
 ## 1.2.0
 
 - Rename method channel to avoid conflicts

packages/share_plus_platform_interface/lib/method_channel/method_channel_share.dart

@@ -22,10 +22,9 @@ class MethodChannelShare extends SharePlatform {
   @override
   Future<void> share(
     String text, {
-    String subject,
-    Rect sharePositionOrigin,
+    String? subject,
+    Rect? sharePositionOrigin,
   }) {
-    assert(text != null);
     assert(text.isNotEmpty);
     final params = <String, dynamic>{
       'text': text,
@@ -46,14 +45,13 @@ class MethodChannelShare extends SharePlatform {
   @override
   Future<void> shareFiles(
     List<String> paths, {
-    List<String> mimeTypes,
-    String subject,
-    String text,
-    Rect sharePositionOrigin,
+    List<String>? mimeTypes,
+    String? subject,
+    String? text,
+    Rect? sharePositionOrigin,
   }) {
-    assert(paths != null);
     assert(paths.isNotEmpty);
-    assert(paths.every((element) => element != null && element.isNotEmpty));
+    assert(paths.every((element) => element.isNotEmpty));
     final params = <String, dynamic>{
       'paths': paths,
       'mimeTypes': mimeTypes ??
@@ -74,7 +72,6 @@ class MethodChannelShare extends SharePlatform {
   }
 
   static String _mimeTypeForPath(String path) {
-    assert(path != null);
     return lookupMimeType(path) ?? 'application/octet-stream';
   }
 }

packages/share_plus_platform_interface/lib/share_plus_platform_interface.dart

@@ -33,8 +33,8 @@ class SharePlatform extends PlatformInterface {
   /// Share text.
   Future<void> share(
     String text, {
-    String subject,
-    Rect sharePositionOrigin,
+    String? subject,
+    Rect? sharePositionOrigin,
   }) {
     return _instance.share(
       text,
@@ -46,10 +46,10 @@ class SharePlatform extends PlatformInterface {
   /// Share files.
   Future<void> shareFiles(
     List<String> paths, {
-    List<String> mimeTypes,
-    String subject,
-    String text,
-    Rect sharePositionOrigin,
+    List<String>? mimeTypes,
+    String? subject,
+    String? text,
+    Rect? sharePositionOrigin,
   }) {
     return _instance.shareFiles(
       paths,

packages/share_plus_platform_interface/pubspec.yaml

@@ -1,23 +1,23 @@
 name: share_plus_platform_interface
 description: A common platform interface for the share_plus plugin.
-version: 1.2.0
+version: 2.0.0-nullsafety.0
 homepage: https://plus.fluttercommunity.dev/
 repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/
 
 dependencies:
   flutter:
     sdk: flutter
   meta: ^1.1.8
-  mime: ^0.9.7
-  plugin_platform_interface: ^1.0.2
+  mime: ^1.0.0-nullsafety
+  plugin_platform_interface: ^1.1.0-nullsafety
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  mockito: ^3.0.0
+  mockito: ^5.0.0-nullsafety
   pedantic: ^1.9.2
   test: ^1.3.0
 
 environment:
-  sdk: ">=2.1.0 <3.0.0"
+  sdk: ">=2.12.0-0 <3.0.0"
   flutter: ">=1.12.13+hotfix.5 <2.0.0"

packages/share_plus_platform_interface/test/share_plus_platform_interface_test.dart

@@ -16,7 +16,7 @@ import 'package:flutter/services.dart';
 void main() {
   TestWidgetsFlutterBinding.ensureInitialized();
 
-  MockMethodChannel mockChannel;
+  late MockMethodChannel mockChannel;
 
   setUp(() {
     mockChannel = MockMethodChannel();
@@ -28,14 +28,6 @@ void main() {
     });
   });
 
-  test('sharing null fails', () {
-    expect(
-      () => SharePlatform.instance.share(null),
-      throwsA(const TypeMatcher<AssertionError>()),
-    );
-    verifyZeroInteractions(mockChannel);
-  });
-
   test('sharing empty fails', () {
     expect(
       () => SharePlatform.instance.share(''),
@@ -60,14 +52,6 @@ void main() {
     }));
   });
 
-  test('sharing null file fails', () {
-    expect(
-      () => SharePlatform.instance.shareFiles([null]),
-      throwsA(const TypeMatcher<AssertionError>()),
-    );
-    verifyZeroInteractions(mockChannel);
-  });
-
   test('sharing empty file fails', () {
     expect(
       () => SharePlatform.instance.shareFiles(['']),
@@ -107,4 +91,12 @@ void main() {
   });
 }
 
-class MockMethodChannel extends Mock implements MethodChannel {}
+// https://github.com/dart-lang/mockito/issues/316
+class MockMethodChannel extends Mock implements MethodChannel {
+  @override
+  Future<T?> invokeMethod<T>(String method, [dynamic arguments]) async {
+    return super
+            .noSuchMethod(Invocation.method(#invokeMethod, [method, arguments]))
+        as dynamic;
+  }
+}

packages/share_plus_web/CHANGELOG.md

@@ -1,3 +1,7 @@
-# 0.1.0
+## 0.2.0-nullsafety.0
+
+- Migrated to null safety
+
+## 0.1.0
 
 - Initial open-source release.

packages/share_plus_web/test/lib/main.dart renamed to packages/share_plus_web/integration_test/lib/main.dart

@@ -16,34 +16,36 @@ class SharePlusPlugin extends SharePlatform {
   final _navigator;
 
   /// A constructor that allows tests to override the window object used by the plugin.
-  SharePlusPlugin({@visibleForTesting html.Navigator debugNavigator})
+  SharePlusPlugin({@visibleForTesting html.Navigator? debugNavigator})
       : _navigator = debugNavigator ?? html.window.navigator;
 
   @override
 
   /// Share text
   Future<void> share(
     String text, {
-    String subject,
-    Rect sharePositionOrigin,
+    String? subject,
+    Rect? sharePositionOrigin,
   }) async {
     try {
       await _navigator.share({'title': subject, 'text': text});
     } catch (e) {
       //Navigator is not available or the webPage is not served on https
       final uri = Uri.encodeFull('mailto:?subject=$subject&body=$text');
-      return launch(uri);
+      await launch(uri);
     }
   }
 
   @override
 
   /// Share files
-  Future<void> shareFiles(List<String> paths,
-      {List<String> mimeTypes,
-      String subject,
-      String text,
-      Rect sharePositionOrigin}) {
+  Future<void> shareFiles(
+    List<String> paths, {
+    List<String>? mimeTypes,
+    String? subject,
+    String? text,
+    Rect? sharePositionOrigin,
+  }) {
     throw UnimplementedError('shareFiles() has not been implemented on Web.');
   }
 }