From a3068abc90fa9688a51d8c660f24d3d6ed31cc87 Mon Sep 17 00:00:00 2001
From: Gibah Joseph <gibahjoe@gmail.com>
Date: Sun, 15 Dec 2024 00:47:27 +0000
Subject: [PATCH] chore: updated ci and bumped versions

---
 .github/workflows/release.yml  | 43 +++++++++++++++++++++++-----------
 openapi-generator/pubspec.yaml |  4 ++--
 2 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 075984b..f48249c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -3,23 +3,38 @@ name: Stable release 🕊️📦✅
 on:
   release:
     types:
-      - released
-      - prereleased
-  workflow_dispatch:
+      - released # Trigger on stable releases
+      - prereleased # Trigger on pre-releases (optional)
+  workflow_dispatch: # Allow manual triggering
 
 jobs:
   test:
     uses: gibahjoe/openapi-generator-dart/.github/workflows/code_quality.yml@master
-    secrets: inherit
-  publish:
-    name: Publish Packages with Melos
-    runs-on: ubuntu-latest
+    secrets: inherit # Reuse repository secrets
+
+  publish_annotations:
+    name: Publish Annotations Package
+    needs: [test]
+    permissions:
+      id-token: write # Required for authentication using OIDC
+    uses: dart-lang/setup-dart/.github/workflows/publish.yml@v1
+    with:
+      working-directory: openapi-generator-annotations
+
+  publish_cli:
+    name: Publish CLI Package
     needs: [test]
-    steps:
-      - uses: actions/checkout@v4
-      - uses: subosito/flutter-action@v2
-      - uses: bluefireteam/melos-action@v3
-      - uses: dart-lang/setup-dart@v1
+    permissions:
+      id-token: write # Required for authentication using OIDC
+    uses: dart-lang/setup-dart/.github/workflows/publish.yml@v1
+    with:
+      working-directory: openapi-generator-cli
 
-      - name: Publish
-        run: melos publish --no-dry-run --yes
+  publish_generator:
+    name: Publish Generator Package
+    needs: [publish_cli, publish_annotations]
+    permissions:
+      id-token: write # Required for authentication using OIDC
+    uses: dart-lang/setup-dart/.github/workflows/publish.yml@v1
+    with:
+      working-directory: openapi-generator
diff --git a/openapi-generator/pubspec.yaml b/openapi-generator/pubspec.yaml
index 8b2caba..4492661 100755
--- a/openapi-generator/pubspec.yaml
+++ b/openapi-generator/pubspec.yaml
@@ -10,9 +10,9 @@ dependencies:
   build: '>=1.0.0 <=3.0.0'
   source_gen: '>=1.0.0 <=2.0.0'
   path: '>=1.0.0 <=2.0.0'
-  openapi_generator_annotations: ^6.0.0
+  openapi_generator_annotations: ^6.1.0
   analyzer: '>=2.0.0 <7.0.0'
-  openapi_generator_cli: ^6.0.0
+  openapi_generator_cli: ^6.1.0
   crypto: '>=3.0.6 <=4.0.0'
   meta: '>=1.15.0 <=2.0.0'
   yaml: ^3.1.2