Skip to content

Commit e28758f

Browse files
Merge pull request #318 from Workiva/3.0.0-wip
CPLAT-4521 CPLAT-7627 CPLAT-7708 dart_dev v3.0.0
2 parents 68169c0 + 6b93c9a commit e28758f

File tree

389 files changed

+6274
-18163
lines changed

Some content is hidden

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

389 files changed

+6274
-18163
lines changed

.gitignore

Lines changed: 4 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,7 @@
1-
.dart_tool
1+
.dart_tool/
2+
.idea/
23
.packages
3-
.pub
4-
.dart_tool
5-
packages
6-
/pubspec.lock
4+
.pub/
75
build/
8-
.idea/
9-
10-
# generated docs
116
/doc/api/
12-
test_reports/
13-
14-
# generated coverage
15-
/coverage/
16-
17-
# generated assets in test fixtures
18-
/test_fixtures/copy_license/license_with_empty_lines_temp/
19-
/test_fixtures/copy_license/no_licenses_temp/
20-
/test_fixtures/coverage/browser/coverage/
21-
/test_fixtures/coverage/browser_needs_pub_serve/coverage/
22-
/test_fixtures/coverage/failing_test/coverage/
23-
/test_fixtures/coverage/failing_test/test/failing_test.dart.temp.html
24-
/test_fixtures/coverage/functional_test/coverage/
25-
/test_fixtures/coverage/functional_test/test/functional/simple_test.dart.temp.html
26-
/test_fixtures/coverage/non_test_file/coverage/
27-
/test_fixtures/coverage/vm/coverage/
28-
/test_fixtures/dart_x_only/doc/api/
29-
/test_fixtures/docs/docs/doc/api/
30-
/test_fixtures/format/changes_needed_temp/
31-
/test_fixtures/needs_build_runner/.dart_tool
32-
/test_fixtures/sass/fake_consumer_package
33-
/test_fixtures/coverage/functional_test/pubspec.lock
7+
/pubspec.lock

.travis.yml

Lines changed: 9 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,17 @@
11
language: dart
22

3-
# Workaround for issue with sandboxed Chrome in containerized Travis builds.
4-
sudo: required
5-
6-
addons:
7-
apt:
8-
packages:
9-
- ttf-kochi-mincho
10-
- ttf-kochi-gothic
11-
- ttf-dejavu
12-
- ttf-indic-fonts
13-
- fonts-tlwg-garuda
14-
chrome: stable
15-
163
dart:
17-
- 1.24.3
4+
- 2.3.0
185
- stable
6+
- dev
197

20-
before_install:
21-
# Workaround for https://github.com/travis-ci/travis-ci/issues/8607
22-
- sudo rm -vf /etc/apt/sources.list.d/*riak*
23-
# Content shell needs this font. Since it has a EULA, we need to manually
24-
# install it.
25-
#
26-
# TODO: remove this and use "sudo: false" when travis-ci/travis-ci#4714 is
27-
# fixed.
28-
- sudo apt-get update -yq
29-
- sudo sh -c "echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections"
30-
- sudo apt-get install msttcorefonts -qq
31-
32-
- mkdir -p bin
33-
- export PATH="$PATH:`pwd`/bin/"
34-
- ln -s `which chromium-browser` bin/google-chrome
35-
36-
- wget "http://gsdview.appspot.com/dart-archive/channels/stable/release/latest/dartium/content_shell-linux-x64-release.zip"
37-
- unzip content_shell-linux-x64-release.zip
38-
- ln -s `pwd`/`echo drt-linux-*`/content_shell bin/content_shell
39-
40-
- export DISPLAY=:99.0
41-
- ./tool/setup_dartium.sh
42-
- export PATH=$PATH":$PWD"
43-
- sh -e /etc/init.d/xvfb start
8+
sudo: required
9+
addons:
10+
chrome: stable
4411

4512
script:
46-
- pub run dependency_validator -i browser,coverage,dart_style,test
47-
- pub run dart_dev dart2-only -- format --check
13+
- pub run dependency_validator -i pedantic
4814
- pub run dart_dev analyze
49-
- pub run dart_dev dart1-only ./tool/build_functional_coverage_fixture.sh
50-
- pub run dart_dev dart1-only -- test -P dart1
51-
- pub run dart_dev dart2-only -- test -P dart2
52-
# TODO: no way to use a preset with coverage
53-
# - pub run dart_dev dart1-only coverage --integration --no-html
54-
# - bash <(curl -s https://codecov.io/bash) -f coverage/coverage.lcov
15+
- pub run dart_dev format --check
16+
- pub run dart_dev test
17+
- pub publish --dry-run

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# Changelog
22

3+
## [3.0.0](https://github.com/Workiva/dart_dev/compare/2.2.1...3.0.0)
4+
5+
**This is a major release of `dart_dev` with breaking changes.** It is also the
6+
first release that drops support for Dart 1.
7+
8+
- [V3 upgrade guide][v3-upgrade-guide]
9+
- [Updated README][v3-readme]
10+
- [Additional docs][v3-docs]
11+
12+
[v3-upgrade-guide]: https://github.com/Workiva/dart_dev/blob/3.0.0/doc/v3-upgrade-guide.md
13+
[v3-readme]: https://github.com/Workiva/dart_dev/blob/3.0.0/README.md
14+
[v3-docs]: https://github.com/Workiva/dart_dev/blob/3.0.0/doc/README.md
15+
316
## [2.0.6](https://github.com/Workiva/dart_dev/compare/2.0.5...2.0.6)
417

518
- **Improvement:** On dart 2, the `test` task now properly sets a non-zero

Dockerfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
FROM google/dart:1.24.3
2-
3-
WORKDIR /build/
1+
FROM google/dart:2.5
2+
WORKDIR /build
43
ADD pubspec.yaml /build
54
RUN pub get
6-
ARG BUILD_ARTIFACTS_BUILD=/build/pubspec.lock
75
FROM scratch

LICENSE

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2015 Workiva Inc.
1+
Copyright 2015-2019 Workiva Inc.
22

33
Licensed under the Apache License, Version 2.0 (the "License");
44
you may not use this file except in compliance with the License.
@@ -10,4 +10,21 @@ Unless required by applicable law or agreed to in writing, software
1010
distributed under the License is distributed on an "AS IS" BASIS,
1111
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
See the License for the specific language governing permissions and
13-
limitations under the License.
13+
limitations under the License.
14+
15+
--------------------------------------------------
16+
17+
This dart_dev software includes a number of subcomponents with
18+
separate copyright notices and/or license terms. Your use of the source
19+
code for the these subcomponents is subject to the terms and
20+
conditions of the following licenses:
21+
22+
Dart-lang build software: https://github.com/dart-lang/build
23+
Copyright ©2016 Dart project authors.
24+
Licensed under the BSD 3-Clause License: https://github.com/dart-lang/build/blob/master/LICENSE
25+
26+
Dart-lang build software: https://github.com/dart-lang/test
27+
Copyright ©2016 Dart project authors.
28+
Licensed under the BSD 3-Clause License: https://github.com/dart-lang/test/blob/master/pkgs/test/LICENSE
29+
30+
--------------------------------------------------

NOTICE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dart_dev
2-
Copyright 2015 Workiva Inc.
2+
Copyright 2015-2019 Workiva Inc.
33

44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)