Skip to content

Switch dart-lang/http to use workspaces #1808

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions pkgs/cronet_http/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 1.6.0-wip

* Require Dart 3.6.

## 1.5.0

* Add the ability to abort requests.
Expand Down
3 changes: 2 additions & 1 deletion pkgs/cronet_http/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ description: Demonstrates how to use the cronet_http plugin.
publish_to: 'none'

environment:
sdk: ^3.4.0
sdk: ^3.6.0
resolution: workspace

dependencies:
cronet_http:
Expand Down
5 changes: 3 additions & 2 deletions pkgs/cronet_http/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
name: cronet_http
version: 1.5.0
version: 1.6.0-wip
description: >-
An Android Flutter plugin that provides access to the Cronet HTTP client.
repository: https://github.com/dart-lang/http/tree/master/pkgs/cronet_http

environment:
sdk: ^3.4.0
sdk: ^3.6.0
flutter: '>=3.22.0'
resolution: workspace

dependencies:
flutter:
Expand Down
4 changes: 4 additions & 0 deletions pkgs/cupertino_http/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 2.4.0-wip

* Require Dart 3.6.

## 2.3.0

* Add the ability to abort requests.
Expand Down
3 changes: 2 additions & 1 deletion pkgs/cupertino_http/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ publish_to: 'none'
version: 1.0.0+1

environment:
sdk: ^3.4.0
sdk: ^3.6.0
flutter: '>=3.22.0'
resolution: workspace

dependencies:
cupertino_http:
Expand Down
5 changes: 3 additions & 2 deletions pkgs/cupertino_http/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
name: cupertino_http
version: 2.3.0
version: 2.4.0-wip
description: >-
A macOS/iOS Flutter plugin that provides access to the Foundation URL
Loading System.
repository: https://github.com/dart-lang/http/tree/master/pkgs/cupertino_http

environment:
sdk: ^3.4.0
sdk: ^3.6.0
flutter: '>=3.24.0' # If changed, update test matrix.
resolution: workspace

dependencies:
async: ^2.5.0
Expand Down
3 changes: 2 additions & 1 deletion pkgs/flutter_http_example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ description: Demonstrates how to use package:http in a Flutter app.
publish_to: 'none'

environment:
sdk: ^3.0.0
sdk: ^3.6.0
flutter: '>=3.10.0'
resolution: workspace

dependencies:
cronet_http: ^1.0.0
Expand Down
4 changes: 4 additions & 0 deletions pkgs/http/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 1.6.0-wip

* Require Dart 3.6.

## 1.5.0

* Fixed a bug in `IOClient` where the `HttpClient`'s response stream was
Expand Down
5 changes: 3 additions & 2 deletions pkgs/http/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: http
version: 1.5.0
version: 1.6.0-wip
description: A composable, multi-platform, Future-based API for HTTP requests.
repository: https://github.com/dart-lang/http/tree/master/pkgs/http

Expand All @@ -9,7 +9,8 @@ topics:
- protocols

environment:
sdk: ^3.4.0
sdk: ^3.6.0
resolution: workspace

dependencies:
async: ^2.5.0
Expand Down
8 changes: 2 additions & 6 deletions pkgs/http_client_conformance_tests/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ repository: https://github.com/dart-lang/http/tree/master/pkgs/http_client_confo
publish_to: none

environment:
sdk: ^3.4.0
sdk: ^3.6.0
resolution: workspace

dependencies:
async: ^2.8.2
Expand All @@ -15,10 +16,5 @@ dependencies:
stream_channel: ^2.1.1
test: ^1.21.2

# TODO(brianquinlan): Remove dependency_overrides when package:http 1.5.0 is released.
dependency_overrides:
http:
path: ../http

dev_dependencies:
dart_flutter_team_lints: ^3.0.0
3 changes: 2 additions & 1 deletion pkgs/http_profile/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
## 0.1.1-wip
## 0.1.2-wip

* Fixed unintended HTML tags in doc comments.
* Require Dart 3.6

## 0.1.0

Expand Down
5 changes: 3 additions & 2 deletions pkgs/http_profile/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ description: >-
A library used by HTTP client authors to integrate with the DevTools Network
View.
repository: https://github.com/dart-lang/http/tree/master/pkgs/http_profile
version: 0.1.1-wip
version: 0.1.2-wip

