diff --git a/.github/workflows/giffy_dialog.yaml b/.github/workflows/giffy_dialog.yaml index 75ac184..4189b31 100644 --- a/.github/workflows/giffy_dialog.yaml +++ b/.github/workflows/giffy_dialog.yaml @@ -22,7 +22,7 @@ jobs: 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.22.0" - "3.x" runs-on: ubuntu-latest steps: diff --git a/CHANGELOG.md b/CHANGELOG.md index 32b07c4..d13dd35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,18 @@ +## Upcoming + +- Bump rive version to `^0.13.10`. +- Bump lottie version to `^3.1.0`. +- Bump minimum Flutter version to `3.22.0`. + ## 2.2.0 - Fix `Image` is imported from both packages. [#110](https://github.com/xsahil03x/giffy_dialog/issues/110) ## 2.1.0 -- Bump rive version to ^0.13.0. -- Bump lottie version to ^3.0.0. -- Bump minimum Flutter version to 3.16.0. +- Bump rive version to `^0.13.0`. +- Bump lottie version to `^3.0.0`. +- Bump minimum Flutter version to `3.16.0`. ## 2.0.0+2 diff --git a/example/pubspec.yaml b/example/pubspec.yaml index bf8973b..57e2198 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -5,8 +5,8 @@ publish_to: 'none' version: 1.0.0+1 environment: - sdk: ^3.2.0 - flutter: ">=3.16.0" + sdk: ^3.4.0 + flutter: ">=3.22.0" dependencies: flutter: diff --git a/lib/giffy_dialog.dart b/lib/giffy_dialog.dart index e2bbc81..f0d8b54 100644 --- a/lib/giffy_dialog.dart +++ b/lib/giffy_dialog.dart @@ -1,7 +1,7 @@ library; export 'package:lottie/lottie.dart'; -export 'package:rive/rive.dart'; +export 'package:rive/rive.dart' hide Image; export 'src/entry_animation.dart' show EntryAnimation; export 'src/giffy_modal.dart' show GiffyDialog, GiffyBottomSheet; diff --git a/lib/src/giffy_bottom_sheet.dart b/lib/src/giffy_bottom_sheet.dart index a0ff520..f3867c4 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( - rive.RiveAnimation 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 78f82cd..d735a76 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( - rive.RiveAnimation 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 7e4fa6b..d1ba52e 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' as rive; +import 'package:rive/rive.dart' hide Image; import 'entry_animation.dart'; diff --git a/pubspec.yaml b/pubspec.yaml index 5b3fc8a..59e2e8e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -6,13 +6,13 @@ repository: https://github.com/xsahil03x/giffy_dialog issue_tracker: https://github.com/xsahil03x/giffy_dialog/issues environment: - sdk: ^3.2.0 - flutter: ">=3.16.0" + sdk: ^3.4.0 + flutter: ">=3.22.0" dependencies: flutter: sdk: flutter - rive: ^0.13.0 + rive: ^0.13.10 lottie: ^3.1.0 dev_dependencies: