Skip to content

Commit

Permalink
Merge pull request #318 from Workiva/3.0.0-wip
Browse files Browse the repository at this point in the history
CPLAT-4521 CPLAT-7627 CPLAT-7708 dart_dev v3.0.0
  • Loading branch information
rmconsole7-wk authored Oct 29, 2019
2 parents 68169c0 + 6b93c9a commit e28758f
Show file tree
Hide file tree
Showing 389 changed files with 6,274 additions and 18,163 deletions.
34 changes: 4 additions & 30 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,33 +1,7 @@
.dart_tool
.dart_tool/
.idea/
.packages
.pub
.dart_tool
packages
/pubspec.lock
.pub/
build/
.idea/

# generated docs
/doc/api/
test_reports/

# generated coverage
/coverage/

# generated assets in test fixtures
/test_fixtures/copy_license/license_with_empty_lines_temp/
/test_fixtures/copy_license/no_licenses_temp/
/test_fixtures/coverage/browser/coverage/
/test_fixtures/coverage/browser_needs_pub_serve/coverage/
/test_fixtures/coverage/failing_test/coverage/
/test_fixtures/coverage/failing_test/test/failing_test.dart.temp.html
/test_fixtures/coverage/functional_test/coverage/
/test_fixtures/coverage/functional_test/test/functional/simple_test.dart.temp.html
/test_fixtures/coverage/non_test_file/coverage/
/test_fixtures/coverage/vm/coverage/
/test_fixtures/dart_x_only/doc/api/
/test_fixtures/docs/docs/doc/api/
/test_fixtures/format/changes_needed_temp/
/test_fixtures/needs_build_runner/.dart_tool
/test_fixtures/sass/fake_consumer_package
/test_fixtures/coverage/functional_test/pubspec.lock
/pubspec.lock
55 changes: 9 additions & 46 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,54 +1,17 @@
language: dart

# Workaround for issue with sandboxed Chrome in containerized Travis builds.
sudo: required

addons:
apt:
packages:
- ttf-kochi-mincho
- ttf-kochi-gothic
- ttf-dejavu
- ttf-indic-fonts
- fonts-tlwg-garuda
chrome: stable

dart:
- 1.24.3
- 2.3.0
- stable
- dev

before_install:
# Workaround for https://github.com/travis-ci/travis-ci/issues/8607
- sudo rm -vf /etc/apt/sources.list.d/*riak*
# Content shell needs this font. Since it has a EULA, we need to manually
# install it.
#
# TODO: remove this and use "sudo: false" when travis-ci/travis-ci#4714 is
# fixed.
- sudo apt-get update -yq
- sudo sh -c "echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections"
- sudo apt-get install msttcorefonts -qq

- mkdir -p bin
- export PATH="$PATH:`pwd`/bin/"
- ln -s `which chromium-browser` bin/google-chrome

- wget "http://gsdview.appspot.com/dart-archive/channels/stable/release/latest/dartium/content_shell-linux-x64-release.zip"
- unzip content_shell-linux-x64-release.zip
- ln -s `pwd`/`echo drt-linux-*`/content_shell bin/content_shell

- export DISPLAY=:99.0
- ./tool/setup_dartium.sh
- export PATH=$PATH":$PWD"
- sh -e /etc/init.d/xvfb start
sudo: required
addons:
chrome: stable

script:
- pub run dependency_validator -i browser,coverage,dart_style,test
- pub run dart_dev dart2-only -- format --check
- pub run dependency_validator -i pedantic
- pub run dart_dev analyze
- pub run dart_dev dart1-only ./tool/build_functional_coverage_fixture.sh
- pub run dart_dev dart1-only -- test -P dart1
- pub run dart_dev dart2-only -- test -P dart2
# TODO: no way to use a preset with coverage
# - pub run dart_dev dart1-only coverage --integration --no-html
# - bash <(curl -s https://codecov.io/bash) -f coverage/coverage.lcov
- pub run dart_dev format --check
- pub run dart_dev test
- pub publish --dry-run
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# Changelog

## [3.0.0](https://github.com/Workiva/dart_dev/compare/2.2.1...3.0.0)

**This is a major release of `dart_dev` with breaking changes.** It is also the
first release that drops support for Dart 1.

- [V3 upgrade guide][v3-upgrade-guide]
- [Updated README][v3-readme]
- [Additional docs][v3-docs]

[v3-upgrade-guide]: https://github.com/Workiva/dart_dev/blob/3.0.0/doc/v3-upgrade-guide.md
[v3-readme]: https://github.com/Workiva/dart_dev/blob/3.0.0/README.md
[v3-docs]: https://github.com/Workiva/dart_dev/blob/3.0.0/doc/README.md

## [2.0.6](https://github.com/Workiva/dart_dev/compare/2.0.5...2.0.6)

- **Improvement:** On dart 2, the `test` task now properly sets a non-zero
Expand Down
6 changes: 2 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
FROM google/dart:1.24.3

WORKDIR /build/
FROM google/dart:2.5
WORKDIR /build
ADD pubspec.yaml /build
RUN pub get
ARG BUILD_ARTIFACTS_BUILD=/build/pubspec.lock
FROM scratch
21 changes: 19 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright 2015 Workiva Inc.
Copyright 2015-2019 Workiva Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -10,4 +10,21 @@ Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
limitations under the License.

--------------------------------------------------

This dart_dev software includes a number of subcomponents with
separate copyright notices and/or license terms. Your use of the source
code for the these subcomponents is subject to the terms and
conditions of the following licenses:

Dart-lang build software: https://github.com/dart-lang/build
Copyright ©2016 Dart project authors.
Licensed under the BSD 3-Clause License: https://github.com/dart-lang/build/blob/master/LICENSE

Dart-lang build software: https://github.com/dart-lang/test
Copyright ©2016 Dart project authors.
Licensed under the BSD 3-Clause License: https://github.com/dart-lang/test/blob/master/pkgs/test/LICENSE

--------------------------------------------------
2 changes: 1 addition & 1 deletion NOTICE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dart_dev
Copyright 2015 Workiva Inc.
Copyright 2015-2019 Workiva Inc.

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

0 comments on commit e28758f

Please sign in to comment.