Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

[nnbd] Various fixes #3175

Merged
blasten merged 8 commits into from
Oct 21, 2020
Merged

[nnbd] Various fixes #3175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e6c8249
Various fixes
Oct 21, 2020
d95c7b7
Fix path
Oct 21, 2020
9416f4a
Readmes + custom analysis
Oct 21, 2020
f38adeb
path dependencies -> git dependencies
Oct 21, 2020
97267bf
Various fixes
Oct 21, 2020
6417657
Fix url_launcher test
Oct 21, 2020
9a55fff
Format
Oct 21, 2020
376c99a
Format
Oct 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/connectivity/connectivity/test/connectivity_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

@cyanglaz cyanglaz Oct 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

connectivity hasn't moved to nnbd yet, my migration PR will handle this. Do you want to maybe revert it for now?

Copy link
Author

@blasten blasten Oct 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dart = 2.9 is non-null safety. @dart = 2.10 enables null safety.


import 'package:connectivity/connectivity.dart';
import 'package:connectivity_platform_interface/connectivity_platform_interface.dart';
Expand Down
1 change: 1 addition & 0 deletions packages/device_info/device_info/example/integration_test/device_info_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
1 change: 1 addition & 0 deletions packages/device_info/device_info/example/test_driver/integration_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
3 changes: 1 addition & 2 deletions ...ages/device_info/device_info_platform_interface/test/method_channel_device_info_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion packages/google_sign_in/google_sign_in/test/google_sign_in_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion packages/shared_preferences/shared_preferences/test/shared_preferences_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
3 changes: 3 additions & 0 deletions packages/url_launcher/url_launcher/example/integration_test/url_launcher_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion packages/url_launcher/url_launcher/example/lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class MyHomePage extends StatefulWidget {
}

class _MyHomePageState extends State<MyHomePage> {
late Future<void> _launched;
Future<void>? _launched;
String _phone = '';

Future<void> _launchInBrowser(String url) async {
Expand Down
7 changes: 7 additions & 0 deletions packages/url_launcher/url_launcher/example/test/url_launcher_example_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
3 changes: 3 additions & 0 deletions packages/url_launcher/url_launcher/example/test_driver/integration_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
25 changes: 20 additions & 5 deletions packages/url_launcher/url_launcher/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/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

Expand Down
5 changes: 2 additions & 3 deletions packages/url_launcher/url_launcher/test/url_launcher_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
4 changes: 4 additions & 0 deletions packages/url_launcher/url_launcher_linux/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.1.0-nullsafety

* Migrate to null safety.

## 0.0.1+2

* Check in linux/ directory for example/
Expand Down
4 changes: 2 additions & 2 deletions packages/url_launcher/url_launcher_linux/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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:
Expand Down
4 changes: 4 additions & 0 deletions packages/url_launcher/url_launcher_macos/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# 0.1.0-nullsafety

* Migrate to null safety.

# 0.0.1+8

* Remove no-op android folder in the example app.
Expand Down
4 changes: 2 additions & 2 deletions packages/url_launcher/url_launcher_macos/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion packages/url_launcher/url_launcher_web/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

# 0.1.2

- Adds "tel" and "sms" support
- Adds "tel" and "sms" support

# 0.1.1+6

Expand Down
4 changes: 0 additions & 4 deletions packages/url_launcher/url_launcher_web/analysis_options.yaml
View file
Open in desktop

This file was deleted.

7 changes: 5 additions & 2 deletions packages/url_launcher/url_launcher_web/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/url_launcher_platform_interface
flutter:
sdk: flutter
flutter_web_plugins:
Expand Down
4 changes: 4 additions & 0 deletions packages/url_launcher/url_launcher_windows/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 0.1.0-nullsafety

* Migrate to null-safety.

## 0.0.1+1

* Update README to reflect endorsement.
Copy link
Contributor

@cyanglaz cyanglaz Oct 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Duplicated 0.0.1+1. Looks like a merge error.

Copy link
Author

@blasten blasten Oct 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch

Expand Down
4 changes: 2 additions & 2 deletions packages/url_launcher/url_launcher_windows/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
14 changes: 8 additions & 6 deletions packages/video_player/video_player/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,21 @@ 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
# 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
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
Expand Down
9 changes: 4 additions & 5 deletions packages/video_player/video_player_web/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down