Skip to content

Commit

Permalink
bump dart sdk support dart 3, remove deprecated flutter pub run, upgr…
Browse files Browse the repository at this point in the history
…ade deps
  • Loading branch information
mrrhak committed Jun 9, 2023
1 parent da7da16 commit 4dc7ea6
Show file tree
Hide file tree
Showing 56 changed files with 60 additions and 56 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
# Changelog
## 2.1.1

- Bump Dart SDK lower bound to <4.0.0 to support Dart 3
- Update doc command to use `dart run` instead of `flutter pub run` that deprecated
- Upgrade dependencies

## 2.1.0

- Added new support android material 3 monochrome icons ([#28](https://github.com/mrrhak/icons_launcher/pull/28))
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,14 @@ After setting up the configuration, all that is left to do is run the package:

```sh
flutter pub get
flutter pub run icons_launcher:create
dart run icons_launcher:create
```

If you name your configuration file something other than `icons_launcher.yaml` or `pubspec.yaml` you will need to specify the name of the file when running the package.

```sh
flutter pub get
flutter pub run icons_launcher:create --path <your config file name here>
dart run icons_launcher:create --path <your config file name here>
```

NOTE: If you are not using the existing `pubspec.yaml` your config file must still be located in the same directory as it.
Expand Down Expand Up @@ -175,7 +175,7 @@ Run with flavor:

```sh
flutter pub get
flutter pub run icons_launcher:create --flavor dev
dart run icons_launcher:create --flavor dev
```

The configuration file format is the same.
Expand Down
13 changes: 5 additions & 8 deletions analysis_options.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
# Android Studio, and the `flutter analyze` command.

analyzer:
strong-mode:
implicit-dynamic: false
errors:
# treat missing required parameters as a warning (not a hint)
missing_required_param: warning
Expand All @@ -33,12 +31,12 @@ analyzer:
# Please see https://github.com/flutter/flutter/pull/24528 for details.
sdk_version_async_exported_from_core: ignore
exclude:
- 'bin/cache/**'
- "bin/cache/**"
# the following two are relative to the stocks example and the flutter package respectively
# see https://github.com/dart-lang/sdk/issues/28463
- 'lib/i18n/stock_messages_*.dart'
- 'lib/src/http/**'
- 'example/**'
- "lib/i18n/stock_messages_*.dart"
- "lib/src/http/**"
- "example/**"
- lib/src/version.dart

linter:
Expand All @@ -51,7 +49,7 @@ linter:
# - always_put_required_named_parameters_first # we prefer having parameters in the same order as fields https://github.com/flutter/flutter/issues/10219
- always_require_non_null_named_parameters
- annotate_overrides
# - avoid_annotating_with_dynamic # conflicts with always_specify_types
# - avoid_annotating_with_dynamic # conflicts with always_specify_types
# - avoid_bool_literals_in_conditional_expressions # not yet tested
# - avoid_catches_without_on_clauses # we do this commonly
# - avoid_catching_errors # we do this commonly
Expand Down Expand Up @@ -128,7 +126,6 @@ linter:
- prefer_const_literals_to_create_immutables
# - prefer_constructors_over_static_methods # not yet tested
- prefer_contains
- prefer_equal_for_default_values
# - prefer_expression_function_bodies # conflicts with https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo#consider-using--for-short-functions-and-methods
- prefer_final_fields
- prefer_final_locals
Expand Down
6 changes: 3 additions & 3 deletions example/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,18 +53,18 @@ After configured, now you can run generation

```sh
flutter pub get
flutter pub run icons_launcher:create
dart run icons_launcher:create
```
Or with custom yaml file

```sh
flutter pub get
flutter pub run icons_launcher:create --path <your config file name here>
dart run icons_launcher:create --path <your config file name here>
```

Or flavor app ([Example](https://github.com/mrrhak/icons_launcher/tree/master/example/flavor_app))

```sh
flutter pub get
flutter pub run icons_launcher:create --flavor <your flavor>
dart icons_launcher:create --flavor <your flavor>
```
4 changes: 2 additions & 2 deletions example/flavor_app/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ First: `flutter pub get`

Then generate `dev` and `prod` flavors with the commands:
```
flutter pub run icons_launcher:create --flavor dev
flutter pub run icons_launcher:create --flavor prod
dart run icons_launcher:create --flavor dev
dart run icons_launcher:create --flavor prod
```
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@mipmap/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
<monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
</adaptive-icon>
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@mipmap/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
<monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
</adaptive-icon>
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 13 additions & 14 deletions example/flavor_app/icons_launcher-dev.yaml
Original file line number Diff line number Diff line change
@@ -1,30 +1,29 @@
# flutter pub run icons_launcher:create --flavor dev
# dart run icons_launcher:create --flavor dev

icons_launcher:
image_path: 'assets/ic_logo_border.png'
image_path: "assets/ic_logo_border.png"
platforms:
android:
enable: true
image_path: 'assets/ic_logo_border.png'
image_path: "assets/ic_logo_border.png"
# adaptive_background_color: '#ffffff'
adaptive_background_image: 'assets/ic_background.png'
adaptive_foreground_image: 'assets/ic_foreground.png'
adaptive_round_image: 'assets/ic_logo_round.png'
adaptive_monochrome_image: 'assets/ic_logo_monochrome.png'
adaptive_background_image: "assets/ic_background.png"
adaptive_foreground_image: "assets/ic_foreground.png"
adaptive_round_image: "assets/ic_logo_round.png"
adaptive_monochrome_image: "assets/ic_logo_monochrome.png"
ios:
enable: true
image_path: 'assets/ic_logo_rectangle.png'
image_path: "assets/ic_logo_rectangle.png"
web:
enable: true
image_path: 'assets/ic_logo_border.png'
favicon_path: 'assets/ic_logo_round.png'
image_path: "assets/ic_logo_border.png"
favicon_path: "assets/ic_logo_round.png"
macos:
enable: true
image_path: 'assets/ic_logo_border.png'
image_path: "assets/ic_logo_border.png"
windows:
enable: false
image_path: 'assets/ic_logo_border.png'
image_path: "assets/ic_logo_border.png"
linux:
enable: false
image_path: 'assets/ic_logo_border.png'

image_path: "assets/ic_logo_border.png"
26 changes: 13 additions & 13 deletions example/flavor_app/icons_launcher-prod.yaml
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
# flutter pub run icons_launcher:create --flavor prod
# dart run icons_launcher:create --flavor prod

icons_launcher:
image_path: 'assets/ic_logo_border.png'
image_path: "assets/ic_logo_border.png"
platforms:
android:
enable: true
image_path: 'assets/ic_logo_border.png'
image_path: "assets/ic_logo_border.png"
# adaptive_background_color: '#ffffff'
adaptive_background_image: 'assets/ic_background.png'
adaptive_foreground_image: 'assets/ic_foreground.png'
adaptive_round_image: 'assets/ic_logo_round.png'
adaptive_monochrome_image: 'assets/ic_logo_monochrome.png'
adaptive_background_image: "assets/ic_background.png"
adaptive_foreground_image: "assets/ic_foreground.png"
adaptive_round_image: "assets/ic_logo_round.png"
adaptive_monochrome_image: "assets/ic_logo_monochrome.png"
ios:
enable: true
image_path: 'assets/ic_logo_rectangle.png'
image_path: "assets/ic_logo_rectangle.png"
web:
enable: true
image_path: 'assets/ic_logo_border.png'
favicon_path: 'assets/ic_logo_round.png'
image_path: "assets/ic_logo_border.png"
favicon_path: "assets/ic_logo_round.png"
macos:
enable: true
image_path: 'assets/ic_logo_border.png'
image_path: "assets/ic_logo_border.png"
windows:
enable: false
image_path: 'assets/ic_logo_border.png'
image_path: "assets/ic_logo_border.png"
linux:
enable: false
image_path: 'assets/ic_logo_border.png'
image_path: "assets/ic_logo_border.png"
4 changes: 2 additions & 2 deletions example/flavor_app/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ publish_to: "none"
version: 1.0.0+1

environment:
sdk: ">=2.17.1 <3.0.0"
sdk: ">=2.17.1 <4.0.0"
dependencies:
flutter:
sdk: flutter
cupertino_icons: ^1.0.5
flutter_flavorizr: ^2.1.5
flutter_flavorizr: ^2.2.1

dependency_overrides:
image: ^4.0.13
Expand Down
2 changes: 1 addition & 1 deletion example/simple_app/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ First: `flutter pub get`

Then generate icons with the command:
```
flutter pub run icons_launcher:create --path icons_launcher.yaml
dart run icons_launcher:create --path icons_launcher.yaml
```
2 changes: 1 addition & 1 deletion example/simple_app/icons_launcher.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# flutter pub run icons_launcher:create
# dart run icons_launcher:create

icons_launcher:
image_path: "assets/ic_logo_border.png"
Expand Down
2 changes: 1 addition & 1 deletion example/simple_app/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ publish_to: "none"
version: 1.0.0+1

environment:
sdk: ">=2.17.1 <3.0.0"
sdk: ">=2.17.1 <4.0.0"

dependencies:
flutter:
Expand Down
2 changes: 1 addition & 1 deletion lib/src/version.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,24 @@ maintainer: Mrr Hak
homepage: https://mrrhak.com
repository: https://github.com/mrrhak/icons_launcher
issue_tracker: https://github.com/mrrhak/icons_launcher/issues
version: 2.1.0
version: 2.1.1
funding:
- https://ko-fi.com/mrrhak
screenshots:
- description: "Icons Launcher"
path: assets/icons_launcher_profile.webp

dependencies:
args: ^2.4.0
image: ^4.0.13
args: ^2.4.2
image: ^4.0.17
path: ^1.8.2
universal_io: ^2.0.4
yaml: ^3.1.1
universal_io: ^2.2.2
yaml: ^3.1.2

environment:
sdk: ">=2.17.1 <3.0.0"
sdk: ">=2.17.0 <4.0.0"

dev_dependencies:
build_runner: ^2.3.3
build_version: ^2.1.1
test: ^1.23.1
test: ^1.24.3

0 comments on commit 4dc7ea6

Please sign in to comment.