Skip to content

Commit e7d7f87

Browse files
authored
Merge pull request #35 from Onix-Systems/fix/imports
fix: some fixes, libs upgrade, version rising
2 parents 9106d12 + a265cd3 commit e7d7f87

File tree

4 files changed

+43
-27
lines changed

4 files changed

+43
-27
lines changed

bricks/flutter_clean_base/__brick__/{{project_name.snakeCase()}}/lib/core/di/app.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
//@formatter:off
22
import 'package:get_it/get_it.dart';
3-
{{^isGoRouter}}import 'package:{{project_name}}/core/router/app_router.dart';
4-
import 'package:{{project_name}}/core/router/router_logging_observer.dart';
5-
import 'package:{{project_name}}/core/router/router_module.dart';{{/isGoRouter}}
3+
{{^isGoRouter}}import 'package:{{project_name}}/app/router/app_router.dart';
4+
import 'package:{{project_name}}/app/router/router_logging_observer.dart';
5+
import 'package:{{project_name}}/app/router/router_module.dart';{{/isGoRouter}}
66

77
void registerApp(GetIt getIt) {
88

lib/presentation/screen/generation_screen/bloc/generation_screen_bloc.dart

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,13 @@ class GenerationScreenBloc extends BaseBloc<GenerationScreenEvent,
7777
..remove('prod');
7878
}
7979

80-
var configFile =
81-
await File('${state.config.projectPath}/config.json').create();
80+
var configFile = File('${state.config.projectPath}/config.json');
81+
82+
if (configFile.existsSync()) {
83+
configFile.deleteSync();
84+
}
85+
86+
configFile.createSync();
8287

