From e6c8249cb0e2c9a6784a67b439f034d97730aed6 Mon Sep 17 00:00:00 2001 From: Emmanuel Garcia Date: Tue, 20 Oct 2020 18:05:02 -0700 Subject: [PATCH 1/8] Various fixes --- .../connectivity/test/connectivity_test.dart | 2 +- .../integration_test/device_info_test.dart | 1 + .../example/test_driver/integration_test.dart | 1 + .../test/method_channel_device_info_test.dart | 3 +-- .../test/google_sign_in_test.dart | 2 +- .../test/shared_preferences_test.dart | 2 +- .../test/url_launcher_example_test.dart | 7 ++++++ .../url_launcher/url_launcher/pubspec.yaml | 25 +++++++++++++++---- .../url_launcher/test/url_launcher_test.dart | 5 ++-- .../url_launcher_linux/CHANGELOG.md | 4 +++ .../url_launcher_linux/pubspec.yaml | 4 +-- .../url_launcher_macos/CHANGELOG.md | 4 +++ .../url_launcher_macos/pubspec.yaml | 4 +-- .../url_launcher_web/CHANGELOG.md | 6 ++++- .../url_launcher_web/pubspec.yaml | 9 ++++--- .../url_launcher_windows/CHANGELOG.md | 8 ++++++ .../url_launcher_windows/pubspec.yaml | 4 +-- .../video_player/video_player/pubspec.yaml | 14 ++++++----- 18 files changed, 76 insertions(+), 29 deletions(-) diff --git a/packages/connectivity/connectivity/test/connectivity_test.dart b/packages/connectivity/connectivity/test/connectivity_test.dart index 7ed2c8d7f7e2..45eb995bb06c 100644 --- a/packages/connectivity/connectivity/test/connectivity_test.dart +++ b/packages/connectivity/connectivity/test/connectivity_test.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 +// @dart = 2.9 import 'package:connectivity/connectivity.dart'; import 'package:connectivity_platform_interface/connectivity_platform_interface.dart'; diff --git a/packages/device_info/device_info/example/integration_test/device_info_test.dart b/packages/device_info/device_info/example/integration_test/device_info_test.dart index 33b745af13f9..61c4396b0d8e 100644 --- a/packages/device_info/device_info/example/integration_test/device_info_test.dart +++ b/packages/device_info/device_info/example/integration_test/device_info_test.dart @@ -4,6 +4,7 @@ // TODO(cyanglaz): Remove once https://github.com/flutter/plugins/pull/3158 is landed. // @dart = 2.9 + import 'dart:io'; import 'package:flutter_test/flutter_test.dart'; import 'package:device_info/device_info.dart'; diff --git a/packages/device_info/device_info/example/test_driver/integration_test.dart b/packages/device_info/device_info/example/test_driver/integration_test.dart index bd3dc09c190c..13327bb884c9 100644 --- a/packages/device_info/device_info/example/test_driver/integration_test.dart +++ b/packages/device_info/device_info/example/test_driver/integration_test.dart @@ -4,6 +4,7 @@ // TODO(cyanglaz): Remove once https://github.com/flutter/flutter/issues/59879 is fixed. // @dart = 2.9 + import 'dart:async'; import 'dart:convert'; import 'dart:io'; diff --git a/packages/device_info/device_info_platform_interface/test/method_channel_device_info_test.dart b/packages/device_info/device_info_platform_interface/test/method_channel_device_info_test.dart index dfc833da7e79..0a1ba7042a4a 100644 --- a/packages/device_info/device_info_platform_interface/test/method_channel_device_info_test.dart +++ b/packages/device_info/device_info_platform_interface/test/method_channel_device_info_test.dart @@ -4,11 +4,10 @@ // TODO(cyanglaz): Remove once https://github.com/flutter/flutter/issues/59879 is fixed. // @dart = 2.9 + import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; - import 'package:device_info_platform_interface/device_info_platform_interface.dart'; - import 'package:device_info_platform_interface/method_channel/method_channel_device_info.dart'; void main() { diff --git a/packages/google_sign_in/google_sign_in/test/google_sign_in_test.dart b/packages/google_sign_in/google_sign_in/test/google_sign_in_test.dart index 3fc3471dcdfb..435f307e0039 100755 --- a/packages/google_sign_in/google_sign_in/test/google_sign_in_test.dart +++ b/packages/google_sign_in/google_sign_in/test/google_sign_in_test.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 +// @dart = 2.9 import 'dart:async'; diff --git a/packages/shared_preferences/shared_preferences/test/shared_preferences_test.dart b/packages/shared_preferences/shared_preferences/test/shared_preferences_test.dart index 763d32642cfa..80faba404154 100755 --- a/packages/shared_preferences/shared_preferences/test/shared_preferences_test.dart +++ b/packages/shared_preferences/shared_preferences/test/shared_preferences_test.dart @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 +// @dart = 2.9 import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/packages/url_launcher/url_launcher/example/test/url_launcher_example_test.dart b/packages/url_launcher/url_launcher/example/test/url_launcher_example_test.dart index 41b9f6f5ec6c..eddc126a8e66 100644 --- a/packages/url_launcher/url_launcher/example/test/url_launcher_example_test.dart +++ b/packages/url_launcher/url_launcher/example/test/url_launcher_example_test.dart @@ -1,3 +1,10 @@ +// Copyright 2017 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// TODO(egarciad): Remove once mockito is migrated to null safety. +// @dart = 2.9 + import 'package:flutter_test/flutter_test.dart'; import 'package:flutter/material.dart'; import 'package:mockito/mockito.dart'; diff --git a/packages/url_launcher/url_launcher/pubspec.yaml b/packages/url_launcher/url_launcher/pubspec.yaml index 43688ff6954b..00390bc9caad 100644 --- a/packages/url_launcher/url_launcher/pubspec.yaml +++ b/packages/url_launcher/url_launcher/pubspec.yaml @@ -26,16 +26,31 @@ dependencies: flutter: sdk: flutter # TODO(mvanbeusekom): Update to use pub.dev once null safety version is published. - url_launcher_platform_interface: - path: ../url_launcher_platform_interface + url_launcher_platform_interface: + git: + url: https://github.com/flutter/plugins.git + ref: nnbd + path: packages/url_launcher_platform_interface # The design on https://flutter.dev/go/federated-plugins was to leave # this constraint as "any". We cannot do it right now as it fails pub publish # validation, so we set a ^ constraint. # TODO(amirh): Revisit this (either update this part in the design or the pub tool). # https://github.com/flutter/flutter/issues/46264 - url_launcher_linux: ^0.0.1 - url_launcher_macos: ^0.0.1 - url_launcher_windows: ^0.0.1 + url_launcher_linux: + git: + url: https://github.com/flutter/plugins.git + ref: nnbd + path: packages/url_launcher/url_launcher_linux + url_launcher_macos: + git: + url: https://github.com/flutter/plugins.git + ref: nnbd + path: packages/url_launcher/url_launcher_macos + url_launcher_windows: + git: + url: https://github.com/flutter/plugins.git + ref: nnbd + path: packages/url_launcher/url_launcher_windows # TODO(mvanbeusekom): Temporary disabled until web is migrated to nnbd (advised by @blasten). #url_launcher_web: ^0.1.3 diff --git a/packages/url_launcher/url_launcher/test/url_launcher_test.dart b/packages/url_launcher/url_launcher/test/url_launcher_test.dart index 1934d8af2ad3..89a7801e1ca8 100644 --- a/packages/url_launcher/url_launcher/test/url_launcher_test.dart +++ b/packages/url_launcher/url_launcher/test/url_launcher_test.dart @@ -2,14 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// @dart = 2.8 +// TODO(mvanbeusekom): Remove once Mockito is migrated to null safety. +// @dart = 2.9 import 'dart:async'; import 'dart:ui'; import 'package:flutter_test/flutter_test.dart'; -// TODO(mvanbeusekom): Remove once Mockito is migrated to null safety. -// @dart = 2.9 import 'package:mockito/mockito.dart'; import 'package:flutter/foundation.dart'; import 'package:plugin_platform_interface/plugin_platform_interface.dart'; diff --git a/packages/url_launcher/url_launcher_linux/CHANGELOG.md b/packages/url_launcher/url_launcher_linux/CHANGELOG.md index 7855c4a33341..58e92eb391ab 100644 --- a/packages/url_launcher/url_launcher_linux/CHANGELOG.md +++ b/packages/url_launcher/url_launcher_linux/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.1.0 + +* Migrate to null safety. + ## 0.0.1+2 * Check in linux/ directory for example/ diff --git a/packages/url_launcher/url_launcher_linux/pubspec.yaml b/packages/url_launcher/url_launcher_linux/pubspec.yaml index 2e3a1ba37cd4..9cb9e82efd59 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: 0.0.1+2 +version: 0.1.0-nullsafety homepage: https://github.com/flutter/plugins/tree/master/packages/url_launcher/url_launcher_linux flutter: @@ -10,7 +10,7 @@ flutter: pluginClass: UrlLauncherPlugin environment: - sdk: ">=2.1.0 <3.0.0" + sdk: ">=2.10.0-56.0.dev <3.0.0" flutter: ">=1.12.8 <2.0.0" dependencies: diff --git a/packages/url_launcher/url_launcher_macos/CHANGELOG.md b/packages/url_launcher/url_launcher_macos/CHANGELOG.md index d52bf8c249e6..c005ab79a158 100644 --- a/packages/url_launcher/url_launcher_macos/CHANGELOG.md +++ b/packages/url_launcher/url_launcher_macos/CHANGELOG.md @@ -1,3 +1,7 @@ +# 0.1.0 + +* Migrate to null safety. + # 0.0.1+8 * Remove no-op android folder in the example app. diff --git a/packages/url_launcher/url_launcher_macos/pubspec.yaml b/packages/url_launcher/url_launcher_macos/pubspec.yaml index 4775f23fe36a..e071918e6649 100644 --- a/packages/url_launcher/url_launcher_macos/pubspec.yaml +++ b/packages/url_launcher/url_launcher_macos/pubspec.yaml @@ -3,7 +3,7 @@ description: macOS implementation of the url_launcher plugin. # 0.0.y+z is compatible with 1.0.0, if you land a breaking change bump # the version to 2.0.0. # See more details: https://github.com/flutter/flutter/wiki/Package-migration-to-1.0.0 -version: 0.0.1+8 +version: 0.1.0 homepage: https://github.com/flutter/plugins/tree/master/packages/url_launcher/url_launcher_macos flutter: @@ -14,7 +14,7 @@ flutter: fileName: url_launcher_macos.dart environment: - sdk: ">=2.1.0 <3.0.0" + sdk: ">=2.10.0-56.0.dev <3.0.0" flutter: ">=1.12.8 <2.0.0" dependencies: diff --git a/packages/url_launcher/url_launcher_web/CHANGELOG.md b/packages/url_launcher/url_launcher_web/CHANGELOG.md index 456d458834bf..89035aa083f8 100644 --- a/packages/url_launcher/url_launcher_web/CHANGELOG.md +++ b/packages/url_launcher/url_launcher_web/CHANGELOG.md @@ -1,3 +1,7 @@ +# 0.2.0 + +- Migrate to null safety. + # 0.1.4+2 - Move `lib/third_party` to `lib/src/third_party`. @@ -29,7 +33,7 @@ # 0.1.2 -- Adds "tel" and "sms" support +- Adds "tel" and "sms" support # 0.1.1+6 diff --git a/packages/url_launcher/url_launcher_web/pubspec.yaml b/packages/url_launcher/url_launcher_web/pubspec.yaml index 0fa5b35d4014..e5d7b5b00a26 100644 --- a/packages/url_launcher/url_launcher_web/pubspec.yaml +++ b/packages/url_launcher/url_launcher_web/pubspec.yaml @@ -4,7 +4,7 @@ homepage: https://github.com/flutter/plugins/tree/master/packages/url_launcher/u # 0.1.y+z is compatible with 1.0.0, if you land a breaking change bump # the version to 2.0.0. # See more details: https://github.com/flutter/flutter/wiki/Package-migration-to-1.0.0 -version: 0.1.4+2 +version: 0.2.0-nullsafety flutter: plugin: @@ -15,8 +15,11 @@ flutter: dependencies: # TODO(mvanbeusekom): Update to use pub.dev once null safety version is published. - url_launcher_platform_interface: - path: ../url_launcher_platform_interface + url_launcher_platform_interface: + git: + url: https://github.com/flutter/plugins.git + ref: nnbd + path: packages/url_launcher_platform_interface flutter: sdk: flutter flutter_web_plugins: diff --git a/packages/url_launcher/url_launcher_windows/CHANGELOG.md b/packages/url_launcher/url_launcher_windows/CHANGELOG.md index 7f534a7e5a38..bde58d073fd4 100644 --- a/packages/url_launcher/url_launcher_windows/CHANGELOG.md +++ b/packages/url_launcher/url_launcher_windows/CHANGELOG.md @@ -1,3 +1,11 @@ +## 0.1.0 + +* Migrate to null-safety. + +## 0.0.1+1 + +* Update README to reflect endorsement. + ## 0.0.1+1 * Update README to reflect endorsement. diff --git a/packages/url_launcher/url_launcher_windows/pubspec.yaml b/packages/url_launcher/url_launcher_windows/pubspec.yaml index 6a653b7f7665..39ea2d2fb9b9 100644 --- a/packages/url_launcher/url_launcher_windows/pubspec.yaml +++ b/packages/url_launcher/url_launcher_windows/pubspec.yaml @@ -3,7 +3,7 @@ description: Windows implementation of the url_launcher plugin. # 0.0.y+z is compatible with 1.0.0, if you land a breaking change bump # the version to 2.0.0. # See more details: https://github.com/flutter/flutter/wiki/Package-migration-to-1.0.0 -version: 0.0.1+1 +version: 0.1.0-nullsafety homepage: https://github.com/flutter/plugins/tree/master/packages/url_launcher/url_launcher_windows flutter: @@ -13,7 +13,7 @@ flutter: pluginClass: UrlLauncherPlugin environment: - sdk: ">=2.1.0 <3.0.0" + sdk: ">=2.10.0-56.0.dev <3.0.0" flutter: ">=1.12.8 <2.0.0" dependencies: diff --git a/packages/video_player/video_player/pubspec.yaml b/packages/video_player/video_player/pubspec.yaml index 36d5758ac15e..e11ae1457831 100644 --- a/packages/video_player/video_player/pubspec.yaml +++ b/packages/video_player/video_player/pubspec.yaml @@ -24,11 +24,10 @@ flutter: dependencies: meta: ^1.3.0-nullsafety.3 video_player_platform_interface: - path: ../video_player_platform_interface - # git: - # url: https://github.com/flutter/plugins.git - # ref: nnbd - # path: packages/video_player/video_player_platform_interface + git: + url: https://github.com/flutter/plugins.git + ref: nnbd + path: packages/video_player/video_player_platform_interface # The design on https://flutter.dev/go/federated-plugins was to leave # this constraint as "any". We cannot do it right now as it fails pub publish @@ -36,7 +35,10 @@ dependencies: # TODO(amirh): Revisit this (either update this part in the design or the pub tool). # https://github.com/flutter/flutter/issues/46264 video_player_web: - path: ../video_player_web + git: + url: https://github.com/flutter/plugins.git + ref: nnbd + path: packages/video_player/video_player_web flutter: sdk: flutter From d95c7b7496b34215fb3c401d7409703f32fb77d7 Mon Sep 17 00:00:00 2001 From: Emmanuel Garcia Date: Tue, 20 Oct 2020 18:22:45 -0700 Subject: [PATCH 2/8] Fix path --- packages/url_launcher/url_launcher/pubspec.yaml | 2 +- packages/url_launcher/url_launcher_web/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/url_launcher/url_launcher/pubspec.yaml b/packages/url_launcher/url_launcher/pubspec.yaml index 00390bc9caad..9e0cae460726 100644 --- a/packages/url_launcher/url_launcher/pubspec.yaml +++ b/packages/url_launcher/url_launcher/pubspec.yaml @@ -30,7 +30,7 @@ dependencies: git: url: https://github.com/flutter/plugins.git ref: nnbd - path: packages/url_launcher_platform_interface + path: packages/url_launcher/url_launcher_platform_interface # The design on https://flutter.dev/go/federated-plugins was to leave # this constraint as "any". We cannot do it right now as it fails pub publish # validation, so we set a ^ constraint. diff --git a/packages/url_launcher/url_launcher_web/pubspec.yaml b/packages/url_launcher/url_launcher_web/pubspec.yaml index e5d7b5b00a26..426550f93a5d 100644 --- a/packages/url_launcher/url_launcher_web/pubspec.yaml +++ b/packages/url_launcher/url_launcher_web/pubspec.yaml @@ -19,7 +19,7 @@ dependencies: git: url: https://github.com/flutter/plugins.git ref: nnbd - path: packages/url_launcher_platform_interface + path: packages/url_launcher/url_launcher_platform_interface flutter: sdk: flutter flutter_web_plugins: From 9416f4ad3e70a555dfe99875ba41ea258104d574 Mon Sep 17 00:00:00 2001 From: Emmanuel Garcia Date: Tue, 20 Oct 2020 18:54:47 -0700 Subject: [PATCH 3/8] Readmes + custom analysis --- .../example/linux/flutter/generated_plugin_registrant.cc | 3 +-- packages/url_launcher/url_launcher_linux/CHANGELOG.md | 2 +- packages/url_launcher/url_launcher_macos/CHANGELOG.md | 2 +- packages/url_launcher/url_launcher_web/CHANGELOG.md | 4 ---- packages/url_launcher/url_launcher_web/analysis_options.yaml | 4 ---- packages/url_launcher/url_launcher_web/pubspec.yaml | 2 +- packages/url_launcher/url_launcher_windows/CHANGELOG.md | 2 +- 7 files changed, 5 insertions(+), 14 deletions(-) delete mode 100644 packages/url_launcher/url_launcher_web/analysis_options.yaml diff --git a/packages/url_launcher/url_launcher/example/linux/flutter/generated_plugin_registrant.cc b/packages/url_launcher/url_launcher/example/linux/flutter/generated_plugin_registrant.cc index 36185a63f2fd..026851fa2f96 100644 --- a/packages/url_launcher/url_launcher/example/linux/flutter/generated_plugin_registrant.cc +++ b/packages/url_launcher/url_launcher/example/linux/flutter/generated_plugin_registrant.cc @@ -8,7 +8,6 @@ void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar = - fl_plugin_registry_get_registrar_for_plugin(registry, - "UrlLauncherPlugin"); + fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin"); url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar); } diff --git a/packages/url_launcher/url_launcher_linux/CHANGELOG.md b/packages/url_launcher/url_launcher_linux/CHANGELOG.md index 58e92eb391ab..12f0ff5fc451 100644 --- a/packages/url_launcher/url_launcher_linux/CHANGELOG.md +++ b/packages/url_launcher/url_launcher_linux/CHANGELOG.md @@ -1,4 +1,4 @@ -## 0.1.0 +## 0.1.0-nullsafety * Migrate to null safety. diff --git a/packages/url_launcher/url_launcher_macos/CHANGELOG.md b/packages/url_launcher/url_launcher_macos/CHANGELOG.md index c005ab79a158..a43df4590ed0 100644 --- a/packages/url_launcher/url_launcher_macos/CHANGELOG.md +++ b/packages/url_launcher/url_launcher_macos/CHANGELOG.md @@ -1,4 +1,4 @@ -# 0.1.0 +# 0.1.0-nullsafety * Migrate to null safety. diff --git a/packages/url_launcher/url_launcher_web/CHANGELOG.md b/packages/url_launcher/url_launcher_web/CHANGELOG.md index 89035aa083f8..e47d2d118270 100644 --- a/packages/url_launcher/url_launcher_web/CHANGELOG.md +++ b/packages/url_launcher/url_launcher_web/CHANGELOG.md @@ -1,7 +1,3 @@ -# 0.2.0 - -- Migrate to null safety. - # 0.1.4+2 - Move `lib/third_party` to `lib/src/third_party`. diff --git a/packages/url_launcher/url_launcher_web/analysis_options.yaml b/packages/url_launcher/url_launcher_web/analysis_options.yaml deleted file mode 100644 index 3d64bb57fe49..000000000000 --- a/packages/url_launcher/url_launcher_web/analysis_options.yaml +++ /dev/null @@ -1,4 +0,0 @@ -include: ../../../analysis_options.yaml -analyzer: - enable-experiment: - - non-nullable diff --git a/packages/url_launcher/url_launcher_web/pubspec.yaml b/packages/url_launcher/url_launcher_web/pubspec.yaml index 426550f93a5d..dab37acbf215 100644 --- a/packages/url_launcher/url_launcher_web/pubspec.yaml +++ b/packages/url_launcher/url_launcher_web/pubspec.yaml @@ -4,7 +4,7 @@ homepage: https://github.com/flutter/plugins/tree/master/packages/url_launcher/u # 0.1.y+z is compatible with 1.0.0, if you land a breaking change bump # the version to 2.0.0. # See more details: https://github.com/flutter/flutter/wiki/Package-migration-to-1.0.0 -version: 0.2.0-nullsafety +version: 0.1.4+2 flutter: plugin: diff --git a/packages/url_launcher/url_launcher_windows/CHANGELOG.md b/packages/url_launcher/url_launcher_windows/CHANGELOG.md index bde58d073fd4..e59c380f3bcf 100644 --- a/packages/url_launcher/url_launcher_windows/CHANGELOG.md +++ b/packages/url_launcher/url_launcher_windows/CHANGELOG.md @@ -1,4 +1,4 @@ -## 0.1.0 +## 0.1.0-nullsafety * Migrate to null-safety. From f38adeb12a958edb8ff49483f7a70b4e3ffeeeaa Mon Sep 17 00:00:00 2001 From: Emmanuel Garcia Date: Tue, 20 Oct 2020 19:34:59 -0700 Subject: [PATCH 4/8] path dependencies -> git dependencies --- packages/url_launcher/url_launcher_windows/CHANGELOG.md | 4 ---- packages/video_player/video_player_web/pubspec.yaml | 9 ++++----- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/packages/url_launcher/url_launcher_windows/CHANGELOG.md b/packages/url_launcher/url_launcher_windows/CHANGELOG.md index e59c380f3bcf..30657d82a98c 100644 --- a/packages/url_launcher/url_launcher_windows/CHANGELOG.md +++ b/packages/url_launcher/url_launcher_windows/CHANGELOG.md @@ -6,10 +6,6 @@ * Update README to reflect endorsement. -## 0.0.1+1 - -* Update README to reflect endorsement. - ## 0.0.1 * Initial Windows implementation of `url_launcher`. diff --git a/packages/video_player/video_player_web/pubspec.yaml b/packages/video_player/video_player_web/pubspec.yaml index e566946489d9..10439a306bc3 100644 --- a/packages/video_player/video_player_web/pubspec.yaml +++ b/packages/video_player/video_player_web/pubspec.yaml @@ -23,11 +23,10 @@ dependencies: sdk: flutter meta: ^1.3.0-nullsafety.3 video_player_platform_interface: - path: ../video_player_platform_interface - # git: - # url: https://github.com/flutter/plugins.git - # ref: nnbd - # path: packages/video_player/video_player_platform_interface + git: + url: https://github.com/flutter/plugins.git + ref: nnbd + path: packages/video_player/video_player_platform_interface dev_dependencies: flutter_test: From 97267bf51c6a57aca3f13228817e7b96829fca9f Mon Sep 17 00:00:00 2001 From: Emmanuel Garcia Date: Tue, 20 Oct 2020 19:58:14 -0700 Subject: [PATCH 5/8] Various fixes --- .../connectivity/ios/Classes/FLTConnectivityPlugin.m | 4 +++- .../example/integration_test/url_launcher_test.dart | 3 +++ .../example/linux/flutter/generated_plugin_registrant.cc | 3 ++- .../url_launcher/example/test_driver/integration_test.dart | 3 +++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/packages/connectivity/connectivity/ios/Classes/FLTConnectivityPlugin.m b/packages/connectivity/connectivity/ios/Classes/FLTConnectivityPlugin.m index 526bee25d561..0a65409b3828 100644 --- a/packages/connectivity/connectivity/ios/Classes/FLTConnectivityPlugin.m +++ b/packages/connectivity/connectivity/ios/Classes/FLTConnectivityPlugin.m @@ -156,7 +156,9 @@ - (NSString*)convertCLAuthorizationStatusToString:(CLAuthorizationStatus)status case kCLAuthorizationStatusAuthorizedWhenInUse: { return @"authorizedWhenInUse"; } - default: { return @"unknown"; } + default: { + return @"unknown"; + } } } diff --git a/packages/url_launcher/url_launcher/example/integration_test/url_launcher_test.dart b/packages/url_launcher/url_launcher/example/integration_test/url_launcher_test.dart index 9fb5eaa34b4c..6ab7c4b17cc1 100644 --- a/packages/url_launcher/url_launcher/example/integration_test/url_launcher_test.dart +++ b/packages/url_launcher/url_launcher/example/integration_test/url_launcher_test.dart @@ -2,6 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// TODO(egarciad): Remove once integration_test is migrated to null safety. +// @dart = 2.9 + import 'dart:io' show Platform; import 'package:flutter/foundation.dart' show kIsWeb; diff --git a/packages/url_launcher/url_launcher/example/linux/flutter/generated_plugin_registrant.cc b/packages/url_launcher/url_launcher/example/linux/flutter/generated_plugin_registrant.cc index 026851fa2f96..36185a63f2fd 100644 --- a/packages/url_launcher/url_launcher/example/linux/flutter/generated_plugin_registrant.cc +++ b/packages/url_launcher/url_launcher/example/linux/flutter/generated_plugin_registrant.cc @@ -8,6 +8,7 @@ void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar = - fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin"); + fl_plugin_registry_get_registrar_for_plugin(registry, + "UrlLauncherPlugin"); url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar); } diff --git a/packages/url_launcher/url_launcher/example/test_driver/integration_test.dart b/packages/url_launcher/url_launcher/example/test_driver/integration_test.dart index 7a2c21338786..e56756f38cbd 100644 --- a/packages/url_launcher/url_launcher/example/test_driver/integration_test.dart +++ b/packages/url_launcher/url_launcher/example/test_driver/integration_test.dart @@ -2,6 +2,9 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// TODO(egarciad): Remove once flutter_driver is migrated to null safety. +// @dart = 2.9 + import 'dart:async'; import 'dart:convert'; import 'dart:io'; From 6417657f957ab40a66ab93431c887bc4d2bc13c2 Mon Sep 17 00:00:00 2001 From: Emmanuel Garcia Date: Tue, 20 Oct 2020 20:31:17 -0700 Subject: [PATCH 6/8] Fix url_launcher test --- packages/url_launcher/url_launcher/example/lib/main.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/url_launcher/url_launcher/example/lib/main.dart b/packages/url_launcher/url_launcher/example/lib/main.dart index f493e6121401..b3e65f38a794 100644 --- a/packages/url_launcher/url_launcher/example/lib/main.dart +++ b/packages/url_launcher/url_launcher/example/lib/main.dart @@ -35,7 +35,7 @@ class MyHomePage extends StatefulWidget { } class _MyHomePageState extends State { - late Future _launched; + Future? _launched; String _phone = ''; Future _launchInBrowser(String url) async { From 9a55fff76481ee3d707f731f551bf8abf2f29c11 Mon Sep 17 00:00:00 2001 From: Emmanuel Garcia Date: Tue, 20 Oct 2020 20:31:36 -0700 Subject: [PATCH 7/8] Format --- .../example/linux/flutter/generated_plugin_registrant.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/url_launcher/url_launcher/example/linux/flutter/generated_plugin_registrant.cc b/packages/url_launcher/url_launcher/example/linux/flutter/generated_plugin_registrant.cc index 36185a63f2fd..026851fa2f96 100644 --- a/packages/url_launcher/url_launcher/example/linux/flutter/generated_plugin_registrant.cc +++ b/packages/url_launcher/url_launcher/example/linux/flutter/generated_plugin_registrant.cc @@ -8,7 +8,6 @@ void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar = - fl_plugin_registry_get_registrar_for_plugin(registry, - "UrlLauncherPlugin"); + fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin"); url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar); } From 376c99a621e0ea48dc5baba57b2fa6d05c449d20 Mon Sep 17 00:00:00 2001 From: Emmanuel Garcia Date: Tue, 20 Oct 2020 20:40:39 -0700 Subject: [PATCH 8/8] Format --- .../connectivity/ios/Classes/FLTConnectivityPlugin.m | 4 +--- .../example/linux/flutter/generated_plugin_registrant.cc | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/connectivity/connectivity/ios/Classes/FLTConnectivityPlugin.m b/packages/connectivity/connectivity/ios/Classes/FLTConnectivityPlugin.m index 0a65409b3828..526bee25d561 100644 --- a/packages/connectivity/connectivity/ios/Classes/FLTConnectivityPlugin.m +++ b/packages/connectivity/connectivity/ios/Classes/FLTConnectivityPlugin.m @@ -156,9 +156,7 @@ - (NSString*)convertCLAuthorizationStatusToString:(CLAuthorizationStatus)status case kCLAuthorizationStatusAuthorizedWhenInUse: { return @"authorizedWhenInUse"; } - default: { - return @"unknown"; - } + default: { return @"unknown"; } } } diff --git a/packages/url_launcher/url_launcher/example/linux/flutter/generated_plugin_registrant.cc b/packages/url_launcher/url_launcher/example/linux/flutter/generated_plugin_registrant.cc index 026851fa2f96..36185a63f2fd 100644 --- a/packages/url_launcher/url_launcher/example/linux/flutter/generated_plugin_registrant.cc +++ b/packages/url_launcher/url_launcher/example/linux/flutter/generated_plugin_registrant.cc @@ -8,6 +8,7 @@ void fl_register_plugins(FlPluginRegistry* registry) { g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar = - fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin"); + fl_plugin_registry_get_registrar_for_plugin(registry, + "UrlLauncherPlugin"); url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar); }