Skip to content

Commit

Permalink
Merge branch 'master' into chore/ci
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/workflows/cronet.yml
#	.github/workflows/cupertino.yml
#	.github/workflows/java.yml
  • Loading branch information
AlexV525 committed Feb 17, 2024
2 parents 63491a9 + 6d9f9ef commit 0acc751
Show file tree
Hide file tree
Showing 13 changed files with 209 additions and 115 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/cronet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ jobs:
matrix:
package: ['cronet_http', 'cronet_http_embedded']
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93
with:
distribution: 'zulu'
java-version: '17'
- uses: subosito/flutter-action@v2
- uses: subosito/flutter-action@2783a3f08e1baf891508463f8c6653c258246225
with:
channel: 'stable'
- name: Make cronet_http_embedded copy
Expand All @@ -55,7 +55,7 @@ jobs:
run: flutter analyze --fatal-infos
if: always() && steps.install.outcome == 'success'
- name: Run tests
uses: reactivecircus/android-emulator-runner@v2
uses: reactivecircus/android-emulator-runner@6b0df4b0efb23bb0ec63d881db79aefbc976e4b2
working-directory: 'pkgs/${{ matrix.package }}/example'
if: always() && steps.install.outcome == 'success'
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/cupertino.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ jobs:
# version.
flutter-version: ["3.16.0", "any"]
steps:
- uses: actions/checkout@v4
- uses: futureware-tech/simulator-action@v3
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- uses: futureware-tech/simulator-action@bfa03d93ec9de6dacb0c5553bbf8da8afc6c2ee9
with:
model: 'iPhone 8'
- uses: subosito/flutter-action@v2
- uses: subosito/flutter-action@2783a3f08e1baf891508463f8c6653c258246225
with:
flutter-version: ${{ matrix.flutter-version }}
channel: 'stable'
Expand Down
229 changes: 131 additions & 98 deletions .github/workflows/dart.yml

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions .github/workflows/java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ jobs:
run:
working-directory: pkgs/java_http
steps:
- uses: actions/checkout@v4
- uses: subosito/flutter-action@v2
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
- uses: subosito/flutter-action@2783a3f08e1baf891508463f8c6653c258246225
with:
channel: 'stable'
- id: install
Expand Down
37 changes: 37 additions & 0 deletions .github/workflows/no-response.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# A workflow to close issues where the author hasn't responded to a request for
# more information; see https://github.com/actions/stale.

name: No Response

# Run as a daily cron.
on:
schedule:
# Every day at 8am
- cron: '0 8 * * *'

# All permissions not specified are set to 'none'.
permissions:
issues: write
pull-requests: write

jobs:
no-response:
runs-on: ubuntu-latest
if: ${{ github.repository_owner == 'dart-lang' }}
steps:
- uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e
with:
# Don't automatically mark inactive issues+PRs as stale.
days-before-stale: -1
# Close needs-info issues and PRs after 14 days of inactivity.
days-before-close: 14
stale-issue-label: "needs-info"
close-issue-message: >
Without additional information we're not able to resolve this issue.
Feel free to add more info or respond to any questions above and we
can reopen the case. Thanks for your contribution!
stale-pr-label: "needs-info"
close-pr-message: >
Without additional information we're not able to resolve this PR.
Feel free to add more info or respond to any questions above.
Thanks for your contribution!
17 changes: 17 additions & 0 deletions .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# A CI configuration to auto-publish pub packages.

name: Publish

on:
pull_request:
branches: [ master ]
push:
tags: [ '[A-z]+-v[0-9]+.[0-9]+.[0-9]+' ]

jobs:
publish:
if: ${{ github.repository_owner == 'dart-lang' }}
uses: dart-lang/ecosystem/.github/workflows/publish.yaml@main
permissions:
id-token: write # Required for authentication using OIDC
pull-requests: write # Required for writing the pull request note
2 changes: 2 additions & 0 deletions pkgs/cupertino_http/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
## 1.3.1-wip

## 1.3.0

* Use `package:http_image_provider` in the example application.
Expand Down
2 changes: 1 addition & 1 deletion pkgs/cupertino_http/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ version: 1.0.0+1

environment:
sdk: ^3.2.0
flutter: ^3.16.0
flutter: '>=3.16.0'

dependencies:
cupertino_http:
Expand Down
4 changes: 2 additions & 2 deletions pkgs/cupertino_http/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name: cupertino_http
version: 1.3.0
version: 1.3.1-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.2.0
flutter: ^3.16.0 # If changed, update test matrix.
flutter: '>=3.16.0' # If changed, update test matrix.

dependencies:
async: ^2.5.0
Expand Down
5 changes: 5 additions & 0 deletions pkgs/http/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion pkgs/http/lib/src/browser_client.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
6 changes: 3 additions & 3 deletions pkgs/http/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkgs/http/test/html/utils.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down

0 comments on commit 0acc751

Please sign in to comment.