Require Dart 3 across the board, use switch expressions (#1344)

google · Aug 8, 2023 · 4e8e9ac · 4e8e9ac
1 parent 2185e8b
commit 4e8e9ac
Show file tree

Hide file tree

Showing 8 changed files with 107 additions and 206 deletions.
diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
diff --git a/checked_yaml/CHANGELOG.md b/checked_yaml/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.4-wip
+
+- Require Dart 3.0
+
 ## 2.0.3
 
 - Require Dart 2.19

diff --git a/checked_yaml/pubspec.yaml b/checked_yaml/pubspec.yaml
@@ -1,5 +1,5 @@
 name: checked_yaml
-version: 2.0.3
+version: 2.0.4-wip
 
 description: >-
   Generate more helpful exceptions when decoding YAML documents using
@@ -13,7 +13,7 @@ topics:
  - codegen
 
 environment:
-  sdk: '>=2.19.0 <3.0.0'
+  sdk: ^3.0.0
 
 dependencies:
   json_annotation: ^4.3.0

diff --git a/json_annotation/CHANGELOG.md b/json_annotation/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 4.8.2-wip
+
+- Require Dart 3.0
+
 ## 4.8.1
 
 - Require Dart 2.19

diff --git a/json_annotation/pubspec.yaml b/json_annotation/pubspec.yaml
@@ -1,5 +1,5 @@
 name: json_annotation
-version: 4.8.1
+version: 4.8.2-wip
 description: >-
   Classes and helper functions that support JSON code generation via the
   `json_serializable` package.
@@ -11,7 +11,7 @@ topics:
  - codegen
 
 environment:
-  sdk: '>=2.19.0 <3.0.0'
+  sdk: ^3.0.0
 
 dependencies:
   meta: ^1.4.0

diff --git a/json_serializable/lib/src/utils.dart b/json_serializable/lib/src/utils.dart
@@ -182,20 +182,14 @@ String ifNullOrElse(String test, String ifNull, String ifNotNull) =>
 String encodedFieldName(
   FieldRename fieldRename,
   String declaredName,
-) {
-  switch (fieldRename) {
-    case FieldRename.none:
-      return declaredName;
-    case FieldRename.snake:
-      return declaredName.snake;
-    case FieldRename.screamingSnake:
-      return declaredName.snake.toUpperCase();
-    case FieldRename.kebab:
-      return declaredName.kebab;
-    case FieldRename.pascal:
-      return declaredName.pascal;
-  }
-}
+) =>
+    switch (fieldRename) {
+      FieldRename.none => declaredName,
+      FieldRename.snake => declaredName.snake,
+      FieldRename.screamingSnake => declaredName.snake.toUpperCase(),
+      FieldRename.kebab => declaredName.kebab,
+      FieldRename.pascal => declaredName.pascal
+    };
 
 /// Return the Dart code presentation for the given [type].
 ///

diff --git a/json_serializable/test/integration/json_test_common.dart b/json_serializable/test/integration/json_test_common.dart
@@ -51,16 +51,11 @@ class Platform {
 
   const Platform._(this.description);
 
-  factory Platform.fromJson(String value) {
-    switch (value) {
-      case 'foo':
-        return foo;
-      case 'undefined':
-        return undefined;
-      default:
-        throw ArgumentError.value(value, 'value', 'Not a supported value.');
-    }
-  }
+  factory Platform.fromJson(String value) => switch (value) {
+        'foo' => foo,
+        'undefined' => undefined,
+        _ => throw ArgumentError.value(value, 'value', 'Not a supported value.')
+      };
 
   String toJson() => description;
 }

diff --git a/shared_test/pubspec.yaml b/shared_test/pubspec.yaml
@@ -1,7 +1,7 @@
 name: _json_serial_shared_test
 publish_to: none
 environment:
-  sdk: '>=2.19.0 <3.0.0'
+  sdk: ^3.0.0
 
 dependencies:
   stack_trace: ^1.10.0