Skip to content

Commit

Permalink
fix(packaging): update rxdart and sdk min versions
Browse files Browse the repository at this point in the history
 
update rxdart version ^0.22.0 => ^0.23.1
update sdk version '>=2.2.2 <3.0.0' => '>=2.6.0 <3.0.0'

closes #497
BREAKING CHANGE:

projects dependent on old sdk/rxdart versions wouldn't build,
there is a way to override rxdart dependency with dependency_override
(we don't use Observable features in these places, so it should be compatible with older version)
there is no way to override min sdk version outside of a project
  • Loading branch information
2ZeroSix committed Dec 31, 2019
1 parent e44dcf0 commit 1980f22
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion packages/graphql/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: Example for using GraphQL Dart
version: 1.0.0+1

environment:
sdk: ">=2.2.0 <3.0.0"
sdk: ">=2.6.0 <3.0.0"

dependencies:
args:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -282,15 +282,15 @@ class SocketClient {
config.queryAndMutationTimeout != null;

response.onListen = () {
final Observable<SocketConnectionState>
final Stream<SocketConnectionState>
waitForConnectedStateWithoutTimeout = _connectionStateController
.startWith(
waitForConnection ? null : SocketConnectionState.CONNECTED)
.where((SocketConnectionState state) =>
state == SocketConnectionState.CONNECTED)
.take(1);

final Observable<SocketConnectionState> waitForConnectedState = addTimeout
final Stream<SocketConnectionState> waitForConnectedState = addTimeout
? waitForConnectedStateWithoutTimeout.timeout(
config.queryAndMutationTimeout,
onTimeout: (EventSink<SocketConnectionState> event) {
Expand Down
4 changes: 2 additions & 2 deletions packages/graphql/lib/src/socket_client.dart
Original file line number Diff line number Diff line change
Expand Up @@ -259,15 +259,15 @@ class SocketClient {
config.queryAndMutationTimeout != null;

final onListen = () {
final Observable<SocketConnectionState>
final Stream<SocketConnectionState>
waitForConnectedStateWithoutTimeout = _connectionStateController
.startWith(
waitForConnection ? null : SocketConnectionState.CONNECTED)
.where((SocketConnectionState state) =>
state == SocketConnectionState.CONNECTED)
.take(1);

final Observable<SocketConnectionState> waitForConnectedState = addTimeout
final Stream<SocketConnectionState> waitForConnectedState = addTimeout
? waitForConnectedStateWithoutTimeout.timeout(
config.queryAndMutationTimeout,
onTimeout: (EventSink<SocketConnectionState> event) {
Expand Down
4 changes: 2 additions & 2 deletions packages/graphql/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies:
http_parser: ^3.1.3
uuid_enhanced: ^3.0.2
gql: ^0.12.0
rxdart: ^0.22.0
rxdart: ^0.23.1
websocket: ^0.0.5
quiver: '>=2.0.0 <3.0.0'
dev_dependencies:
Expand All @@ -25,4 +25,4 @@ dev_dependencies:
test: ^1.5.3
test_coverage: ^0.3.0+1
environment:
sdk: '>=2.2.2 <3.0.0'
sdk: '>=2.6.0 <3.0.0'
2 changes: 1 addition & 1 deletion packages/graphql_flutter/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dependencies:
flutter:
sdk: flutter
cupertino_icons: ^0.1.2
rxdart: ^0.22.0
rxdart: ^0.23.1
connectivity: ^0.4.4
graphql_flutter:
path: ..
Expand Down
4 changes: 2 additions & 2 deletions packages/graphql_flutter/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencies:
meta: ^1.1.6
path: ^1.6.2
path_provider: ^1.1.0
rxdart: ^0.22.0
rxdart: ^0.23.1
connectivity: ^0.4.4
dev_dependencies:
pedantic: ^1.8.0+1
Expand All @@ -23,4 +23,4 @@ dev_dependencies:
sdk: flutter
test: ^1.5.3
environment:
sdk: '>=2.2.2 <3.0.0'
sdk: '>=2.6.0 <3.0.0'

0 comments on commit 1980f22

Please sign in to comment.