From 7382f941379de6945d462a56c3d0fe12ce199639 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Mar 2024 13:06:07 +0530 Subject: [PATCH 1/7] chore: bump codecov/codecov-action from 3 to 4 (#104) Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 3 to 4. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-action/compare/v3...v4) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/giffy_dialog.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/giffy_dialog.yaml b/.github/workflows/giffy_dialog.yaml index 42d3b72..640b485 100644 --- a/.github/workflows/giffy_dialog.yaml +++ b/.github/workflows/giffy_dialog.yaml @@ -46,7 +46,7 @@ jobs: min_coverage: 75 - name: 📁 Upload coverage to Codecov - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 release: needs: build From 88441c9ecd7da33bcbc59bd7c434ea2f18131eb8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Mar 2024 13:15:42 +0530 Subject: [PATCH 2/7] chore: bump VeryGoodOpenSource/very_good_coverage from 2 to 3 (#105) Bumps [VeryGoodOpenSource/very_good_coverage](https://github.com/verygoodopensource/very_good_coverage) from 2 to 3. - [Release notes](https://github.com/verygoodopensource/very_good_coverage/releases) - [Changelog](https://github.com/VeryGoodOpenSource/very_good_coverage/blob/main/CHANGELOG.md) - [Commits](https://github.com/verygoodopensource/very_good_coverage/compare/v2...v3) --- updated-dependencies: - dependency-name: VeryGoodOpenSource/very_good_coverage dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/giffy_dialog.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/giffy_dialog.yaml b/.github/workflows/giffy_dialog.yaml index 640b485..1c500d0 100644 --- a/.github/workflows/giffy_dialog.yaml +++ b/.github/workflows/giffy_dialog.yaml @@ -41,7 +41,7 @@ jobs: run: flutter test --no-pub --coverage --test-randomize-ordering-seed random - name: 📊 Check Code Coverage - uses: VeryGoodOpenSource/very_good_coverage@v2 + uses: VeryGoodOpenSource/very_good_coverage@v3 with: min_coverage: 75 From 35a817277fb40d5e3cf16d497395fbc1dc4d63bc Mon Sep 17 00:00:00 2001 From: Sahil Kumar Date: Sat, 16 Nov 2024 17:34:58 +0100 Subject: [PATCH 3/7] chore: Update FUNDING.yml --- .github/FUNDING.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index c38f7d3..0139070 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1,11 +1,3 @@ # These are supported funding model platforms -github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] -patreon: xsahil03x -open_collective: # Replace with a single Open Collective username -ko_fi: # Replace with a single Ko-fi username -tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel -community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry -liberapay: # Replace with a single Liberapay username -issuehunt: # Replace with a single IssueHunt username -otechie: # Replace with a single Otechie username +github: xsahil03x From f35484c95fdd46028aa88dbcd1211f18dc925a9d Mon Sep 17 00:00:00 2001 From: Sahil Kumar Date: Sat, 16 Nov 2024 17:36:50 +0100 Subject: [PATCH 4/7] fix: Image is imported from both Rive and Flutter. (#111) Signed-off-by: Sahil Kumar --- CHANGELOG.md | 4 ++++ example/lib/main.dart | 12 ++++++++---- example/pubspec.yaml | 4 ++-- lib/giffy_dialog.dart | 2 +- lib/src/giffy_modal.dart | 2 +- pubspec.yaml | 6 +++--- 6 files changed, 19 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e43f9ef..4ea7158 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## Upcoming + +- 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. diff --git a/example/lib/main.dart b/example/lib/main.dart index be55f3f..64a9ea6 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -2,11 +2,13 @@ import 'package:flutter/material.dart'; import 'package:giffy_dialog/giffy_dialog.dart'; import 'package:google_fonts/google_fonts.dart'; -void main() => runApp(new MyApp()); +void main() => runApp(MyApp()); final material3Notifier = ValueNotifier(true); class MyApp extends StatelessWidget { + const MyApp({super.key}); + @override Widget build(BuildContext context) { return ValueListenableBuilder( @@ -35,6 +37,8 @@ class MyApp extends StatelessWidget { } class MyHomePage extends StatelessWidget { + const MyHomePage({super.key}); + @override Widget build(BuildContext context) { return Scaffold( @@ -67,7 +71,7 @@ class MyHomePage extends StatelessWidget { } class MaterialToggleButtons extends StatelessWidget { - const MaterialToggleButtons({Key? key}) : super(key: key); + const MaterialToggleButtons({super.key}); @override Widget build(BuildContext context) { @@ -87,7 +91,6 @@ class MaterialToggleButtons extends StatelessWidget { return ToggleButtons( isSelected: [!useMaterial3, useMaterial3], - children: [Text('Material 2'), Text('Material 3')], borderRadius: borderRadius, borderColor: borderColor, selectedBorderColor: borderColor, @@ -101,6 +104,7 @@ class MaterialToggleButtons extends StatelessWidget { onPressed: (index) { material3Notifier.value = index == 1; }, + children: [Text('Material 2'), Text('Material 3')], ); } } @@ -216,7 +220,7 @@ class TypedExample extends StatelessWidget { ); } - return Container( + return SizedBox( height: 36, child: Row( children: [ diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 67f151a..bf8973b 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -5,7 +5,7 @@ publish_to: 'none' version: 1.0.0+1 environment: - sdk: ">=3.2.0 <4.0.0" + sdk: ^3.2.0 flutter: ">=3.16.0" dependencies: @@ -13,7 +13,7 @@ dependencies: sdk: flutter giffy_dialog: path: ../ - google_fonts: ^4.0.3 + google_fonts: ^6.2.0 flutter: uses-material-design: true diff --git a/lib/giffy_dialog.dart b/lib/giffy_dialog.dart index 4d05f49..e2bbc81 100644 --- a/lib/giffy_dialog.dart +++ b/lib/giffy_dialog.dart @@ -1,4 +1,4 @@ -library giffy_dialog; +library; export 'package:lottie/lottie.dart'; export 'package:rive/rive.dart'; diff --git a/lib/src/giffy_modal.dart b/lib/src/giffy_modal.dart index a6a7972..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'; +import 'package:rive/rive.dart' hide Image; import 'entry_animation.dart'; diff --git a/pubspec.yaml b/pubspec.yaml index 69a7a37..34e5138 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -6,19 +6,19 @@ repository: https://github.com/xsahil03x/giffy_dialog issue_tracker: https://github.com/xsahil03x/giffy_dialog/issues environment: - sdk: ">=3.2.0 <4.0.0" + sdk: ^3.2.0 flutter: ">=3.16.0" dependencies: flutter: sdk: flutter rive: ^0.13.0 - lottie: ^3.0.0 + lottie: ^3.1.0 dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^3.0.0 + flutter_lints: ">=4.0.0 <6.0.0" topics: - dialog From dfbd816557013cc6bec4a132e7d64e8352e3a0b6 Mon Sep 17 00:00:00 2001 From: Sahil Kumar Date: Sat, 16 Nov 2024 18:23:30 +0100 Subject: [PATCH 5/7] ci: run analysis for min supported flutter version (#112) * ci: run analysis for min supported flutter version Signed-off-by: Sahil Kumar * chore: fix analysis for min flutter version Signed-off-by: Sahil Kumar --------- Signed-off-by: Sahil Kumar --- .github/workflows/giffy_dialog.yaml | 10 ++++++++++ lib/src/giffy_bottom_sheet.dart | 2 +- lib/src/giffy_dialog.dart | 2 +- lib/src/giffy_modal.dart | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) 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 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'; From 721115e27deb7b08472765d316a5674c69b2d20c Mon Sep 17 00:00:00 2001 From: Sahil Kumar Date: Sat, 16 Nov 2024 18:28:09 +0100 Subject: [PATCH 6/7] ci: add pub publish workflow (#113) Signed-off-by: Sahil Kumar --- .github/workflows/pub_publish.yaml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/workflows/pub_publish.yaml diff --git a/.github/workflows/pub_publish.yaml b/.github/workflows/pub_publish.yaml new file mode 100644 index 0000000..ed8981a --- /dev/null +++ b/.github/workflows/pub_publish.yaml @@ -0,0 +1,25 @@ +name: pub_publish + +on: + push: + tags: + - "v[0-9]+.[0-9]+.[0-9]+*" + +jobs: + publish: + permissions: + id-token: write # Required for authentication using OIDC + runs-on: ubuntu-latest + steps: + - name: 📚 Git Checkout + uses: actions/checkout@v4 + - name: 🎯 Setup Dart + uses: dart-lang/setup-dart@v1 + - name: 🐦 Setup Flutter + uses: subosito/flutter-action@v2 + - name: 📦 Install Dependencies + run: flutter pub get + - name: 🌵 Dry Run + run: dart pub publish --dry-run + - name: 📢 Publish + run: dart pub publish --force \ No newline at end of file From 0d0f53c37b0c6a90dbb830d4f7474466e9182f1a Mon Sep 17 00:00:00 2001 From: Sahil Kumar Date: Sat, 16 Nov 2024 18:32:57 +0100 Subject: [PATCH 7/7] chore: release v2.2.0 (#114) Signed-off-by: Sahil Kumar --- CHANGELOG.md | 2 +- pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ea7158..32b07c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## Upcoming +## 2.2.0 - Fix `Image` is imported from both packages. [#110](https://github.com/xsahil03x/giffy_dialog/issues/110) diff --git a/pubspec.yaml b/pubspec.yaml index 34e5138..5b3fc8a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: giffy_dialog homepage: https://github.com/xsahil03x/giffy_dialog description: A Flutter package for a quick, handy and beautiful giffy dialogs and bottom sheets. -version: 2.1.0 +version: 2.2.0 repository: https://github.com/xsahil03x/giffy_dialog issue_tracker: https://github.com/xsahil03x/giffy_dialog/issues