environment:
sdk: ^3.4.0
sdk: ^3.6.0
resolution: workspace

dev_dependencies:
dart_flutter_team_lints: ^3.0.0
Expand Down
1 change: 1 addition & 0 deletions pkgs/ok_http/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
## 0.1.1-wip

- Require Dart 3.6.
- `OkHttpClient` now receives an `OkHttpClientConfiguration` to configure the client on a per-call basis.
- `OkHttpClient` supports setting four types of timeouts: [`connectTimeout`](https://square.github.io/okhttp/5.x/okhttp/okhttp3/-ok-http-client/-builder/connect-timeout.html), [`readTimeout`](https://square.github.io/okhttp/5.x/okhttp/okhttp3/-ok-http-client/-builder/read-timeout.html), [`writeTimeout`](https://square.github.io/okhttp/5.x/okhttp/okhttp3/-ok-http-client/-builder/write-timeout.html), and [`callTimeout`](https://square.github.io/okhttp/5.x/okhttp/okhttp3/-ok-http-client/-builder/call-timeout.html), using the `OkHttpClientConfiguration`.
- Upgrade to `jni` 0.14.0
Expand Down
8 changes: 2 additions & 6 deletions pkgs/ok_http/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ publish_to: "none"
version: 1.0.0+1

environment:
sdk: ">=3.4.1 <4.0.0"
sdk: ^3.6.0
resolution: workspace

dependencies:
cupertino_icons: ^1.0.6
Expand Down Expand Up @@ -36,8 +37,3 @@ flutter:
assets:
- test_certs/ # Used in integration tests.

# TODO(brianquinlan): Remove this when a release version of `package:http`
# supports abortable requests.
dependency_overrides:
http:
path: ../../http/
3 changes: 2 additions & 1 deletion pkgs/ok_http/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ description: >-
repository: https://github.com/dart-lang/http/tree/master/pkgs/ok_http

environment:
sdk: ^3.4.0
sdk: ^3.6.0
flutter: ">=3.22.0"
resolution: workspace

dependencies:
flutter:
Expand Down
4 changes: 4 additions & 0 deletions pkgs/web_socket/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 1.1.0-wip

- Require Dart 3.6.

## 1.0.1

- Fix a bug where `WebSocketException`/`WebSocketConnectionClosed` did not
Expand Down
5 changes: 3 additions & 2 deletions pkgs/web_socket/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ description: >-
Any easy-to-use library for communicating with WebSockets
that has multiple implementations.
repository: https://github.com/dart-lang/http/tree/master/pkgs/web_socket
version: 1.0.1
version: 1.1.0-wip

environment:
sdk: ^3.4.0
sdk: ^3.6.0
resolution: workspace

dependencies:
web: '>=0.5.0 <2.0.0'
Expand Down
4 changes: 4 additions & 0 deletions pkgs/web_socket_channel/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 3.1.0-wip

- Require Dart 3.6.

## 3.0.3

- Support `package:web_socket` 1.0.0.
Expand Down
5 changes: 3 additions & 2 deletions pkgs/web_socket_channel/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
name: web_socket_channel
version: 3.0.3
version: 3.1.0-wip
description: >-
A WebSocket API that enables cross-platform communication via StreamChannel.
repository: https://github.com/dart-lang/http/tree/master/pkgs/web_socket_channel

environment:
sdk: ^3.3.0
sdk: ^3.6.0
resolution: workspace

dependencies:
async: ^2.5.0
Expand Down
3 changes: 2 additions & 1 deletion pkgs/web_socket_conformance_tests/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ repository: https://github.com/dart-lang/http/tree/master/pkgs/web_socket_confor
publish_to: none

environment:
sdk: ^3.4.0
sdk: ^3.6.0
resolution: workspace

dependencies:
async: ^2.11.0
Expand Down
12 changes: 12 additions & 0 deletions pubspec.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: _
publish_to: none
environment:
sdk: ^3.6.0
workspace:
- pkgs/http
- pkgs/http_client_conformance_tests
- pkgs/http_profile
- pkgs/ok_http
- pkgs/web_socket
- pkgs/web_socket_channel
- pkgs/web_socket_conformance_tests
Loading