From f43019a479b3df0862ae04f3dbb0d196ffd915f8 Mon Sep 17 00:00:00 2001 From: Dennis Kugelmann Date: Sat, 16 Jan 2021 14:06:17 +0100 Subject: [PATCH 1/5] Allow Dart version <2.13.0 --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 1e2c20f..3899741 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -7,7 +7,7 @@ dependencies: logging: ">=0.9.0 <0.12.0" path: "^1.6.3" environment: - sdk: ">=2.0.0 <2.11.0" + sdk: ">=2.0.0 <2.13.0" dev_dependencies: coverage: "0.13.11" test: "1.12.0" From 1da496cc02515a54aec6a821d7f85e07e1d85fd6 Mon Sep 17 00:00:00 2001 From: Dennis Kugelmann Date: Sat, 16 Jan 2021 14:07:07 +0100 Subject: [PATCH 2/5] Fix setup dependency versions --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 9071624..a028531 100644 --- a/README.md +++ b/README.md @@ -18,9 +18,9 @@ Depends on the following utilities: Add this to your package's pubspec.yaml file: ```yaml -dependencies: - coverage: "^0.7.0" - codecov: "^0.4.0" +dev_dependencies: + coverage: ^0.15.0 + codecov: ^1.0.0 ``` Install: From ca94a9acb4fc3a1978ee2b69db60b839b8da06dc Mon Sep 17 00:00:00 2001 From: Dennis Kugelmann Date: Sat, 16 Jan 2021 14:07:27 +0100 Subject: [PATCH 3/5] Test beta channel again --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 871431e..bd0daf0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: dart dart: - stable + - beta - "2.10.3" - "2.9.3" - "2.8.4" From 198513ef5c294592bec4e9d5b874ff8e6bf87c5d Mon Sep 17 00:00:00 2001 From: Dennis Kugelmann Date: Sat, 16 Jan 2021 14:08:01 +0100 Subject: [PATCH 4/5] Remove no-op --packages-dir flag --- .travis.yml | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index bd0daf0..aa4d312 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ dart: before_install: - sudo apt-get -y install libc6 script: - - pub get --packages-dir + - pub get - pub run test - pub run codecov --report-on=bin/ --no-html --verbose test/env_test.dart - bash <(curl -s https://codecov.io/bash) diff --git a/README.md b/README.md index a028531..c9e8a73 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ dev_dependencies: Install: ``` -pub get --packages-dir +pub get ``` From 50784df2bc33d2f19db82e867dfb2bddbb576371 Mon Sep 17 00:00:00 2001 From: Dennis Kugelmann Date: Sat, 16 Jan 2021 14:45:32 +0100 Subject: [PATCH 5/5] Opt-out of sound null safety --- bin/codecov.dart | 2 ++ bin/generate_coverage.dart | 2 ++ bin/src/coverage.dart | 2 ++ bin/src/env.dart | 2 ++ bin/src/executable.dart | 2 ++ bin/src/test.dart | 2 ++ pubspec.yaml | 2 +- 7 files changed, 13 insertions(+), 1 deletion(-) diff --git a/bin/codecov.dart b/bin/codecov.dart index 50bf334..b35be3a 100644 --- a/bin/codecov.dart +++ b/bin/codecov.dart @@ -1,3 +1,5 @@ +// @dart=2.9 + // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/bin/generate_coverage.dart b/bin/generate_coverage.dart index cbe94d5..35cd5c2 100644 --- a/bin/generate_coverage.dart +++ b/bin/generate_coverage.dart @@ -1,3 +1,5 @@ +// @dart=2.9 + // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/bin/src/coverage.dart b/bin/src/coverage.dart index c9344ed..80b344d 100644 --- a/bin/src/coverage.dart +++ b/bin/src/coverage.dart @@ -1,3 +1,5 @@ +// @dart=2.9 + // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/bin/src/env.dart b/bin/src/env.dart index 1345279..c45f512 100644 --- a/bin/src/env.dart +++ b/bin/src/env.dart @@ -1,3 +1,5 @@ +// @dart=2.9 + // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/bin/src/executable.dart b/bin/src/executable.dart index ff0d42e..f14f4c1 100644 --- a/bin/src/executable.dart +++ b/bin/src/executable.dart @@ -1,3 +1,5 @@ +// @dart=2.9 + // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/bin/src/test.dart b/bin/src/test.dart index a6d450e..12bb418 100644 --- a/bin/src/test.dart +++ b/bin/src/test.dart @@ -1,3 +1,5 @@ +// @dart=2.9 + // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/pubspec.yaml b/pubspec.yaml index 3899741..75b0261 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -7,7 +7,7 @@ dependencies: logging: ">=0.9.0 <0.12.0" path: "^1.6.3" environment: - sdk: ">=2.0.0 <2.13.0" + sdk: ">=2.12.0-0 <2.13.0" dev_dependencies: coverage: "0.13.11" test: "1.12.0"