diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml index 625ab27..ba51894 100644 --- a/.github/workflows/cicd.yaml +++ b/.github/workflows/cicd.yaml @@ -18,33 +18,38 @@ jobs: channel: 'stable' - uses: flame-engine/flame-dartdoc-action@v2 - format: + analyze: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: subosito/flutter-action@v1 + - uses: actions/checkout@v3 + - uses: subosito/flutter-action@v2 + - uses: bluefireteam/melos-action@v3 + - name: "Analyze with latest stable" + uses: invertase/github-action-dart-analyzer@v2.0.0 with: - channel: 'stable' - - uses: flame-engine/flame-format-action@v1 + fatal-infos: true - analyze: + format: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: subosito/flutter-action@v1 + - uses: actions/checkout@v3 + - uses: subosito/flutter-action@v2 with: - channel: 'stable' - - uses: flame-engine/flame-analyze-action@v2 + cache: true + - uses: bluefireteam/melos-action@v3 + - name: Run format + run: melos format-check # END LINTING STAGE # BEGIN TESTING STAGE test: - needs: [dartdoc, format, analyze] runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: subosito/flutter-action@v1 + - uses: actions/checkout@v3 + - uses: subosito/flutter-action@v2 with: - channel: 'stable' - - uses: flame-engine/flame-test-action@v1 + cache: true + - uses: bluefireteam/melos-action@v3 + - name: Run tests + run: melos test # END TESTING STAGE diff --git a/melos.yaml b/melos.yaml index acbdb19..7a36309 100644 --- a/melos.yaml +++ b/melos.yaml @@ -29,12 +29,12 @@ scripts: description: Run `flutter analyze` for all packages. format: - run: melos exec flutter format . --fix - description: Run `flutter format` for all packages. + run: melos exec dart format . --fix + description: Run `dart format` for all packages. format-check: - run: melos exec flutter format . --set-exit-if-changed - description: Run `flutter format` checks for all packages. + run: melos exec dart format . --set-exit-if-changed + description: Run `dart format` checks for all packages. dartdoc: run: melos exec flutter pub run dartdoc diff --git a/packages/tiled/LICENSE b/packages/tiled/LICENSE index 242132d..3897c4d 100644 --- a/packages/tiled/LICENSE +++ b/packages/tiled/LICENSE @@ -1,6 +1,6 @@ -The MIT License (MIT) +MIT License -Copyright (c) +Copyright (c) 2021 Blue Fire Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -9,13 +9,14 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + diff --git a/packages/tiled/pubspec.yaml b/packages/tiled/pubspec.yaml index 8830085..5c9b04b 100644 --- a/packages/tiled/pubspec.yaml +++ b/packages/tiled/pubspec.yaml @@ -5,6 +5,7 @@ homepage: https://github.com/flame-engine/tiled.dart environment: sdk: ">=2.18.0 <3.0.0" + dependencies: archive: ^3.3.0 collection: ^1.16.0 @@ -15,6 +16,6 @@ dependencies: dev_dependencies: dartdoc: ^6.0.1 - flame_lint: ^1.1.1 + flame_lint: ^1.1.2 flutter_test: sdk: flutter