[http] Migrate to the latest pkg:web, require Dart 3.3 (#1132)
diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
index 2f70d2b..a170201 100644
--- a/.github/workflows/dart.yml
+++ b/.github/workflows/dart.yml
@@ -70,16 +70,16 @@
if: "always() && steps.pkgs_http_profile_pub_upgrade.conclusion == 'success'"
working-directory: pkgs/http_profile
job_003:
- name: "analyze_and_format; linux; Dart 3.2.0; PKGS: pkgs/http, pkgs/http_client_conformance_tests; `dart analyze --fatal-infos`"
+ name: "analyze_and_format; linux; Dart 3.2.0; PKG: pkgs/http_client_conformance_tests; `dart analyze --fatal-infos`"
runs-on: ubuntu-latest
steps:
- name: Cache Pub hosted dependencies
uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2
with:
path: "~/.pub-cache/hosted"
- key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/http-pkgs/http_client_conformance_tests;commands:analyze_1"
+ key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/http_client_conformance_tests;commands:analyze_1"
restore-keys: |
- os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/http-pkgs/http_client_conformance_tests
+ os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/http_client_conformance_tests
os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0
os:ubuntu-latest;pub-cache-hosted
os:ubuntu-latest
@@ -90,6 +90,36 @@
- id: checkout
name: Checkout repository
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
+ - id: pkgs_http_client_conformance_tests_pub_upgrade
+ name: pkgs/http_client_conformance_tests; dart pub upgrade
+ run: dart pub upgrade
+ if: "always() && steps.checkout.conclusion == 'success'"
+ working-directory: pkgs/http_client_conformance_tests
+ - name: "pkgs/http_client_conformance_tests; dart analyze --fatal-infos"
+ run: dart analyze --fatal-infos
+ if: "always() && steps.pkgs_http_client_conformance_tests_pub_upgrade.conclusion == 'success'"
+ working-directory: pkgs/http_client_conformance_tests
+ job_004:
+ name: "analyze_and_format; linux; Dart 3.3.0; PKG: pkgs/http; `dart analyze --fatal-infos`"
+ runs-on: ubuntu-latest
+ steps:
+ - name: Cache Pub hosted dependencies
+ uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2
+ with:
+ path: "~/.pub-cache/hosted"
+ key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/http;commands:analyze_1"
+ restore-keys: |
+ os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/http
+ os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0
+ os:ubuntu-latest;pub-cache-hosted
+ os:ubuntu-latest
+ - name: Setup Dart SDK
+ uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3
+ with:
+ sdk: "3.3.0"
+ - id: checkout
+ name: Checkout repository
+ uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
- id: pkgs_http_pub_upgrade
name: pkgs/http; dart pub upgrade
run: dart pub upgrade
@@ -99,16 +129,7 @@
run: dart analyze --fatal-infos
if: "always() && steps.pkgs_http_pub_upgrade.conclusion == 'success'"
working-directory: pkgs/http
- - id: pkgs_http_client_conformance_tests_pub_upgrade
- name: pkgs/http_client_conformance_tests; dart pub upgrade
- run: dart pub upgrade
- if: "always() && steps.checkout.conclusion == 'success'"
- working-directory: pkgs/http_client_conformance_tests
- - name: "pkgs/http_client_conformance_tests; dart analyze --fatal-infos"
- run: dart analyze --fatal-infos
- if: "always() && steps.pkgs_http_client_conformance_tests_pub_upgrade.conclusion == 'success'"
- working-directory: pkgs/http_client_conformance_tests
- job_004:
+ job_005:
name: "analyze_and_format; linux; Dart dev; PKGS: pkgs/http, pkgs/http_client_conformance_tests, pkgs/http_profile; `dart analyze --fatal-infos`"
runs-on: ubuntu-latest
steps:
@@ -156,7 +177,7 @@
run: dart analyze --fatal-infos
if: "always() && steps.pkgs_http_profile_pub_upgrade.conclusion == 'success'"
working-directory: pkgs/http_profile
- job_005:
+ job_006:
name: "analyze_and_format; linux; Dart dev; PKGS: pkgs/http, pkgs/http_client_conformance_tests, pkgs/http_profile; `dart format --output=none --set-exit-if-changed .`"
runs-on: ubuntu-latest
steps:
@@ -204,7 +225,7 @@
run: "dart format --output=none --set-exit-if-changed ."
if: "always() && steps.pkgs_http_profile_pub_upgrade.conclusion == 'success'"
working-directory: pkgs/http_profile
- job_006:
+ job_007:
name: "analyze_and_format; linux; Flutter stable; PKG: pkgs/flutter_http_example; `dart format --output=none --set-exit-if-changed .`"
runs-on: ubuntu-latest
steps:
@@ -234,7 +255,7 @@
run: "dart format --output=none --set-exit-if-changed ."
if: "always() && steps.pkgs_flutter_http_example_pub_upgrade.conclusion == 'success'"
working-directory: pkgs/flutter_http_example
- job_007:
+ job_008:
name: "analyze_and_format; linux; Flutter stable; PKG: pkgs/flutter_http_example; `flutter analyze --fatal-infos`"
runs-on: ubuntu-latest
steps:
@@ -264,7 +285,7 @@
run: flutter analyze --fatal-infos
if: "always() && steps.pkgs_flutter_http_example_pub_upgrade.conclusion == 'success'"
working-directory: pkgs/flutter_http_example
- job_008:
+ job_009:
name: "unit_test; linux; Dart 3.0.0; PKG: pkgs/http_profile; `dart test --platform vm`"
runs-on: ubuntu-latest
steps:
@@ -302,24 +323,25 @@
- job_005
- job_006
- job_007
- job_009:
- name: "unit_test; linux; Dart 3.2.0; PKG: pkgs/http; `dart run --define=no_default_http_client=true test/no_default_http_client_test.dart`"
+ - job_008
+ job_010:
+ name: "unit_test; linux; Dart 3.3.0; PKG: pkgs/http; `dart run --define=no_default_http_client=true test/no_default_http_client_test.dart`"
runs-on: ubuntu-latest
steps:
- name: Cache Pub hosted dependencies
uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2
with:
path: "~/.pub-cache/hosted"
- key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/http;commands:command_1"
+ key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/http;commands:command_1"
restore-keys: |
- os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/http
- os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0
+ os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/http
+ os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0
os:ubuntu-latest;pub-cache-hosted
os:ubuntu-latest
- name: Setup Dart SDK
uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3
with:
- sdk: "3.2.0"
+ sdk: "3.3.0"
- id: checkout
name: Checkout repository
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
@@ -340,24 +362,25 @@
- job_005
- job_006
- job_007
- job_010:
- name: "unit_test; linux; Dart 3.2.0; PKG: pkgs/http; `dart test --platform chrome`"
+ - job_008
+ job_011:
+ name: "unit_test; linux; Dart 3.3.0; PKG: pkgs/http; `dart test --platform chrome`"
runs-on: ubuntu-latest
steps:
- name: Cache Pub hosted dependencies
uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2
with:
path: "~/.pub-cache/hosted"
- key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/http;commands:test_3"
+ key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/http;commands:test_3"
restore-keys: |
- os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/http
- os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0
+ os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/http
+ os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0
os:ubuntu-latest;pub-cache-hosted
os:ubuntu-latest
- name: Setup Dart SDK
uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3
with:
- sdk: "3.2.0"
+ sdk: "3.3.0"
- id: checkout
name: Checkout repository
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
@@ -378,24 +401,25 @@
- job_005
- job_006
- job_007
- job_011:
- name: "unit_test; linux; Dart 3.2.0; PKG: pkgs/http; `dart test --platform vm`"
+ - job_008
+ job_012:
+ name: "unit_test; linux; Dart 3.3.0; PKG: pkgs/http; `dart test --platform vm`"
runs-on: ubuntu-latest
steps:
- name: Cache Pub hosted dependencies
uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2
with:
path: "~/.pub-cache/hosted"
- key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/http;commands:test_2"
+ key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/http;commands:test_2"
restore-keys: |
- os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/http
- os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0
+ os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/http
+ os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0
os:ubuntu-latest;pub-cache-hosted
os:ubuntu-latest
- name: Setup Dart SDK
uses: dart-lang/setup-dart@fedb1266e91cf51be2fdb382869461a434b920a3
with:
- sdk: "3.2.0"
+ sdk: "3.3.0"
- id: checkout
name: Checkout repository
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608
@@ -416,7 +440,8 @@
- job_005
- job_006
- job_007
- job_012:
+ - job_008
+ job_013:
name: "unit_test; linux; Dart dev; PKG: pkgs/http; `dart run --define=no_default_http_client=true test/no_default_http_client_test.dart`"
runs-on: ubuntu-latest
steps:
@@ -454,7 +479,8 @@
- job_005
- job_006
- job_007
- job_013:
+ - job_008
+ job_014:
name: "unit_test; linux; Dart dev; PKG: pkgs/http; `dart test --platform chrome`"
runs-on: ubuntu-latest
steps:
@@ -492,7 +518,8 @@
- job_005
- job_006
- job_007
- job_014:
+ - job_008
+ job_015:
name: "unit_test; linux; Dart dev; PKGS: pkgs/http, pkgs/http_profile; `dart test --platform vm`"
runs-on: ubuntu-latest
steps:
@@ -539,7 +566,8 @@
- job_005
- job_006
- job_007
- job_015:
+ - job_008
+ job_016:
name: "unit_test; linux; Dart dev; PKG: pkgs/http; `dart test --test-randomize-ordering-seed=random -p chrome -c dart2wasm`"
runs-on: ubuntu-latest
steps:
@@ -577,7 +605,8 @@
- job_005
- job_006
- job_007
- job_016:
+ - job_008
+ job_017:
name: "unit_test; linux; Flutter stable; PKG: pkgs/flutter_http_example; `flutter test --platform chrome`"
runs-on: ubuntu-latest
steps:
@@ -615,7 +644,8 @@
- job_005
- job_006
- job_007
- job_017:
+ - job_008
+ job_018:
name: "unit_test; linux; Flutter stable; PKG: pkgs/flutter_http_example; `flutter test`"
runs-on: ubuntu-latest
steps:
@@ -653,7 +683,8 @@
- job_005
- job_006
- job_007
- job_018:
+ - job_008
+ job_019:
name: "unit_test; macos; Flutter stable; PKG: pkgs/flutter_http_example; `flutter test`"
runs-on: macos-latest
steps:
@@ -691,7 +722,8 @@
- job_005
- job_006
- job_007
- job_019:
+ - job_008
+ job_020:
name: "unit_test; windows; Flutter stable; PKG: pkgs/flutter_http_example; `flutter test`"
runs-on: windows-latest
steps:
@@ -719,3 +751,4 @@
- job_005
- job_006
- job_007
+ - job_008
diff --git a/pkgs/http/CHANGELOG.md b/pkgs/http/CHANGELOG.md
index 9421143..86bc678 100644
--- a/pkgs/http/CHANGELOG.md
+++ b/pkgs/http/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 1.2.1
+
+* Require Dart `^3.3`
+* Require `package:web` `^0.5.0`.
+
## 1.2.0
* Add `MockClient.pngResponse`, which makes it easier to fake image responses.
diff --git a/pkgs/http/lib/src/browser_client.dart b/pkgs/http/lib/src/browser_client.dart
index cbbada6..07e2323 100644
--- a/pkgs/http/lib/src/browser_client.dart
+++ b/pkgs/http/lib/src/browser_client.dart
@@ -5,7 +5,7 @@
import 'dart:async';
import 'dart:js_interop';
-import 'package:web/helpers.dart';
+import 'package:web/web.dart';
import 'base_client.dart';
import 'base_request.dart';
diff --git a/pkgs/http/pubspec.yaml b/pkgs/http/pubspec.yaml
index a531a63..1874d5c 100644
--- a/pkgs/http/pubspec.yaml
+++ b/pkgs/http/pubspec.yaml
@@ -1,16 +1,16 @@
name: http
-version: 1.2.0
+version: 1.2.1
description: A composable, multi-platform, Future-based API for HTTP requests.
repository: https://github.com/dart-lang/http/tree/master/pkgs/http
environment:
- sdk: ^3.2.0
+ sdk: ^3.3.0
dependencies:
async: ^2.5.0
http_parser: ^4.0.0
meta: ^1.3.0
- web: '>=0.3.0 <0.5.0'
+ web: ^0.5.0
dev_dependencies:
dart_flutter_team_lints: ^2.0.0
diff --git a/pkgs/http/test/html/utils.dart b/pkgs/http/test/html/utils.dart
index 501c621..11170e1 100644
--- a/pkgs/http/test/html/utils.dart
+++ b/pkgs/http/test/html/utils.dart
@@ -2,7 +2,7 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
-import 'package:web/helpers.dart';
+import 'package:web/web.dart';
export '../utils.dart';
