Skip to content

Commit 40a83eb

Browse files
authored
Merge branch 'master' into merge-web_socket_channel-package
2 parents 1312034 + 27184eb commit 40a83eb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+12571
-8828
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
name: "package:http_multi_server"
3+
about: "Create a bug or file a feature request against package:http_multi_server."
4+
labels: "package:http_multi_server"
5+
---

.github/labeler.yml

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,40 @@
22

33
'type-infra':
44
- changed-files:
5-
- any-glob-to-any-file: '.github/**'
5+
- any-glob-to-any-file: '.github/**'
66

77
'package:cronet_http':
88
- changed-files:
9-
- any-glob-to-any-file: 'pkgs/cronet_http/**'
9+
- any-glob-to-any-file: 'pkgs/cronet_http/**'
1010

1111
'package:cupertino_http':
1212
- changed-files:
13-
- any-glob-to-any-file: 'pkgs/cupertino_http/**'
13+
- any-glob-to-any-file: 'pkgs/cupertino_http/**'
1414

1515
'package:http':
1616
- changed-files:
17-
- any-glob-to-any-file: 'pkgs/http/**'
17+
- any-glob-to-any-file: 'pkgs/http/**'
1818

1919
'package:http2':
2020
- changed-files:
21-
- any-glob-to-any-file: 'pkgs/http2/**'
21+
- any-glob-to-any-file: 'pkgs/http2/**'
2222

23-
'package:http_parser':
23+
'package:http_client_conformance_tests':
2424
- changed-files:
25-
- any-glob-to-any-file: 'pkgs/http_parser/**'
25+
- any-glob-to-any-file: 'pkgs/http_client_conformance_tests/**'
2626

27-
'package:http_client_conformance_tests':
27+
'package:http_multi_server':
28+
- changed-files:
29+
- any-glob-to-any-file: 'pkgs/http_multi_server/**'
30+
31+
'package:http_parser':
2832
- changed-files:
29-
- any-glob-to-any-file: 'pkgs/http_client_conformance_tests/**'
33+
- any-glob-to-any-file: 'pkgs/http_parser/**'
3034

3135
'package:web_socket_channel':
3236
- changed-files:
33-
- any-glob-to-any-file: 'pkgs/web_socket_channel/**'
37+
- any-glob-to-any-file: 'pkgs/web_socket_channel/**'
38+
39+
'package:web_socket_conformance_tests':
40+
- changed-files:
41+
- any-glob-to-any-file: 'pkgs/http_client_conformance_tests/**'
Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
name: package:http_multi_server
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
paths:
8+
- '.github/workflows/http_multi_server.yaml'
9+
- 'pkgs/http_multi_server/**'
10+
pull_request:
11+
paths:
12+
- '.github/workflows/http_multi_server.yaml'
13+
- 'pkgs/http_multi_server/**'
14+
schedule:
15+
- cron: "0 0 * * 0"
16+
17+
defaults:
18+
run:
19+
working-directory: pkgs/http_multi_server/
20+
21+
env:
22+
PUB_ENVIRONMENT: bot.github
23+
24+
jobs:
25+
# Check code formatting and static analysis on a single OS (linux)
26+
# against Dart dev.
27+
analyze:
28+
runs-on: ubuntu-latest
29+
strategy:
30+
fail-fast: false
31+
matrix:
32+
sdk: [dev]
33+
steps:
34+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
35+
- uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94
36+
with:
37+
sdk: ${{ matrix.sdk }}
38+
- id: install
39+
name: Install dependencies
40+
run: dart pub get
41+
- name: Check formatting
42+
run: dart format --output=none --set-exit-if-changed .
43+
if: always() && steps.install.outcome == 'success'
44+
- name: Analyze code
45+
run: dart analyze --fatal-infos
46+
if: always() && steps.install.outcome == 'success'
47+
48+
# Run tests on a matrix consisting of two dimensions:
49+
# 1. OS: ubuntu-latest, (macos-latest, windows-latest)
50+
# 2. release channel: dev
51+
test:
52+
needs: analyze
53+
runs-on: ${{ matrix.os }}
54+
strategy:
55+
fail-fast: false
56+
matrix:
57+
# Add macos-latest and/or windows-latest if relevant for this package.
58+
os: [ubuntu-latest]
59+
sdk: [3.2, dev]
60+
steps:
61+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
62+
- uses: dart-lang/setup-dart@e630b99d28a3b71860378cafdc2a067c71107f94
63+
with:
64+
sdk: ${{ matrix.sdk }}
65+
- id: install
66+
name: Install dependencies
67+
run: dart pub get
68+
- name: Run VM tests
69+
run: dart test --platform vm
70+
if: always() && steps.install.outcome == 'success'

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ and the browser.
1616
| [http](pkgs/http/) | A composable, multi-platform, Future-based API for HTTP requests. | [![pub package](https://img.shields.io/pub/v/http.svg)](https://pub.dev/packages/http) |
1717
| [http2](pkgs/http2/) | A HTTP/2 implementation in Dart. | [![pub package](https://img.shields.io/pub/v/http2.svg)](https://pub.dev/packages/http2) |
1818
| [http_client_conformance_tests](pkgs/http_client_conformance_tests/) | A library that tests whether implementations of package:http's `Client` class behave as expected. | |
19+
| [http_multi_server](pkgs/http_multi_server/) | A `dart:io` `HttpServer` wrapper that handles requests from multiple servers. | [![pub package](https://img.shields.io/pub/v/http_multi_server.svg)](https://pub.dev/packages/http_multi_server) |
1920
| [http_parser](pkgs/http_parser/) | A platform-independent package for parsing and serializing HTTP formats. | [![pub package](https://img.shields.io/pub/v/http_parser.svg)](https://pub.dev/packages/http_parser) |
2021
| [http_profile](pkgs/http_profile/) | A library used by HTTP client authors to integrate with the DevTools Network View. | [![pub package](https://img.shields.io/pub/v/http_profile.svg)](https://pub.dev/packages/http_profile) |
2122
| [ok_http](pkgs/ok_http/) | An Android Flutter plugin that provides access to the [OkHttp](https://square.github.io/okhttp/) HTTP client and the OkHttp [WebSocket](https://square.github.io/okhttp/5.x/okhttp/okhttp3/-web-socket/index.html) API. | [![pub package](https://img.shields.io/pub/v/ok_http.svg)](https://pub.dev/packages/ok_http) |

pkgs/cupertino_http/CHANGELOG.md

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
1-
## 2.0.2-wip
1+
## 2.0.3-wip
22

3-
* Upgrade to `package:objective_c` 4.0.
3+
* Remove some unnecessary native code.
4+
5+
## 2.0.2
6+
7+
* Upgrade to `package:objective_c` 4.1.
8+
* Upgrade to `package:ffigen` 16.1.
9+
* Fixes a bug where responses were not processed correctly:
10+
* [#1413](https://github.com/dart-lang/http/issues/1413)
11+
* [#1446](https://github.com/dart-lang/http/issues/1446)
412

513
## 2.0.1
614

0 commit comments

Comments
 (0)