Skip to content

Merge 0_5_x into master #263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 20, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ stages:

# Only building master means that we don't run two builds for each pull request.
branches:
only: [master]
only: [master,0_5_x]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could skip this part?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Going to leave it until we publish 0.6...


cache:
directories:
Expand Down
2 changes: 1 addition & 1 deletion example/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies:
json_annotation: ^0.2.5

dev_dependencies:
build_runner: ^0.8.9
build_runner: ^0.9.0
json_serializable: ^0.5.4
```

Expand Down
6 changes: 3 additions & 3 deletions example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ name: example
author: Dart Team <misc@dartlang.org>

environment:
sdk: '>=2.0.0-dev.54 <2.0.0'
sdk: '>=2.0.0-dev.54 <3.0.0'

dependencies:
json_annotation: ^0.2.5

dev_dependencies:
build_runner: ^0.8.9
build_runner: ^0.9.0
json_serializable: ^0.5.4

# Used by tests. Not required to use `json_serializable`.
path: ^1.5.1
test: ^0.12.38
test: ^1.3.0
2 changes: 1 addition & 1 deletion example/test/readme_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ dependencies:
json_annotation: ^0.2.5

dev_dependencies:
build_runner: ^0.8.9
build_runner: ^0.9.0
json_serializable: ^0.5.4
''';
4 changes: 4 additions & 0 deletions json_annotation/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
* Removed `$checkAllowedKeys`, `$enumDecode` and `$enumDecodeNullable` which are
no longer needed by the latest release of `package:json_serializable`.

## 0.2.9+1

* Support the Dart 2.0 stable release.

## 0.2.9

* When `FormatException` is caught in "checked mode", use the `message`
Expand Down
2 changes: 1 addition & 1 deletion json_annotation/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ description: >-
homepage: https://github.com/dart-lang/json_serializable
author: Dart Team <misc@dartlang.org>
environment:
sdk: '>=2.0.0-dev.54.0 <2.0.0'
sdk: '>=2.0.0-dev.54.0 <3.0.0'
4 changes: 4 additions & 0 deletions json_serializable/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@
which allows `TypeHelper` instances to add additional members when handling
a field. This is useful for generating shared helpers, for instance.

## 0.5.8+1

* Support the Dart 2.0 stable release.

## 0.5.8

* Small fixes to support Dart 2 runtime semantics.
Expand Down
2 changes: 1 addition & 1 deletion json_serializable/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ author: Dart Team <misc@dartlang.org>
description: Generates utilities to aid in serializing to/from JSON.
homepage: https://github.com/dart-lang/json_serializable
environment:
sdk: '>=2.0.0-dev.65 <2.0.0'
sdk: '>=2.0.0-dev.65 <3.0.0'

dependencies:
analyzer: ^0.32.2
Expand Down