Skip to content

Commit 7aed812

Browse files
author
Mark O'Sullivan
authored
Merge pull request #107 from fluttercommunity/dev
replacing dart_config dependency with yaml dependency & refactoring
2 parents 3c465be + bb5dad6 commit 7aed812

13 files changed

+601
-429
lines changed

‎CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Changelog
22

3+
## 0.7.1 (24th May 2019)
4+
5+
- Fixed issue with image dependency not working on latest version of Flutter (thanks to @sboutet06)
6+
- Fixed iOS icon sizes which were incorrect (thanks to @sestegra)
7+
- Removed dart_config git dependency and replaced with yaml dependency
8+
- Refactoring of code
9+
310
## 0.7.0 (22nd November 2018)
411

512
- Now ensuring that the Android file name is valid - An error will be thrown if it doesn't meet the criteria

‎README.md

+11-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<img src="https://img.shields.io/badge/Flutter%20Community-flutter__launcher__icons-blue.svg?style=for-the-badge&logo=data:image/png;base64,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" width="600">
22

3-
[![Build Status](https://travis-ci.org/MarkOSullivan94/flutter_launcher_icons.svg?branch=master)](https://travis-ci.org/MarkOSullivan94/flutter_launcher_icons) [![pub package](https://img.shields.io/pub/v/flutter_launcher_icons.svg)](https://pub.dartlang.org/packages/flutter_launcher_icons)
3+
[![Build Status](https://travis-ci.org/fluttercommunity/flutter_launcher_icons.svg?branch=master)](https://travis-ci.org/MarkOSullivan94/flutter_launcher_icons) [![pub package](https://img.shields.io/pub/v/flutter_launcher_icons.svg)](https://pub.dartlang.org/packages/flutter_launcher_icons)
44

55
# Flutter Launcher Icons
66

@@ -9,6 +9,11 @@ A command-line tool which simplifies the task of updating your Flutter app's lau
99

1010
## :sparkles: What's New
1111

12+
#### Version 0.7.1 (24th May 2019)
13+
* Fixed issue with image dependency not working on latest version of Flutter (thanks to @sboutet06)
14+
* Fixed iOS icon sizes which were incorrect (thanks to @sestegra)
15+
* Removed dart_config git dependency and replaced with yaml dependency
16+
1217
#### Version 0.7.0 (22nd November 2018)
1318
* Added check to ensure the Android file name is valid
1419
* Fixed issue where there was a git diff when there was no change
@@ -34,7 +39,7 @@ Add your Flutter Launcher Icons configuration to your `pubspec.yaml` or create a
3439
An example is shown below. A more complex example [can be found in the example project](https://github.com/fluttercommunity/flutter_launcher_icons/blob/master/example/pubspec.yaml).
3540
```yaml
3641
dev_dependencies:
37-
flutter_launcher_icons: "^0.7.0"
42+
flutter_launcher_icons: "^0.7.1"
3843

3944
flutter_icons:
4045
android: "launcher_icon"
@@ -45,8 +50,8 @@ If you name your configuration file something other than `flutter_launcher_icons
4550
the name of the file when running the package.
4651

4752
```
48-
flutter packages get
49-
flutter packages pub run flutter_launcher_icons:main -f <your config file name here>
53+
flutter pub get
54+
flutter pub run flutter_launcher_icons:main -f <your config file name here>
5055
```
5156
5257
Note: If you are not using the existing `pubspec.yaml` ensure that your config file is located in the same directory as it.
@@ -56,8 +61,8 @@ Note: If you are not using the existing `pubspec.yaml` ensure that your config f
5661
After setting up the configuration, all that is left to do is run the package.
5762
5863
```
59-
flutter packages get
60-
flutter packages pub run flutter_launcher_icons:main
64+
flutter pub get
65+
flutter pub pub run flutter_launcher_icons:main
6166
```
6267
6368
If you encounter any issues [please report them here](https://github.com/fluttercommunity/flutter_launcher_icons/issues).

‎analysis_options.yaml

+169-11
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,180 @@
1-
# Last updated: 18th January 2018
2-
# Following guideline set here: https://pub.dartlang.org/help#health
1+
# Specify analysis options.
2+
#
3+
# Until there are meta linter rules, each desired lint must be explicitly enabled.
4+
# See: https://github.com/dart-lang/linter/issues/288
5+
#
6+
# For a list of lints, see: http://dart-lang.github.io/linter/lints/
7+
# See the configuration guide for more
8+
# https://github.com/dart-lang/sdk/tree/master/pkg/analyzer#configuring-the-analyzer
9+
#
10+
# There are other similar analysis options files in the flutter repos,
11+
# which should be kept in sync with this file:
12+
#
13+
# - analysis_options.yaml (this file)
14+
# - packages/flutter/lib/analysis_options_user.yaml
15+
# - https://github.com/flutter/plugins/blob/master/analysis_options.yaml
16+
# - https://github.com/flutter/engine/blob/master/analysis_options.yaml
17+
#
18+
# This file contains the analysis options used by Flutter tools, such as IntelliJ,
19+
# Android Studio, and the `flutter analyze` command.
20+
321
analyzer:
4-
# exclude:
5-
# - path/to/excluded/files/**
22+
strong-mode:
23+
implicit-dynamic: false
24+
errors:
25+
# treat missing required parameters as a warning (not a hint)
26+
missing_required_param: warning
27+
# treat missing returns as a warning (not a hint)
28+
missing_return: warning
29+
# allow having TODOs in the code
30+
todo: ignore
31+
# Ignore analyzer hints for updating pubspecs when using Future or
32+
# Stream and not importing dart:async
33+
# Please see https://github.com/flutter/flutter/pull/24528 for details.
34+
sdk_version_async_exported_from_core: ignore
35+
exclude:
36+
- 'bin/cache/**'
37+
# the following two are relative to the stocks example and the flutter package respectively
38+
# see https://github.com/dart-lang/sdk/issues/28463
39+
- 'lib/i18n/stock_messages_*.dart'
40+
- 'lib/src/http/**'
641

7-
# Lint rules and documentation, see http://dart-lang.github.io/linter/lints
842
linter:
943
rules:
44+
# these rules are documented on and in the same order as
45+
# the Dart Lint rules page to make maintenance easier
46+
# https://github.com/dart-lang/linter/blob/master/example/all.yaml
47+
- always_declare_return_types
48+
- always_put_control_body_on_new_line
49+
# - always_put_required_named_parameters_first # we prefer having parameters in the same order as fields https://github.com/flutter/flutter/issues/10219
50+
- always_require_non_null_named_parameters
51+
- always_specify_types
52+
- annotate_overrides
53+
# - avoid_annotating_with_dynamic # conflicts with always_specify_types
54+
- avoid_as
55+
# - avoid_bool_literals_in_conditional_expressions # not yet tested
56+
# - avoid_catches_without_on_clauses # we do this commonly
57+
# - avoid_catching_errors # we do this commonly
58+
- avoid_classes_with_only_static_members
59+
# - avoid_double_and_int_checks # only useful when targeting JS runtime
60+
- avoid_empty_else
61+
- avoid_field_initializers_in_const_classes
62+
- avoid_function_literals_in_foreach_calls
63+
# - avoid_implementing_value_types # not yet tested
64+
- avoid_init_to_null
65+
# - avoid_js_rounded_ints # only useful when targeting JS runtime
66+
- avoid_null_checks_in_equality_operators
67+
# - avoid_positional_boolean_parameters # not yet tested
68+
# - avoid_private_typedef_functions # we prefer having typedef (discussion in https://github.com/flutter/flutter/pull/16356)
69+
- avoid_relative_lib_imports
70+
- avoid_renaming_method_parameters
71+
- avoid_return_types_on_setters
72+
# - avoid_returning_null # there are plenty of valid reasons to return null
73+
# - avoid_returning_null_for_future # not yet tested
74+
- avoid_returning_null_for_void
75+
# - avoid_returning_this # there are plenty of valid reasons to return this
76+
# - avoid_setters_without_getters # not yet tested
77+
# - avoid_shadowing_type_parameters # not yet tested
78+
# - avoid_single_cascade_in_expression_statements # not yet tested
79+
- avoid_slow_async_io
80+
- avoid_types_as_parameter_names
81+
# - avoid_types_on_closure_parameters # conflicts with always_specify_types
82+
- avoid_unused_constructor_parameters
83+
- avoid_void_async
84+
- await_only_futures
1085
- camel_case_types
11-
- non_constant_identifier_names
86+
- cancel_subscriptions
87+
# - cascade_invocations # not yet tested
88+
# - close_sinks # not reliable enough
89+
# - comment_references # blocked on https://github.com/flutter/flutter/issues/20765
90+
# - constant_identifier_names # needs an opt-out https://github.com/dart-lang/linter/issues/204
91+
- control_flow_in_finally
92+
# - curly_braces_in_flow_control_structures # not yet tested
93+
- directives_ordering
94+
- empty_catches
95+
- empty_constructor_bodies
96+
- empty_statements
97+
# - file_names # not yet tested
98+
- flutter_style_todos
1299
- hash_and_equals
100+
- implementation_imports
101+
# - invariant_booleans # too many false positives: https://github.com/dart-lang/linter/issues/811
13102
- iterable_contains_unrelated_type
103+
# - join_return_with_assignment # not yet tested
104+
- library_names
105+
- library_prefixes
106+
# - lines_longer_than_80_chars # not yet tested
14107
- list_remove_unrelated_type
15-
- unrelated_type_equality_checks
16-
- valid_regexps
17-
- cancel_subscriptions
108+
# - literal_only_boolean_expressions # too many false positives: https://github.com/dart-lang/sdk/issues/34181
109+
- no_adjacent_strings_in_list
110+
- no_duplicate_case_values
111+
- non_constant_identifier_names
112+
# - null_closures # not yet tested
113+
# - omit_local_variable_types # opposite of always_specify_types
114+
# - one_member_abstracts # too many false positives
115+
# - only_throw_errors # https://github.com/flutter/flutter/issues/5792
116+
- overridden_fields
117+
- package_api_docs
118+
- package_names
119+
- package_prefixed_library_names
120+
# - parameter_assignments # we do this commonly
121+
- prefer_adjacent_string_concatenation
122+
- prefer_asserts_in_initializer_lists
123+
- prefer_collection_literals
124+
- prefer_conditional_assignment
125+
- prefer_const_constructors
126+
- prefer_const_constructors_in_immutables
127+
- prefer_const_declarations
128+
- prefer_const_literals_to_create_immutables
129+
# - prefer_constructors_over_static_methods # not yet tested
130+
- prefer_contains
131+
- prefer_equal_for_default_values
132+
# - prefer_expression_function_bodies # conflicts with https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo#consider-using--for-short-functions-and-methods
133+
- prefer_final_fields
134+
- prefer_final_locals
135+
- prefer_foreach
136+
# - prefer_function_declarations_over_variables # not yet tested
137+
- prefer_generic_function_type_aliases
138+
- prefer_initializing_formals
139+
# - prefer_int_literals # not yet tested
140+
# - prefer_interpolation_to_compose_strings # not yet tested
141+
- prefer_is_empty
142+
- prefer_is_not_empty
143+
- prefer_iterable_whereType
144+
# - prefer_mixin # https://github.com/dart-lang/language/issues/32
145+
# - prefer_null_aware_operators # disable until NNBD, see https://github.com/flutter/flutter/pull/32711#issuecomment-492930932
146+
- prefer_single_quotes
147+
- prefer_typing_uninitialized_variables
148+
- prefer_void_to_null
149+
# - public_member_api_docs # enabled on a case-by-case basis; see e.g. packages/analysis_options.yaml
150+
- recursive_getters
151+
- slash_for_doc_comments
152+
- sort_constructors_first
153+
- sort_pub_dependencies
154+
- sort_unnamed_constructors_first
155+
# - super_goes_last # no longer needed w/ Dart 2
18156
- test_types_in_equals
19-
- constant_identifier_names
157+
- throw_in_finally
158+
# - type_annotate_public_apis # subset of always_specify_types
159+
- type_init_formals
160+
# - unawaited_futures # too many false positives
161+
# - unnecessary_await_in_return # not yet tested
162+
- unnecessary_brace_in_string_interps
163+
- unnecessary_const
164+
- unnecessary_getters_setters
165+
# - unnecessary_lambdas # has false positives: https://github.com/dart-lang/linter/issues/498
20166
- unnecessary_new
21-
- unnecessary_lambdas
22167
- unnecessary_null_aware_assignments
168+
- unnecessary_null_in_if_null_operators
169+
- unnecessary_overrides
170+
- unnecessary_parenthesis
171+
- unnecessary_statements
172+
- unnecessary_this
173+
- unrelated_type_equality_checks
174+
# - use_function_type_syntax_for_parameters # not yet tested
175+
- use_rethrow_when_possible
176+
# - use_setters_to_change_properties # not yet tested
177+
# - use_string_buffers # has false positives: https://github.com/dart-lang/sdk/issues/34182
178+
# - use_to_and_as_if_applicable # has false positives, so we prefer to catch this by code-review
179+
- valid_regexps
180+
# - void_checks # not yet tested

‎bin/main.dart

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import 'package:flutter_launcher_icons/main.dart' as FlutterLauncherIcons;
1+
import 'package:flutter_launcher_icons/main.dart' as flutter_launcher_icons;
22

3-
main(List<String> arguments) {
4-
FlutterLauncherIcons.createIconsFromArguments(arguments);
3+
void main(List<String> arguments) {
4+
flutter_launcher_icons.createIconsFromArguments(arguments);
55
}

0 commit comments

Comments
 (0)