From e6b56e3e144adee1857a54f2f0efd3e0029161af Mon Sep 17 00:00:00 2001
From: Jeroen Meijer <jeroenfkmeijer@gmail.com>
Date: Tue, 24 Sep 2024 15:37:48 +0200
Subject: [PATCH] ci: fix image name, update commands

---
 .github/workflows/ci.yaml             | 12 ++++++------
 .github/workflows/draft_release.yaml  |  8 ++++----
 .github/workflows/publish_to_pub.yaml |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index a81e0d3..80de864 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -9,22 +9,22 @@ jobs:
   kana_kit:
     runs-on: ubuntu-latest
     container:
-      image: google/dart:3.5.0
+      image: dart:3.5.0
     steps:
       - name: Checkout
         uses: actions/checkout@v2
 
       - name: Install dependencies
-        run: pub get
+        run: dart pub get
 
       - name: Format
-        run: dartfmt --dry-run --set-exit-if-changed .
+        run: dart format --dry-run --set-exit-if-changed .
 
       - name: Analyze
-        run: dartanalyzer --fatal-infos --fatal-warnings lib test
+        run: dart analyze --fatal-infos --fatal-warnings lib test
 
       - name: Test
-        run: pub run test_coverage
+        run: dart run test_coverage
 
       - name: Dry run publish
         run: |
@@ -32,7 +32,7 @@ jobs:
           mkdir -p ~/.pub-cache
           echo "$CREDENTIAL_JSON" > ~/.pub-cache/credentials.json 
           echo "Run pub publish --dry-run"
-          pub publish --dry-run
+          dart pub publish --dry-run
         env:
           CREDENTIAL_JSON: ${{ secrets.CREDENTIAL_JSON }}
 
diff --git a/.github/workflows/draft_release.yaml b/.github/workflows/draft_release.yaml
index 839fc68..31a86ab 100644
--- a/.github/workflows/draft_release.yaml
+++ b/.github/workflows/draft_release.yaml
@@ -8,27 +8,27 @@ jobs:
   update_release_draft:
     runs-on: ubuntu-latest
     container:
-      image: google/dart:3.5.0
+      image: dart:3.5.0
     steps:
       - name: Checkout
         uses: actions/checkout@v2
 
       - name: Install dependencies
-        run: pub get
+        run: dart pub get
 
       - name: Add pub executables to path
         run: echo "::add-path::$HOME/.pub-cache/bin"
 
       - name: Set pub version in env
         run: |
-          pub global activate pubspec_version
+          dart pub global activate pubspec_version
           echo "Current version is: $(pubver get)"
           echo "::set-env name=RELEASE_VERSION::$(pubver get)"
 
       - name: Create release draft
         uses: release-drafter/release-drafter@v5
         with:
-          publish: false
+       dart publish: false
           name: v${{ env.RELEASE_VERSION }}
           version: ${{ env.RELEASE_VERSION }}
           tag: ${{ env.RELEASE_VERSION }}
diff --git a/.github/workflows/publish_to_pub.yaml b/.github/workflows/publish_to_pub.yaml
index d864770..2cab540 100644
--- a/.github/workflows/publish_to_pub.yaml
+++ b/.github/workflows/publish_to_pub.yaml
@@ -7,7 +7,7 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     container:
-      image: google/dart:3.5.0
+      image: dart:3.5.0
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -21,6 +21,6 @@ jobs:
           mkdir -p ~/.pub-cache
           echo "$CREDENTIAL_JSON" > ~/.pub-cache/credentials.json 
           echo "Run pub publish --force"
-          pub publish --force
+       dart pub publish --force
         env:
           CREDENTIAL_JSON: ${{ secrets.CREDENTIAL_JSON }}