Skip to content

Commit 03dbe82

Browse files
wasabeefwasabeef
authored
Fix conflicts (#88)
* chore(deps): fix conflict * chore(version): bump up to 2.0.1-dev.0 * chore(deps): fix conflict * chore(deps): fix conflict
1 parent 11a6e73 commit 03dbe82

File tree

7 files changed

+48
-48
lines changed

7 files changed

+48
-48
lines changed

‎example/pubspec.lock

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ packages:
2828
name: async
2929
url: "https://pub.dartlang.org"
3030
source: hosted
31-
version: "2.5.0-nullsafety.1"
31+
version: "2.5.0"
3232
boolean_selector:
3333
dependency: transitive
3434
description:
3535
name: boolean_selector
3636
url: "https://pub.dartlang.org"
3737
source: hosted
38-
version: "2.1.0-nullsafety.1"
38+
version: "2.1.0"
3939
build:
4040
dependency: transitive
4141
description:
@@ -98,14 +98,14 @@ packages:
9898
name: characters
9999
url: "https://pub.dartlang.org"
100100
source: hosted
101-
version: "1.1.0-nullsafety.3"
101+
version: "1.1.0"
102102
charcode:
103103
dependency: transitive
104104
description:
105105
name: charcode
106106
url: "https://pub.dartlang.org"
107107
source: hosted
108-
version: "1.2.0-nullsafety.1"
108+
version: "1.2.0"
109109
checked_yaml:
110110
dependency: transitive
111111
description:
@@ -126,7 +126,7 @@ packages:
126126
name: clock
127127
url: "https://pub.dartlang.org"
128128
source: hosted
129-
version: "1.1.0-nullsafety.1"
129+
version: "1.1.0"
130130
code_builder:
131131
dependency: transitive
132132
description:
@@ -140,7 +140,7 @@ packages:
140140
name: collection
141141
url: "https://pub.dartlang.org"
142142
source: hosted
143-
version: "1.15.0-nullsafety.3"
143+
version: "1.15.0"
144144
color:
145145
dependency: transitive
146146
description:
@@ -182,7 +182,7 @@ packages:
182182
name: fake_async
183183
url: "https://pub.dartlang.org"
184184
source: hosted
185-
version: "1.2.0-nullsafety.1"
185+
version: "1.2.0"
186186
file:
187187
dependency: transitive
188188
description:
@@ -222,14 +222,14 @@ packages:
222222
name: flutter_gen_core
223223
url: "https://pub.dartlang.org"
224224
source: hosted
225-
version: "2.0.0"
225+
version: "2.0.1"
226226
flutter_gen_runner:
227227
dependency: "direct dev"
228228
description:
229229
path: "../packages/runner"
230230
relative: true
231231
source: path
232-
version: "2.0.0"
232+
version: "2.0.1"
233233
flutter_svg:
234234
dependency: "direct main"
235235
description:
@@ -311,7 +311,7 @@ packages:
311311
name: matcher
312312
url: "https://pub.dartlang.org"
313313
source: hosted
314-
version: "0.12.10-nullsafety.1"
314+
version: "0.12.10"
315315
merge_map:
316316
dependency: transitive
317317
description:
@@ -325,7 +325,7 @@ packages:
325325
name: meta
326326
url: "https://pub.dartlang.org"
327327
source: hosted
328-
version: "1.3.0-nullsafety.3"
328+
version: "1.3.0"
329329
mime:
330330
dependency: transitive
331331
description:
@@ -360,7 +360,7 @@ packages:
360360
name: path
361361
url: "https://pub.dartlang.org"
362362
source: hosted
363-
version: "1.8.0-nullsafety.1"
363+
version: "1.8.0"
364364
path_drawing:
365365
dependency: transitive
366366
description:
@@ -442,21 +442,21 @@ packages:
442442
name: source_span
443443
url: "https://pub.dartlang.org"
444444
source: hosted
445-
version: "1.8.0-nullsafety.2"
445+
version: "1.8.0"
446446
stack_trace:
447447
dependency: transitive
448448
description:
449449
name: stack_trace
450450
url: "https://pub.dartlang.org"
451451
source: hosted
452-
version: "1.10.0-nullsafety.1"
452+
version: "1.10.0"
453453
stream_channel:
454454
dependency: transitive
455455
description:
456456
name: stream_channel
457457
url: "https://pub.dartlang.org"
458458
source: hosted
459-
version: "2.1.0-nullsafety.1"
459+
version: "2.1.0"
460460
stream_transform:
461461
dependency: transitive
462462
description:
@@ -470,21 +470,21 @@ packages:
470470
name: string_scanner
471471
url: "https://pub.dartlang.org"
472472
source: hosted
473-
version: "1.1.0-nullsafety.1"
473+
version: "1.1.0"
474474
term_glyph:
475475
dependency: transitive
476476
description:
477477
name: term_glyph
478478
url: "https://pub.dartlang.org"
479479
source: hosted
480-
version: "1.2.0-nullsafety.1"
480+
version: "1.2.0"
481481
test_api:
482482
dependency: transitive
483483
description:
484484
name: test_api
485485
url: "https://pub.dartlang.org"
486486
source: hosted
487-
version: "0.2.19-nullsafety.2"
487+
version: "0.2.19"
488488
time:
489489
dependency: transitive
490490
description:
@@ -505,14 +505,14 @@ packages:
505505
name: typed_data
506506
url: "https://pub.dartlang.org"
507507
source: hosted
508-
version: "1.3.0-nullsafety.3"
508+
version: "1.3.0"
509509
vector_math:
510510
dependency: transitive
511511
description:
512512
name: vector_math
513513
url: "https://pub.dartlang.org"
514514
source: hosted
515-
version: "2.1.0-nullsafety.3"
515+
version: "2.1.0"
516516
watcher:
517517
dependency: transitive
518518
description:
@@ -542,5 +542,5 @@ packages:
542542
source: hosted
543543
version: "2.2.1"
544544
sdks:
545-
dart: ">=2.10.0 <2.11.0"
546-
flutter: ">=1.22.0 <2.0.0"
545+
dart: ">=2.12.0-0.0 <3.0.0"
546+
flutter: ">=1.22.0"

‎example/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: A sample project using FlutterGen.
33

44
publish_to: 'none'
55

6-
version: 1.0.0+1
6+
version: 1.0.0+2
77

88
environment:
99
sdk: '>=2.10.0 <3.0.0'

‎packages/command/pubspec.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ packages:
112112
name: flutter_gen_core
113113
url: "https://pub.dartlang.org"
114114
source: hosted
115-
version: "2.0.0"
115+
version: "2.0.1"
116116
glob:
117117
dependency: transitive
118118
description:

‎packages/command/pubspec.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: flutter_gen
22

33
description: The Flutter code generator for your assets, fonts, colors, … — Get rid of all String-based APIs.
4-
version: 2.0.0
4+
version: 2.0.1
55
homepage: https://github.com/FlutterGen/flutter_gen
66
repository: https://github.com/FlutterGen/flutter_gen
77
documentation: https://github.com/FlutterGen/flutter_gen
@@ -17,9 +17,9 @@ executables:
1717
fluttergen: flutter_gen_command
1818

1919
dependencies:
20-
args: ^1.6.0
21-
flutter_gen_core: ^2.0.0
20+
flutter_gen_core: ^2.0.1
21+
args: '>=1.6.0 <2.0.0'
2222

2323
dev_dependencies:
24-
effective_dart: ^1.3.0
24+
effective_dart: '>=1.3.0 <2.0.0'
2525

‎packages/core/pubspec.yaml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: flutter_gen_core
22

33
description: The Flutter code generator for your assets, fonts, colors, … — Get rid of all String-based APIs.
4-
version: 2.0.0
4+
version: 2.0.1
55
homepage: https://github.com/FlutterGen/flutter_gen
66
repository: https://github.com/FlutterGen/flutter_gen
77
documentation: https://github.com/FlutterGen/flutter_gen
@@ -14,18 +14,18 @@ environment:
1414
sdk: '>=2.10.0 <3.0.0'
1515

1616
dependencies:
17-
path: ^1.7.0
18-
yaml: ^2.2.1
19-
mime: ^0.9.7
20-
xml: ^4.5.1
21-
dart_style: ^1.3.12
22-
dartx: ^0.5.0
23-
color: ^2.1.1
24-
merge_map: ^1.0.2
25-
json_annotation: ^3.1.1
17+
path: '>=1.7.0 <2.0.0'
18+
yaml: '>=2.2.0 <3.0.0'
19+
mime: '>=0.9.0 <1.0.0'
20+
xml: '>=4.5.0 <5.1.0'
21+
dart_style: '>=1.3.0 <1.4.0'
22+
dartx: '>=0.5.0 <1.0.0'
23+
color: '>=2.1.0 <3.0.0'
24+
merge_map: '>=1.0.0 <2.0.0'
25+
json_annotation: '>=3.1.0 <4.0.0'
2626

2727
dev_dependencies:
28-
test: ^1.15.7
29-
effective_dart: ^1.3.0
30-
build_runner: ^1.11.1
31-
json_serializable: ^3.5.1
28+
test: '>=1.15.0 <2.0.0'
29+
effective_dart: '>=1.3.0 <2.0.0'
30+
build_runner: '>=1.11.0 <2.0.0'
31+
json_serializable: '>=3.5.0 <4.0.0'

‎packages/runner/pubspec.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ packages:
168168
name: flutter_gen_core
169169
url: "https://pub.dartlang.org"
170170
source: hosted
171-
version: "2.0.0"
171+
version: "2.0.1"
172172
glob:
173173
dependency: transitive
174174
description:

‎packages/runner/pubspec.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: flutter_gen_runner
22

33
description: The Flutter code generator for your assets, fonts, colors, … — Get rid of all String-based APIs.
4-
version: 2.0.0
4+
version: 2.0.1
55
homepage: https://github.com/FlutterGen/flutter_gen
66
repository: https://github.com/FlutterGen/flutter_gen
77
documentation: https://github.com/FlutterGen/flutter_gen
@@ -14,9 +14,9 @@ environment:
1414
sdk: '>=2.10.0 <3.0.0'
1515

1616
dependencies:
17-
flutter_gen_core: ^2.0.0
18-
build: ^1.6.2
17+
flutter_gen_core: ^2.0.1
18+
build: '>=1.6.0 <2.0.0'
1919

2020
dev_dependencies:
21-
effective_dart: ^1.3.0
22-
build_test: ^1.3.6
21+
effective_dart: '>=1.3.0 <2.0.0'
22+
build_test: '>=1.3.0 <2.0.0'

0 commit comments

Comments
 (0)