From b55a8e5a24191b0f6814273bd88586abbd392267 Mon Sep 17 00:00:00 2001
From: Rob Becker <rob.becker@workiva.com>
Date: Wed, 27 Sep 2023 14:19:28 -0600
Subject: [PATCH 1/4] Update json_serializable

---
 lib/src/pubspec_config.g.dart | 54 +++++++++++++++++++++--------------
 pubspec.yaml                  |  4 +--
 2 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/lib/src/pubspec_config.g.dart b/lib/src/pubspec_config.g.dart
index 5faaefb..d2b7949 100644
--- a/lib/src/pubspec_config.g.dart
+++ b/lib/src/pubspec_config.g.dart
@@ -6,28 +6,38 @@ part of 'pubspec_config.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-PubspecDepValidatorConfig _$PubspecDepValidatorConfigFromJson(Map json) {
-  return $checkedNew('PubspecDepValidatorConfig', json, () {
-    final val = PubspecDepValidatorConfig(
-      dependencyValidator: $checkedConvert(json, 'dependency_validator',
-          (v) => v == null ? null : DepValidatorConfig.fromJson(v as Map)),
+PubspecDepValidatorConfig _$PubspecDepValidatorConfigFromJson(Map json) =>
+    $checkedCreate(
+      'PubspecDepValidatorConfig',
+      json,
+      ($checkedConvert) {
+        final val = PubspecDepValidatorConfig(
+          dependencyValidator: $checkedConvert('dependency_validator',
+              (v) => v == null ? null : DepValidatorConfig.fromJson(v as Map)),
+        );
+        return val;
+      },
+      fieldKeyMap: const {'dependencyValidator': 'dependency_validator'},
     );
-    return val;
-  }, fieldKeyMap: const {'dependencyValidator': 'dependency_validator'});
-}
 
-DepValidatorConfig _$DepValidatorConfigFromJson(Map json) {
-  return $checkedNew('DepValidatorConfig', json, () {
-    final val = DepValidatorConfig(
-      exclude: $checkedConvert(json, 'exclude',
-              (v) => (v as List<dynamic>?)?.map((e) => e as String).toList()) ??
-          [],
-      ignore: $checkedConvert(json, 'ignore',
-              (v) => (v as List<dynamic>?)?.map((e) => e as String).toList()) ??
-          [],
-      allowPins:
-          $checkedConvert(json, 'allow_pins', (v) => v as bool?) ?? false,
+DepValidatorConfig _$DepValidatorConfigFromJson(Map json) => $checkedCreate(
+      'DepValidatorConfig',
+      json,
+      ($checkedConvert) {
+        final val = DepValidatorConfig(
+          exclude: $checkedConvert(
+              'exclude',
+              (v) =>
+                  (v as List<dynamic>?)?.map((e) => e as String).toList() ??
+                  []),
+          ignore: $checkedConvert(
+              'ignore',
+              (v) =>
+                  (v as List<dynamic>?)?.map((e) => e as String).toList() ??
+                  []),
+          allowPins: $checkedConvert('allow_pins', (v) => v as bool? ?? false),
+        );
+        return val;
+      },
+      fieldKeyMap: const {'allowPins': 'allow_pins'},
     );
-    return val;
-  }, fieldKeyMap: const {'allowPins': 'allow_pins'});
-}
diff --git a/pubspec.yaml b/pubspec.yaml
index 0e6f193..c3018d7 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -12,7 +12,7 @@ dependencies:
   checked_yaml: ^2.0.1
   glob: ^2.0.1
   io: ^1.0.0
-  json_annotation: ^4.0.1
+  json_annotation: ^4.8.0
   logging: ^1.0.1
   package_config: ^2.0.0
   path: ^1.8.0
@@ -22,7 +22,7 @@ dependencies:
 
 dev_dependencies:
   build_runner: ^2.1.2
-  json_serializable: ^5.0.2
+  json_serializable: ^6.0.0
   test: ^1.17.12
   test_descriptor: ^2.0.0
   workiva_analysis_options: ^1.2.2

From 6b6d401a22f08ac5d612203a9a521e4983cdeb78 Mon Sep 17 00:00:00 2001
From: Rob Becker <rob.becker@workiva.com>
Date: Wed, 27 Sep 2023 14:23:05 -0600
Subject: [PATCH 2/4] update test matrix

---
 .github/workflows/dart_ci.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dart_ci.yaml b/.github/workflows/dart_ci.yaml
index 5b14bfe..16a247c 100644
--- a/.github/workflows/dart_ci.yaml
+++ b/.github/workflows/dart_ci.yaml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        sdk: [ stable, beta, dev ]
+        sdk: [ 2.18.7, 2.19.6, 3.1.0 ]
     steps:
       - uses: actions/checkout@v2
       - uses: dart-lang/setup-dart@v1

From fda4bf50410abcea9d4c61527fe5020880469f4a Mon Sep 17 00:00:00 2001
From: Rob Becker <rob.becker@workiva.com>
Date: Wed, 27 Sep 2023 14:28:31 -0600
Subject: [PATCH 3/4] dockerfile not needed

---
 Dockerfile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 86e3ea2..c35f1b5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1 @@
-FROM google/dart:2
-WORKDIR /build/
-ADD pubspec.yaml /build
-RUN dart pub get
 FROM scratch

From acd616f6efccd5215a6ec6f31b786c9350d292b2 Mon Sep 17 00:00:00 2001
From: Rob Becker <rob.becker@workiva.com>
Date: Wed, 27 Sep 2023 14:32:58 -0600
Subject: [PATCH 4/4] remove 3.1.0

---
 .github/workflows/dart_ci.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dart_ci.yaml b/.github/workflows/dart_ci.yaml
index 16a247c..7ef20f8 100644
--- a/.github/workflows/dart_ci.yaml
+++ b/.github/workflows/dart_ci.yaml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        sdk: [ 2.18.7, 2.19.6, 3.1.0 ]
+        sdk: [ 2.18.7, 2.19.6 ]
     steps:
       - uses: actions/checkout@v2
       - uses: dart-lang/setup-dart@v1