Skip to content

Commit 79ea870

Browse files
authored
Use switch expressions, bump some deps (#397)
1 parent 787d882 commit 79ea870

File tree

12 files changed

+253
-298
lines changed

12 files changed

+253
-298
lines changed

dartfn/lib/src/generators/json.g.dart

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dartfn/templates/json/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ environment:
99

1010
dependencies:
1111
functions_framework: ^0.4.0
12-
json_annotation: ^4.3.0
12+
json_annotation: ^4.8.1
1313
shelf: ^1.0.0
1414

1515
dev_dependencies:

examples/fullstack/backend/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ environment:
66

77
dependencies:
88
functions_framework: ^0.4.0
9-
json_annotation: ^4.3.0
9+
json_annotation: ^4.8.1
1010
shelf: ^1.0.0
1111

1212
dev_dependencies:

examples/fullstack/frontend-cli/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ executables:
1010
dependencies:
1111
http: '>=0.13.1 <2.0.0'
1212
io: ^1.0.0
13-
json_annotation: ^4.3.0
13+
json_annotation: ^4.8.1
1414

1515
dev_dependencies:
1616
build_runner: ^2.0.0

examples/fullstack/frontend/lib/config.dart

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,11 @@ extension EnumToString on Environment {
2525
String toName() => toString().split('.').last;
2626
}
2727

28-
Environment parseEnvironment(String env) {
29-
switch (env) {
30-
case 'dev':
31-
return Environment.dev;
32-
case 'prod':
33-
return Environment.prod;
34-
default:
35-
throw Exception("Parsing as Environment enum exception: '$env'");
36-
}
37-
}
28+
Environment parseEnvironment(String env) => switch (env) {
29+
'dev' => Environment.dev,
30+
'prod' => Environment.prod,
31+
_ => throw Exception("Parsing as Environment enum exception: '$env'")
32+
};
3833

3934
class Config {
4035
final String greetingsUrl;

examples/fullstack/frontend/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ dependencies:
1111
flutter:
1212
sdk: flutter
1313
http: '>=0.13.0 <2.0.0'
14-
json_annotation: ^4.3.0
14+
json_annotation: ^4.8.1
1515
provider: ^6.0.0
1616

1717
dev_dependencies:

examples/json/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ environment:
99

1010
dependencies:
1111
functions_framework: ^0.4.0
12-
json_annotation: ^4.3.0
12+
json_annotation: ^4.8.1
1313
shelf: ^1.0.0
1414

1515
dev_dependencies:

functions_framework/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies:
1414
http: '>=0.13.0 <2.0.0'
1515
http_parser: ^4.0.0
1616
io: ^1.0.0
17-
json_annotation: ^4.3.0
17+
json_annotation: ^4.8.1
1818
meta: ^1.2.3
1919
shelf: ^1.2.0
2020
stack_trace: ^1.9.6

functions_framework_builder/lib/builder.dart

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class _FunctionsFrameworkBuilder implements Builder {
8484
}
8585

8686
final cases = [
87-
for (var e in entries.values) ' case ${e.name}:return ${e.expression};',
87+
for (var e in entries.values) ' ${e.name} => ${e.expression},',
8888
];
8989

9090
final importDirectives = [
@@ -114,13 +114,11 @@ Future<void> main(List<String> args) async {
114114
await serve(args, _nameToFunctionTarget);
115115
}
116116
117-
FunctionTarget? _nameToFunctionTarget(String name) {
117+
FunctionTarget? _nameToFunctionTarget(String name) =>
118118
switch (name) {
119119
${cases.join('\n')}
120-
default:
121-
return null;
122-
}
123-
}
120+
_ => null
121+
};
124122
''';
125123

126124
try {

0 commit comments

Comments
 (0)