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

[connectivity] null safety stable release #3596

Merged
merged 7 commits into from
Feb 23, 2021
Merged

[connectivity] null safety stable release #3596

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
23abf27
migrate connectivity platform interface to stable
Feb 19, 2021
fc2cd63
Merge branch 'master' into nnbd_connectivity
Feb 22, 2021
54057f8
stable release
Feb 22, 2021
9f007e8
remove mockito
Feb 22, 2021
8183719
revert deps removal
Feb 22, 2021
140bafc
review
Feb 22, 2021
45fd52f
rerun ci
Feb 23, 2021
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
11 changes: 1 addition & 10 deletions packages/connectivity/connectivity/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
## 3.0.0-nullsafety.3
## 3.0.0

* Fix outdated links across a number of markdown files ([#3276](https://github.com/flutter/plugins/pull/3276))

## 3.0.0-nullsafety.2

* Android: Cleanup the NetworkCallback object when a connectivity stream is cancelled

## 3.0.0-nullsafety.1

* Bump Dart SDK to support null safety.
Copy link
Contributor

Choose a reason for hiding this comment

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

Remove.


## 3.0.0-nullsafety

* Migrate to null safety.
Copy link
Contributor

Choose a reason for hiding this comment

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

Move to top


## 2.0.3
Expand Down
6 changes: 3 additions & 3 deletions packages/connectivity/connectivity/example/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ dependencies:
dev_dependencies:
flutter_driver:
sdk: flutter
test: ^1.10.0-nullsafety.1
test: ^1.16.3
integration_test:
path: ../../../integration_test
pedantic: ^1.10.0-nullsafety.1
pedantic: ^1.10.0

flutter:
uses-material-design: true

environment:
sdk: ">=2.12.0-0 <3.0.0"
sdk: ">=2.12.0-259.9.beta <3.0.0"
flutter: ">=1.12.13+hotfix.5"
4 changes: 0 additions & 4 deletions packages/connectivity/connectivity/example/test_driver/test/integration_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

// TODO(amirh): Remove this once flutter_driver supports null safety.
// https://github.com/flutter/flutter/issues/71379
// @dart = 2.9
Copy link
Contributor

Choose a reason for hiding this comment

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

We still need this for stable. We haven't decided how to do integration testing yet.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ok moving back, did we not say we are disabling stable integration test? Maybe I heard it wrong.

Copy link
Contributor

Choose a reason for hiding this comment

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

The web plugins are doing this because apparently they already aren't running in CI, so there's essentially no downside.

For everything else, we need to figure out how we want to handle this in the period between now and the next stable release after 1.26.


import 'dart:convert';
import 'dart:io';
import 'package:flutter_driver/flutter_driver.dart';
Expand Down
17 changes: 8 additions & 9 deletions packages/connectivity/connectivity/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: connectivity
description: Flutter plugin for discovering the state of the network (WiFi &
mobile/cellular) connectivity on Android and iOS.
homepage: https://github.com/flutter/plugins/tree/master/packages/connectivity/connectivity
version: 3.0.0-nullsafety.3
version: 3.0.0

flutter:
plugin:
Expand All @@ -20,25 +20,24 @@ flutter:
dependencies:
flutter:
sdk: flutter
meta: ^1.0.5
connectivity_platform_interface: ^2.0.0-nullsafety.1
meta: ^1.3.0
connectivity_platform_interface: ^2.0.0
#TODO(cyanglaz): re-endorse the below plugins when they have migrated to nnbd.
# https://github.com/flutter/flutter/issues/68669
connectivity_macos: ^0.2.0-nullsafety
connectivity_macos: ^0.2.0
Copy link
Contributor Author

Choose a reason for hiding this comment

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

CI will fail until macos 0.2.0 is published.

# connectivity_for_web: ^0.3.0

dev_dependencies:
flutter_test:
sdk: flutter
flutter_driver:
sdk: flutter
test: ^1.10.0-nullsafety.1
test: ^1.16.3
integration_test:
path: ../../integration_test
mockito: ^4.1.1
plugin_platform_interface: ^1.1.0-nullsafety.1
pedantic: ^1.10.0-nullsafety.1
plugin_platform_interface: ">=1.0.0 <3.0.0"
pedantic: ^1.10.0

environment:
sdk: ">=2.12.0-0 <3.0.0"
sdk: ">=2.12.0-259.9.beta <3.0.0"
flutter: ">=1.12.13+hotfix.5"
4 changes: 2 additions & 2 deletions packages/connectivity/connectivity/test/connectivity_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import 'package:connectivity/connectivity.dart';
import 'package:connectivity_platform_interface/connectivity_platform_interface.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:plugin_platform_interface/plugin_platform_interface.dart';
import 'package:mockito/mockito.dart';
import 'package:test/fake.dart';

const ConnectivityResult kCheckConnectivityResult = ConnectivityResult.wifi;
const LocationAuthorizationStatus kRequestLocationResult =
Expand All @@ -33,7 +33,7 @@ void main() {
});
}

class MockConnectivityPlatform extends Mock
class MockConnectivityPlatform extends Fake
with MockPlatformInterfaceMixin
implements ConnectivityPlatform {
Future<ConnectivityResult> checkConnectivity() async {
Expand Down