8388
await configFile.writeAsString(jsonEncode({
8489
'signing_password': genPass,
@@ -98,6 +103,18 @@ class GenerationScreenBloc extends BaseBloc<GenerationScreenEvent,
98103

99104
outputService.add('{#info}Getting mason & brick...');
100105

106+
final brickZip = File('${state.config.projectPath}/brick.zip');
107+
108+
if (brickZip.existsSync()) {
109+
brickZip.deleteSync();
110+
}
111+
112+
final brickFolder = Directory('${state.config.projectPath}/bricks');
113+
114+
if (brickFolder.existsSync()) {
115+
brickFolder.deleteSync(recursive: true);
116+
}
117+
101118
final gitGetBrickProcess = await ProcessStarter.start(
102119
workingDirectory: state.config.projectPath);
103120

@@ -124,8 +141,7 @@ class GenerationScreenBloc extends BaseBloc<GenerationScreenEvent,
124141
await mainProcess.exitCode;
125142

126143
configFile.delete();
127-
await Directory('${state.config.projectPath}/bricks')
128-
.delete(recursive: true);
144+
brickFolder.deleteSync(recursive: true);
129145

130146
if (!state.config.graphql) {
131147
await Directory(

pubspec.lock

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,10 @@ packages:
109109
dependency: "direct dev"
110110
description:
111111
name: build_runner
112-
sha256: "67d591d602906ef9201caf93452495ad1812bea2074f04e25dbd7c133785821b"
112+
sha256: "581bacf68f89ec8792f5e5a0b2c4decd1c948e97ce659dc783688c8a88fbec21"
113113
url: "https://pub.dev"
114114
source: hosted
115-
version: "2.4.7"
115+
version: "2.4.8"
116116
build_runner_core:
117117
dependency: transitive
118118
description:
@@ -309,10 +309,10 @@ packages:
309309
dependency: "direct main"
310310
description:
311311
name: file_selector
312-
sha256: "84eaf3e034d647859167d1f01cfe7b6352488f34c1b4932635012b202014c25b"
312+
sha256: "070062b9fca7482baf60af671219086e188e50dd80497393e7d58532b56215d3"
313313
url: "https://pub.dev"
314314
source: hosted
315-
version: "1.0.1"
315+
version: "1.0.2"
316316
file_selector_android:
317317
dependency: transitive
318318
description:
@@ -513,10 +513,10 @@ packages:
513513
dependency: "direct main"
514514
description:
515515
name: get_it
516-
sha256: f79870884de16d689cf9a7d15eedf31ed61d750e813c538a6efb92660fea83c3
516+
sha256: e6017ce7fdeaf218dc51a100344d8cb70134b80e28b760f8bb23c242437bafd7
517517
url: "https://pub.dev"
518518
source: hosted
519-
version: "7.6.4"
519+
version: "7.6.7"
520520
glob:
521521
dependency: transitive
522522
description:
@@ -569,10 +569,10 @@ packages:
569569
dependency: "direct main"
570570
description:
571571
name: http
572-
sha256: d4872660c46d929f6b8a9ef4e7a7eff7e49bbf0c4ec3f385ee32df5119175139
572+
sha256: a2bbf9d017fcced29139daa8ed2bba4ece450ab222871df93ca9eec6f80c34ba
573573
url: "https://pub.dev"
574574
source: hosted
575-
version: "1.1.2"
575+
version: "1.2.0"
576576
http_multi_server:
577577
dependency: transitive
578578
description:
@@ -873,10 +873,10 @@ packages:
873873
dependency: "direct main"
874874
description:
875875
name: process_run
876-
sha256: "66847793266478f2fd1222f9d165069643f5b99da642154c6c22fb8d38130a78"
876+
sha256: cad2c57a34f8313a4182e34e31e0b2f12972eef3d0930cdc7ab3240bb8cad380
877877
url: "https://pub.dev"
878878
source: hosted
879-
version: "0.14.0+1"
879+
version: "0.14.1+3"
880880
provider:
881881
dependency: transitive
882882
description:
@@ -1110,10 +1110,10 @@ packages:
11101110
dependency: "direct main"
11111111
description:
11121112
name: url_launcher
1113-
sha256: e9aa5ea75c84cf46b3db4eea212523591211c3cf2e13099ee4ec147f54201c86
1113+
sha256: d25bb0ca00432a5e1ee40e69c36c85863addf7cc45e433769d61bed3fe81fd96
11141114
url: "https://pub.dev"
11151115
source: hosted
1116-
version: "6.2.2"
1116+
version: "6.2.3"
11171117
url_launcher_android:
11181118
dependency: transitive
11191119
description:

pubspec.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ description: Onix Flutter Clean Architecture
33

44
publish_to: 'none' # Remove this line if you wish to publish to pub.dev
55

6-
version: 1.0.18+18
6+
version: 1.0.19+19
77

88
environment:
9-
sdk: '>=3.0.0 <4.0.0'
9+
sdk: '>=3.2.0 <4.0.0'
1010

1111
dependencies:
1212
flutter:
@@ -19,19 +19,19 @@ dependencies:
1919
flutter_svg: ^2.0.9
2020
window_manager: ^0.3.7
2121
recase: ^4.1.0
22-
process_run: ^0.14.0+1
22+
process_run: ^0.14.1+3
2323
logger: ^2.0.2+1
24-
get_it: ^7.6.4
25-
file_selector: ^1.0.1
24+
get_it: ^7.6.7
25+
file_selector: ^1.0.2
2626
msh_checkbox: ^2.0.1
2727
freezed_annotation: ^2.4.1
2828
flutter_bloc: ^8.1.3
2929
json_annotation: ^4.8.1
30-
http: ^1.1.2
30+
http: ^1.2.0
3131
collection: ^1.18.0
3232
package_info_plus: ^5.0.1
3333
yaml: ^3.1.2
34-
url_launcher: ^6.2.2
34+
url_launcher: ^6.2.3
3535
encrypt: ^5.0.3
3636
hive: ^2.2.3
3737
flutter_secure_storage: ^9.0.0
@@ -60,7 +60,7 @@ dev_dependencies:
6060
sdk: flutter
6161

6262
flutter_lints: ^3.0.1
63-
build_runner: ^2.4.7
63+
build_runner: ^2.4.8
6464
freezed: ^2.4.6
6565
json_serializable: ^6.7.1
6666

0 commit comments

Comments
 (0)