From f1944057a8d299263b2a3ed5d11cd79f892ed992 Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Sat, 16 Nov 2024 17:39:17 +0100
Subject: [PATCH 1/2] ci: run analysis for min supported flutter version

Signed-off-by: Sahil Kumar <xdsahil@gmail.com>
---
 .github/workflows/giffy_dialog.yaml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.github/workflows/giffy_dialog.yaml b/.github/workflows/giffy_dialog.yaml
index 1c500d0..75ac184 100644
--- a/.github/workflows/giffy_dialog.yaml
+++ b/.github/workflows/giffy_dialog.yaml
@@ -17,6 +17,13 @@ jobs:
     uses: VeryGoodOpenSource/very_good_workflows/.github/workflows/semantic_pull_request.yml@v1
 
   build:
+    strategy:
+      matrix:
+        flutter-version:
+          # The version of Flutter to use should use the minimum Dart SDK version supported by the package,
+          # refer to https://docs.flutter.dev/development/tools/sdk/releases.
+          - "3.16.0"
+          - "3.x"
     runs-on: ubuntu-latest
     steps:
       - name: 📚 Git Checkout
@@ -25,8 +32,10 @@ jobs:
       - name: 🐦 Setup Flutter
         uses: subosito/flutter-action@v2
         with:
+          flutter-version: ${{matrix.flutter-version}}
           channel: stable
           cache: true
+          cache-key: flutter-:os:-:channel:-:version:-:arch:-:hash:-${{ hashFiles('**/pubspec.lock') }}
 
       - name: 📦 Install Dependencies
         run: flutter packages get
@@ -64,6 +73,7 @@ jobs:
         with:
           channel: stable
           cache: true
+          cache-key: flutter-:os:-:channel:-:version:-:arch:-:hash:-${{ hashFiles('**/pubspec.lock') }}
 
       - name: 📁 Build and release
         uses: bluefireteam/flutter-gh-pages@v8

From d66c316a3e7aadb8ac1ff9623250a69af4ef642c Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Sat, 16 Nov 2024 18:16:37 +0100
Subject: [PATCH 2/2] chore: fix analysis for min flutter version

Signed-off-by: Sahil Kumar <xdsahil@gmail.com>
---
 lib/src/giffy_bottom_sheet.dart | 2 +-
 lib/src/giffy_dialog.dart       | 2 +-
 lib/src/giffy_modal.dart        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/src/giffy_bottom_sheet.dart b/lib/src/giffy_bottom_sheet.dart
index f3867c4..a0ff520 100644
--- a/lib/src/giffy_bottom_sheet.dart
+++ b/lib/src/giffy_bottom_sheet.dart
@@ -121,7 +121,7 @@ class GiffyBottomSheet extends StatelessWidget {
 
   /// Creates an giffy bottom sheet which uses a [RiveAnimation] as the [giffy].
   const GiffyBottomSheet.rive(
-    RiveAnimation rive, {
+    rive.RiveAnimation rive, {
     super.key,
     this.giffyBuilder = defaultGiffyBuilder,
     this.giffyPadding,
diff --git a/lib/src/giffy_dialog.dart b/lib/src/giffy_dialog.dart
index d735a76..78f82cd 100644
--- a/lib/src/giffy_dialog.dart
+++ b/lib/src/giffy_dialog.dart
@@ -137,7 +137,7 @@ class GiffyDialog extends StatelessWidget {
 
   /// Creates a giffy dialog which uses a [RiveAnimation] as the [giffy].
   const GiffyDialog.rive(
-    RiveAnimation rive, {
+    rive.RiveAnimation rive, {
     super.key,
     this.giffyBuilder = defaultGiffyBuilder,
     this.giffyPadding,
diff --git a/lib/src/giffy_modal.dart b/lib/src/giffy_modal.dart
index d1ba52e..7e4fa6b 100644
--- a/lib/src/giffy_modal.dart
+++ b/lib/src/giffy_modal.dart
@@ -2,7 +2,7 @@ import 'dart:ui';
 
 import 'package:flutter/material.dart';
 import 'package:lottie/lottie.dart';
-import 'package:rive/rive.dart' hide Image;
+import 'package:rive/rive.dart' as rive;
 
 import 'entry_animation.dart';