Skip to content

Commit 34cfa79

Browse files
authored
Update to Dart 3 (officially) (#168)
1 parent 4368ef2 commit 34cfa79

File tree

4 files changed

+23
-21
lines changed

4 files changed

+23
-21
lines changed

.github/workflows/coverage.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ jobs:
77
runs-on: ubuntu-latest
88

99
container:
10-
image: google/dart:2.12
10+
image: dart:3.0
1111

1212
steps:
13-
- uses: actions/checkout@v1
13+
- uses: actions/checkout@v2
1414
- name: Install dependencies
15-
run: pub get
15+
run: dart pub get
1616
- name: Collect coverage
1717
run: |
18-
pub global activate test_coverage
19-
pub global run test_coverage
20-
- uses: codecov/codecov-action@v1
18+
dart pub global activate coverage
19+
dart pub global run coverage:test_with_coverage
20+
- uses: codecov/codecov-action@v3
2121
with:
2222
file: coverage/lcov.info

.github/workflows/dartx.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ jobs:
99

1010
strategy:
1111
matrix:
12-
version: ["2.12", "dev"]
12+
version: ["2.12", "2.19", "3.0", "beta"]
1313

1414
container:
15-
image: google/dart:${{ matrix.version }}
15+
image: dart:${{ matrix.version }}
1616

1717
steps:
18-
- uses: actions/checkout@v1
18+
- uses: actions/checkout@v2
1919
- name: Install dependencies
20-
run: pub get
20+
run: dart pub get
2121
- name: Run tests
22-
run: pub run test
22+
run: dart pub run test
2323

2424
test-windows:
2525
timeout-minutes: 5
@@ -29,11 +29,11 @@ jobs:
2929
- name: Install dart
3030
run: |
3131
choco install dart-sdk
32-
- uses: actions/checkout@v1
32+
- uses: actions/checkout@v2
3333
- name: Install dependencies
34-
run: C:\tools\dart-sdk\bin\pub.bat get
34+
run: C:\tools\dart-sdk\bin\dart.exe pub get
3535
- name: Run tests
36-
run: C:\tools\dart-sdk\bin\pub.bat run test
36+
run: C:\tools\dart-sdk\bin\dart.exe pub run test
3737

3838
test-macos:
3939
timeout-minutes: 5
@@ -46,18 +46,18 @@ jobs:
4646
- name: Install the Dart formula
4747
run: brew install dart
4848
- name: Install dependencies
49-
run: pub get
49+
run: dart pub get
5050
- name: Run tests
51-
run: pub run test
51+
run: dart pub run test
5252

5353
format:
5454
timeout-minutes: 5
5555
runs-on: ubuntu-latest
5656

5757
container:
58-
image: google/dart:dev
58+
image: dart:stable
5959

6060
steps:
61-
- uses: actions/checkout@v1
61+
- uses: actions/checkout@v2
6262
- name: Format
6363
run: dart format --set-exit-if-changed --fix .

analysis_options.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@ include: package:lint/analysis_options_package.yaml
22

33
linter:
44
rules:
5-
prefer_single_quotes: true
5+
prefer_single_quotes: true
6+
# This is an easy way to prevent name clashes with parameters
7+
no_leading_underscores_for_local_identifiers: false

pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version: 1.1.0
44
homepage: https://github.com/leisim/dartx
55

66
environment:
7-
sdk: '>=2.12.0 <3.0.0'
7+
sdk: '>=2.12.0 <4.0.0'
88

99
dependencies:
1010
characters: ^1.1.0
@@ -16,5 +16,5 @@ dependencies:
1616

1717
dev_dependencies:
1818
fake_async: ^1.2.0
19-
lint: ^1.5.0
19+
lint: '>=1.5.0 <3.0.0'
2020
test: ^1.16.4

0 commit comments

Comments
 (0)