Skip to content

Commit aadf5f9

Browse files
AlexV525AlexV525
authored
⬆️ Allows mime: '>=1.0.0 <3.0.0' (#580)
## What does this change? Fixes #579 🎯 Also update ignored files for better development experiences. ## Type of change - [x] New feature (non-breaking change which adds functionality)
1 parent 6b589f1 commit aadf5f9

File tree

11 files changed

+133
-16
lines changed

11 files changed

+133
-16
lines changed

‎.gitignore‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,9 @@
1212
.svn/
1313

1414
# IntelliJ related
15-
*.iml
1615
*.ipr
1716
*.iws
1817

19-
.idea/.gitignore
20-
.idea/dictionaries/
21-
.idea/libraries/
22-
.idea/misc.xml
23-
.idea/vcs.xml
24-
.idea/workspace.xml
25-
.idea/saveactions_settings.xml
26-
android/.idea/
27-
2818
# The .vscode folder contains launch configuration and tasks you configure in
2919
# VS Code which you may wish to be included in version control, so this line
3020
# is commented out by default.
@@ -122,6 +112,3 @@ coverage.lcov
122112

123113
## Test resources
124114
**/test_resources/lib
125-
126-
## Melos
127-
.idea/runConfigurations/melos_*

‎.idea/.gitignore‎

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/example/example.iml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module type="JAVA_MODULE" version="4">
3+
<component name="NewModuleRootManager" inherit-compiler-output="true">
4+
<exclude-output />
5+
<content url="file://$MODULE_DIR$">
6+
<sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
7+
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
8+
<excludeFolder url="file://$MODULE_DIR$/.dart_tool" />
9+
<excludeFolder url="file://$MODULE_DIR$/.idea" />
10+
<excludeFolder url="file://$MODULE_DIR$/.pub" />
11+
<excludeFolder url="file://$MODULE_DIR$/build" />
12+
<excludeFolder url="file://$MODULE_DIR$/android/.gradle" />
13+
<excludeFolder url="file://$MODULE_DIR$/android/.idea" />
14+
<excludeFolder url="file://$MODULE_DIR$/ios/Flutter" />
15+
<excludeFolder url="file://$MODULE_DIR$/ios/Pods" />
16+
<excludeFolder url="file://$MODULE_DIR$/ios/.symlinks" />
17+
<excludeFolder url="file://$MODULE_DIR$/macos/Flutter" />
18+
<excludeFolder url="file://$MODULE_DIR$/macos/Pods" />
19+
<excludeFolder url="file://$MODULE_DIR$/macos/.symlinks" />
20+
</content>
21+
<orderEntry type="sourceFolder" forTests="false" />
22+
<orderEntry type="library" name="Dart SDK" level="project" />
23+
<orderEntry type="library" name="Flutter Plugins" level="project" />
24+
<orderEntry type="library" name="Dart Packages" level="project" />
25+
</component>
26+
</module>

‎examples/example_resources/example_resources.iml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module type="JAVA_MODULE" version="4">
3+
<component name="NewModuleRootManager" inherit-compiler-output="true">
4+
<exclude-output />
5+
<content url="file://$MODULE_DIR$">
6+
<sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
7+
<excludeFolder url="file://$MODULE_DIR$/.dart_tool" />
8+
<excludeFolder url="file://$MODULE_DIR$/.idea" />
9+
<excludeFolder url="file://$MODULE_DIR$/.pub" />
10+
<excludeFolder url="file://$MODULE_DIR$/build" />
11+
<excludeFolder url="file://$MODULE_DIR$/example/.dart_tool" />
12+
<excludeFolder url="file://$MODULE_DIR$/example/.idea" />
13+
<excludeFolder url="file://$MODULE_DIR$/example/.pub" />
14+
<excludeFolder url="file://$MODULE_DIR$/example/build" />
15+
<excludeFolder url="file://$MODULE_DIR$/example/android/.gradle" />
16+
<excludeFolder url="file://$MODULE_DIR$/example/android/.idea" />
17+
<excludeFolder url="file://$MODULE_DIR$/example/ios/Flutter" />
18+
<excludeFolder url="file://$MODULE_DIR$/example/ios/Pods" />
19+
<excludeFolder url="file://$MODULE_DIR$/example/ios/.symlinks" />
20+
<excludeFolder url="file://$MODULE_DIR$/example/macos/Flutter" />
21+
<excludeFolder url="file://$MODULE_DIR$/example/macos/Pods" />
22+
<excludeFolder url="file://$MODULE_DIR$/example/macos/.symlinks" />
23+
</content>
24+
<orderEntry type="sourceFolder" forTests="false" />
25+
<orderEntry type="library" name="Dart SDK" level="project" />
26+
<orderEntry type="library" name="Flutter Plugins" level="project" />
27+
<orderEntry type="library" name="Dart Packages" level="project" />
28+
</component>
29+
</module>

‎fluttergen.iml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module type="WEB_MODULE" version="4">
3+
<component name="NewModuleRootManager" inherit-compiler-output="true">
4+
<exclude-output />
5+
<content url="file://$MODULE_DIR$">
6+
<sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
7+
<excludeFolder url="file://$MODULE_DIR$/.dart_tool" />
8+
<excludeFolder url="file://$MODULE_DIR$/.pub" />
9+
<excludeFolder url="file://$MODULE_DIR$/build" />
10+
</content>
11+
<orderEntry type="sourceFolder" forTests="false" />
12+
<orderEntry type="library" name="Dart SDK" level="project" />
13+
<orderEntry type="library" name="Dart Packages" level="project" />
14+
</component>
15+
</module>

‎packages/command/flutter_gen.iml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module type="WEB_MODULE" version="4">
3+
<component name="NewModuleRootManager" inherit-compiler-output="true">
4+
<exclude-output />
5+
<content url="file://$MODULE_DIR$">
6+
<sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
7+
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
8+
<excludeFolder url="file://$MODULE_DIR$/.dart_tool" />
9+
<excludeFolder url="file://$MODULE_DIR$/.pub" />
10+
<excludeFolder url="file://$MODULE_DIR$/build" />
11+
<excludeFolder url="file://$MODULE_DIR$/example/.dart_tool" />
12+
<excludeFolder url="file://$MODULE_DIR$/example/.pub" />
13+
<excludeFolder url="file://$MODULE_DIR$/example/build" />
14+
</content>
15+
<orderEntry type="sourceFolder" forTests="false" />
16+
<orderEntry type="library" name="Dart SDK" level="project" />
17+
<orderEntry type="library" name="Dart Packages" level="project" />
18+
</component>
19+
</module>

‎packages/core/flutter_gen_core.iml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module type="WEB_MODULE" version="4">
3+
<component name="NewModuleRootManager" inherit-compiler-output="true">
4+
<exclude-output />
5+
<content url="file://$MODULE_DIR$">
6+
<sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
7+
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
8+
<excludeFolder url="file://$MODULE_DIR$/.dart_tool" />
9+
<excludeFolder url="file://$MODULE_DIR$/.pub" />
10+
<excludeFolder url="file://$MODULE_DIR$/build" />
11+
</content>
12+
<orderEntry type="sourceFolder" forTests="false" />
13+
<orderEntry type="library" name="Dart SDK" level="project" />
14+
<orderEntry type="library" name="Dart Packages" level="project" />
15+
</component>
16+
</module>

‎packages/core/lib/settings/asset_type.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'package:dartx/dartx.dart';
22
import 'package:flutter_gen_core/utils/identifer.dart';
33
import 'package:flutter_gen_core/utils/string.dart';
4-
import 'package:mime/mime.dart';
4+
import 'package:mime/mime.dart' show lookupMimeType;
55
import 'package:path/path.dart' as p;
66
import 'package:path/path.dart';
77

‎packages/core/lib/settings/color_path.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'dart:io';
22

3-
import 'package:mime/mime.dart';
3+
import 'package:mime/mime.dart' show lookupMimeType;
44

55
/// https://github.com/dart-lang/mime/blob/master/lib/src/default_extension_map.dart
66
class ColorPath {

‎packages/core/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ dependencies:
1616
meta: ^1.7.0
1717
path: ^1.8.0
1818
yaml: ^3.0.0
19-
mime: ^1.0.0
19+
mime: '>=1.0.0 <3.0.0'
2020
xml: ^6.0.0
2121
dartx: ^1.0.0
2222
color: ^3.0.0

0 commit comments

Comments
 (0)