Skip to content

Commit ee01325

Browse files
Merge branch 'dart-lang:master' into master
2 parents 9ba5471 + c7cc4f8 commit ee01325

File tree

395 files changed

+132910
-81948
lines changed

Some content is hidden

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

395 files changed

+132910
-81948
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
.github/workflows/dart.yml linguist-generated=true
22
tool/ci.sh linguist-generated=true
3+
pkgs/*/.metadata linguist-generated=true

.github/ISSUE_TEMPLATE/2--package-http---i-found-a-bug.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ Please describe the bug and how to reproduce it.
1212

1313
Note that if the bug can also be reproduced when going through the interfaces provided by `dart:html` or `dart:io` directly the bug should be filed against the Dart SDK: https://github.com/dart-lang/sdk/issues
1414

15-
A failure to make an http request is more often a problem with the environment than with the client.
15+
A failure to make an HTTP request is more often a problem with the environment than with the client.

.github/ISSUE_TEMPLATE/http2.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
name: "package:http2"
3+
about: "Create a bug or file a feature request against package:http2."
4+
labels: "package:http2"
5+
---
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/ISSUE_TEMPLATE/http_parser.md

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

.github/dependabot.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,7 @@ updates:
99
interval: monthly
1010
labels:
1111
- autosubmit
12+
groups:
13+
github-actions:
14+
patterns:
15+
- "*"

.github/labeler.yml

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +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/**'
18+
19+
'package:http2':
20+
- changed-files:
21+
- any-glob-to-any-file: 'pkgs/http2/**'
1822

1923
'package:http_client_conformance_tests':
2024
- changed-files:
21-
- any-glob-to-any-file: 'pkgs/http_client_conformance_tests/**'
25+
- any-glob-to-any-file: 'pkgs/http_client_conformance_tests/**'
26+
27+
'package:http_multi_server':
28+
- changed-files:
29+
- any-glob-to-any-file: 'pkgs/http_multi_server/**'
30+
31+
'package:http_parser':
32+
- changed-files:
33+
- any-glob-to-any-file: 'pkgs/http_parser/**'
34+
35+
'package:web_socket_channel':
36+
- changed-files:
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/**'

.github/workflows/cronet.yml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ on:
66
- main
77
- master
88
paths:
9-
- '.github/workflows/cronet.yaml'
9+
- '.github/workflows/cronet.yml'
1010
- 'pkgs/cronet_http/**'
1111
- 'pkgs/http_client_conformance_tests/**'
1212
pull_request:
1313
paths:
14-
- '.github/workflows/cronet.yaml'
14+
- '.github/workflows/cronet.yml'
1515
- 'pkgs/cronet_http/**'
1616
- 'pkgs/http_client_conformance_tests/**'
1717
schedule:
@@ -23,20 +23,26 @@ env:
2323
jobs:
2424
verify:
2525
name: Format & Analyze & Test
26-
runs-on: macos-latest
26+
runs-on: ubuntu-latest
27+
timeout-minutes: 20
2728
strategy:
29+
fail-fast: false
2830
matrix:
2931
cronetHttpNoPlay: ['false', 'true']
3032
defaults:
3133
run:
3234
working-directory: pkgs/cronet_http
3335
steps:
34-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
35-
- uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8
36+
- name: Delete unnecessary tools 🔧
37+
uses: jlumbroso/[email protected]
38+
with:
39+
android: false # Don't remove Android tools
40+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
41+
- uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b
3642
with:
3743
distribution: 'zulu'
3844
java-version: '17'
39-
- uses: subosito/flutter-action@2783a3f08e1baf891508463f8c6653c258246225
45+
- uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1
4046
with:
4147
channel: 'stable'
4248
- id: install
@@ -49,7 +55,7 @@ jobs:
4955
if: always() && steps.install.outcome == 'success'
5056
run: flutter analyze --fatal-infos
5157
- name: Run tests
52-
uses: reactivecircus/android-emulator-runner@6b0df4b0efb23bb0ec63d881db79aefbc976e4b2
58+
uses: reactivecircus/android-emulator-runner@62dbb605bba737720e10b196cb4220d374026a6d
5359
if: always() && steps.install.outcome == 'success'
5460
with:
5561
# api-level/minSdkVersion should be help in sync in:
@@ -59,5 +65,4 @@ jobs:
5965
api-level: 21
6066
arch: x86_64
6167
target: ${{ matrix.cronetHttpNoPlay == 'true' && 'default' || 'google_apis' }}
62-
profile: pixel
6368
script: cd pkgs/cronet_http/example && flutter test --dart-define=cronetHttpNoPlay=${{ matrix.cronetHttpNoPlay }} --timeout=1200s integration_test/

.github/workflows/cupertino.yml

Lines changed: 39 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ env:
2121
PUB_ENVIRONMENT: bot.github
2222

2323
jobs:
24-
verify:
25-
name: Format & Analyze & Test
24+
macos:
25+
name: "macOS: Format & Analyze & Test"
2626
runs-on: macos-latest
2727
defaults:
2828
run:
@@ -31,34 +31,57 @@ jobs:
3131
matrix:
3232
# Test on the minimum supported flutter version and the latest
3333
# version.
34-
flutter-version: ["3.16.0", "any"]
34+
flutter-version: ["3.24.0", "any"]
35+
# It would be nice to test on older versions of macOS but macOS 13 is
36+
# the oldest supported by GitHub.
37+
os: [macos-13, macos-latest]
3538
steps:
36-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
37-
- uses: subosito/flutter-action@2783a3f08e1baf891508463f8c6653c258246225
39+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
40+
- uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1
3841
with:
3942
flutter-version: ${{ matrix.flutter-version }}
4043
channel: 'stable'
4144
- id: install
4245
name: Install dependencies
4346
run: flutter pub get
4447
- name: Check formatting
45-
# Don't lint the generated file native_cupertino_bindings.dart
46-
# This approach is simpler than using `find` and excluding that file
47-
# because `dart format` also excludes other file e.g. ones in
48-
# directories start with '.'.
49-
run: |
50-
mv lib/src/native_cupertino_bindings.dart lib/src/native_cupertino_bindings.tmp
51-
dart format --output=none --set-exit-if-changed .
52-
mv lib/src/native_cupertino_bindings.tmp lib/src/native_cupertino_bindings.dart
48+
run: dart format --output=none --set-exit-if-changed .
5349
if: always() && steps.install.outcome == 'success'
5450
- name: Analyze code
5551
run: flutter analyze --fatal-infos
5652
if: always() && steps.install.outcome == 'success'
57-
- uses: futureware-tech/simulator-action@bfa03d93ec9de6dacb0c5553bbf8da8afc6c2ee9
53+
- name: Run tests
54+
run: |
55+
cd example
56+
flutter pub get
57+
flutter test -d macos integration_test/main.dart --test-randomize-ordering-seed=random
58+
ios:
59+
name: "iOS: Test"
60+
runs-on: macos-latest
61+
defaults:
62+
run:
63+
working-directory: pkgs/cupertino_http
64+
strategy:
65+
fail-fast: false
66+
matrix:
67+
# Test on the minimum supported flutter version and the latest
68+
# version.
69+
flutter-version: ["3.24.0", "any"]
70+
steps:
71+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
72+
- uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1
73+
with:
74+
flutter-version: ${{ matrix.flutter-version }}
75+
channel: 'stable'
76+
- id: install
77+
name: Install dependencies
78+
run: flutter pub get
79+
- uses: futureware-tech/simulator-action@dab10d813144ef59b48d401cd95da151222ef8cd
5880
with:
59-
model: 'iPhone 8'
81+
os: iOS
82+
os_version: '>=13.0'
6083
- name: Run tests
6184
run: |
6285
cd example
6386
flutter pub get
64-
flutter test --timeout=1200s integration_test/
87+
flutter test integration_test/main.dart --test-randomize-ordering-seed=random

0 commit comments

Comments
 (0)