diff --git a/CHANGELOG.md b/CHANGELOG.md
index aac55168..a5c8e46b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+# 8.6.3
+
+- Bump version of `analyzer`.
+
 # 8.6.2
 
 - Remove JSON from `DeserializationError` message to prevent data accidentally
diff --git a/benchmark/pubspec.yaml b/benchmark/pubspec.yaml
index 92a7fcdd..dbbd3737 100644
--- a/benchmark/pubspec.yaml
+++ b/benchmark/pubspec.yaml
@@ -1,5 +1,5 @@
 name: benchmark
-version: 8.6.2
+version: 8.6.3
 publish_to: none
 description: >
   Benchmark, not for publishing.
@@ -14,7 +14,7 @@ dependencies:
 
 dev_dependencies:
   build_runner: '>=1.0.0 <3.0.0'
-  built_value_generator: ^8.6.2
+  built_value_generator: ^8.6.3
   pedantic: ^1.4.0
   quiver: '>=0.21.0 <4.0.0'
   test: ^1.0.0
diff --git a/built_value/pubspec.yaml b/built_value/pubspec.yaml
index 6220ace4..e04cf5bd 100644
--- a/built_value/pubspec.yaml
+++ b/built_value/pubspec.yaml
@@ -1,5 +1,5 @@
 name: built_value
-version: 8.6.2
+version: 8.6.3
 description: >
   Value types with builders, Dart classes as enums, and serialization.
   This library is the runtime dependency.
diff --git a/built_value_generator/pubspec.yaml b/built_value_generator/pubspec.yaml
index 22520472..6ac281bd 100644
--- a/built_value_generator/pubspec.yaml
+++ b/built_value_generator/pubspec.yaml
@@ -1,5 +1,5 @@
 name: built_value_generator
-version: 8.6.2
+version: 8.6.3
 description: >
   Value types with builders, Dart classes as enums, and serialization.
   This library is the dev dependency.
@@ -13,7 +13,7 @@ environment:
   sdk: '>=3.0.0 <4.0.0'
 
 dependencies:
-  analyzer: '>=5.2.0 <6.0.0'
+  analyzer: '>=5.2.0 <7.0.0'
   build: '>=1.0.0 <3.0.0'
   build_config: '>=0.3.1 <2.0.0'
   built_collection: ^5.0.0
diff --git a/built_value_generator/test/built_value_generator_test.dart b/built_value_generator/test/built_value_generator_test.dart
index 94b0babe..da15f715 100644
--- a/built_value_generator/test/built_value_generator_test.dart
+++ b/built_value_generator/test/built_value_generator_test.dart
@@ -218,7 +218,7 @@ part 'value.g.dart';
 abstract class Value implements Built<Value, ValueBuilder> {
   Value._();
   factory Value([void Function(ValueBuilder) updates]) = _\$Value;
-  
+
   @nullable
   int get x;
 }'''),
@@ -866,7 +866,7 @@ part 'value.g.dart';
 abstract class Value implements Built<Value, ValueBuilder> {
   Value._();
   factory Value([void Function(ValueBuilder) updates]) = _\$Value;
-  
+
   @BuiltValueField(nestedBuilder: true)
   NestedValue get nestedValue;
 }
@@ -946,12 +946,12 @@ class BuiltValue {
   final bool comparableBuilders;
   final bool instantiable;
   final bool nestedBuilders;
-  final String wireName;
+  final String? wireName;
 
   const BuiltValue({
-      this.comparableBuilders: false,
-      this.instantiable: true,
-      this.nestedBuilders: true,
+      this.comparableBuilders = false,
+      this.instantiable = true,
+      this.nestedBuilders = true,
       this.wireName});
 }
 
@@ -975,7 +975,7 @@ class BuiltValueHook {
   final bool finalizeBuilder;
 
   const BuiltValueHook(
-      {this.initializeBuilder,
-      this.finalizeBuilder});
+      {this.initializeBuilder = false,
+      this.finalizeBuilder = false});
 }
 ''';
diff --git a/built_value_generator/test/enum_class_generator_test.dart b/built_value_generator/test/enum_class_generator_test.dart
index 347b992f..39ff94b1 100644
--- a/built_value_generator/test/enum_class_generator_test.dart
+++ b/built_value_generator/test/enum_class_generator_test.dart
@@ -651,8 +651,8 @@ class EnumClass {
 }
 
 class BuiltValueEnumConst {
-  final String wireName;
-  final String wireNumber;
+  final String? wireName;
+  final int? wireNumber;
   final bool fallback;
 
   const BuiltValueEnumConst({
diff --git a/built_value_test/pubspec.yaml b/built_value_test/pubspec.yaml
index 489d8fa2..c174eee4 100644
--- a/built_value_test/pubspec.yaml
+++ b/built_value_test/pubspec.yaml
@@ -1,5 +1,5 @@
 name: built_value_test
-version: 8.6.2
+version: 8.6.3
 description: >
   Value types with builders, Dart classes as enums, and serialization.
   This library provides test support.
@@ -21,7 +21,7 @@ dependencies:
   quiver: '>=0.21.0 <4.0.0'
 
 dev_dependencies:
-  built_value_generator: ^8.6.2
+  built_value_generator: ^8.6.3
   build_runner: '>=1.0.0 <3.0.0'
   pedantic: ^1.4.0
   test: ^1.0.0
diff --git a/chat_example/pubspec.yaml b/chat_example/pubspec.yaml
index dc4ed55f..06f60533 100644
--- a/chat_example/pubspec.yaml
+++ b/chat_example/pubspec.yaml
@@ -1,5 +1,5 @@
 name: chat_example
-version: 8.6.2
+version: 8.6.3
 publish_to: none
 description: >
   Just an example, not for publishing.
@@ -20,6 +20,6 @@ dev_dependencies:
   build_runner: any
   build_test: any
   build_web_compilers: any
-  built_value_generator: ^8.6.2
+  built_value_generator: ^8.6.3
   pedantic: ^1.4.0
   test: ^1.0.0
diff --git a/end_to_end_test/pubspec.yaml b/end_to_end_test/pubspec.yaml
index a96cc9da..bbecc922 100644
--- a/end_to_end_test/pubspec.yaml
+++ b/end_to_end_test/pubspec.yaml
@@ -1,5 +1,5 @@
 name: end_to_end_test
-version: 8.6.2
+version: 8.6.3
 publish_to: none
 description: >
   Tests, not for publishing.
@@ -15,7 +15,7 @@ dependencies:
 dev_dependencies:
   build: '>=1.0.0 <3.0.0'
   build_runner: '>=1.0.0 <3.0.0'
-  built_value_generator: ^8.6.2
+  built_value_generator: ^8.6.3
   fixnum: ^1.0.0
   pedantic: ^1.4.0
   quiver: '>=0.21.0 <4.0.0'
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index 7d8d82e4..b320eb0d 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -13,7 +13,7 @@ dependencies:
 
 dev_dependencies:
   build_runner: '>=1.0.0 <3.0.0'
-  built_value_generator: ^8.6.2
+  built_value_generator: ^8.6.3
   pedantic: ^1.4.0
   quiver: '>=0.21.0 <4.0.0'
   test: ^1.0.0