Update to Dart 3 (officially) (simc#168)

FabioSFernandes · Jul 16, 2023 · 34cfa79 · 34cfa79
1 parent 4368ef2
commit 34cfa79
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 21 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -7,16 +7,16 @@ jobs:
     runs-on: ubuntu-latest
 
     container:
-      image:  google/dart:2.12
+      image: dart:3.0
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - name: Install dependencies
-        run: pub get
+        run: dart pub get
       - name: Collect coverage
         run: |
-          pub global activate test_coverage
-          pub global run test_coverage
-      - uses: codecov/codecov-action@v1
+          dart pub global activate coverage
+          dart pub global run coverage:test_with_coverage
+      - uses: codecov/codecov-action@v3
         with:
           file: coverage/lcov.info
diff --git a/.github/workflows/dartx.yml b/.github/workflows/dartx.yml
@@ -9,17 +9,17 @@ jobs:
 
     strategy:
       matrix:
-        version: ["2.12", "dev"]
+        version: ["2.12", "2.19", "3.0", "beta"]
 
     container:
-      image:  google/dart:${{ matrix.version }}
+      image: dart:${{ matrix.version }}
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - name: Install dependencies
-        run: pub get
+        run: dart pub get
       - name: Run tests
-        run: pub run test
+        run: dart pub run test
 
   test-windows:
     timeout-minutes: 5
@@ -29,11 +29,11 @@ jobs:
       - name: Install dart
         run: |
           choco install dart-sdk
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - name: Install dependencies
-        run: C:\tools\dart-sdk\bin\pub.bat get
+        run: C:\tools\dart-sdk\bin\dart.exe pub get
       - name: Run tests
-        run: C:\tools\dart-sdk\bin\pub.bat run test
+        run: C:\tools\dart-sdk\bin\dart.exe pub run test
 
   test-macos:
     timeout-minutes: 5
@@ -46,18 +46,18 @@ jobs:
       - name: Install the Dart formula
         run: brew install dart
       - name: Install dependencies
-        run: pub get
+        run: dart pub get
       - name: Run tests
-        run: pub run test
+        run: dart pub run test
 
   format:
     timeout-minutes: 5
     runs-on: ubuntu-latest
 
     container:
-      image:  google/dart:dev
+      image: dart:stable
 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v2
       - name: Format
         run: dart format --set-exit-if-changed --fix .
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -2,4 +2,6 @@ include: package:lint/analysis_options_package.yaml
 
 linter:
   rules:
-    prefer_single_quotes: true
+    prefer_single_quotes: true
+    # This is an easy way to prevent name clashes with parameters
+    no_leading_underscores_for_local_identifiers: false
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -4,7 +4,7 @@ version: 1.1.0
 homepage: https://github.com/leisim/dartx
 
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: '>=2.12.0 <4.0.0'
 
 dependencies:
   characters: ^1.1.0
@@ -16,5 +16,5 @@ dependencies:
 
 dev_dependencies:
   fake_async: ^1.2.0
-  lint: ^1.5.0
+  lint: '>=1.5.0 <3.0.0'
   test: ^1.16.4