Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into cronet_profile
Browse files Browse the repository at this point in the history
  • Loading branch information
brianquinlan committed May 22, 2024
2 parents e6d674c + 7df2ac8 commit 50cdda4
Show file tree
Hide file tree
Showing 15 changed files with 2,367 additions and 295 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/cronet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ on:
- main
- master
paths:
- '.github/workflows/cronet.yaml'
- '.github/workflows/cronet.yml'
- 'pkgs/cronet_http/**'
- 'pkgs/http_client_conformance_tests/**'
pull_request:
paths:
- '.github/workflows/cronet.yaml'
- '.github/workflows/cronet.yml'
- 'pkgs/cronet_http/**'
- 'pkgs/http_client_conformance_tests/**'
schedule:
Expand All @@ -23,7 +23,7 @@ env:
jobs:
verify:
name: Format & Analyze & Test
runs-on: macos-latest
runs-on: ubuntu-latest
strategy:
matrix:
cronetHttpNoPlay: ['false', 'true']
Expand Down Expand Up @@ -59,5 +59,4 @@ jobs:
api-level: 21
arch: x86_64
target: ${{ matrix.cronetHttpNoPlay == 'true' && 'default' || 'google_apis' }}
profile: pixel
script: cd pkgs/cronet_http/example && flutter test --dart-define=cronetHttpNoPlay=${{ matrix.cronetHttpNoPlay }} --timeout=1200s integration_test/
20 changes: 10 additions & 10 deletions .github/workflows/dart.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 8 additions & 1 deletion pkgs/cronet_http/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
## 1.3.0-wip
## 1.3.0

* Add integration to the
[DevTools "Network" tab](https://docs.flutter.dev/tools/devtools/network).

## 1.2.1

* Upgrade `package:jni` to 0.9.2 to fix the build error in the latest versions
of Flutter.
* Upgrade `package:jnigen` to 0.9.1 and regenerate the bindings to improve the
efficiency of function calls.

## 1.2.0

* Support the Cronet embedding dependency with `--dart-define=cronetHttpNoPlay=true`.
Expand Down
1 change: 0 additions & 1 deletion pkgs/cronet_http/jnigen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ android_sdk_config:
android_example: 'example/'

output:
bindings_type: dart_only
dart:
path: 'lib/src/jni/jni_bindings.dart'
structure: single_file
Expand Down
Loading

0 comments on commit 50cdda4

Please sign in to comment.