diff --git a/packages/shorebird_code_push_protocol/lib/src/messages/create_patch/create_patch_request.g.dart b/packages/shorebird_code_push_protocol/lib/src/messages/create_patch/create_patch_request.g.dart
index 87dd5386..c2a129b6 100644
--- a/packages/shorebird_code_push_protocol/lib/src/messages/create_patch/create_patch_request.g.dart
+++ b/packages/shorebird_code_push_protocol/lib/src/messages/create_patch/create_patch_request.g.dart
@@ -14,7 +14,7 @@ CreatePatchRequest _$CreatePatchRequestFromJson(Map<String, dynamic> json) =>
       json,
       ($checkedConvert) {
         final val = CreatePatchRequest(
-          releaseId: $checkedConvert('release_id', (v) => v as int),
+          releaseId: $checkedConvert('release_id', (v) => (v as num).toInt()),
           wasForced: $checkedConvert('was_forced', (v) => v as bool?),
           metadata: $checkedConvert('metadata',
               (v) => CreatePatchMetadata.fromJson(v as Map<String, dynamic>)),
diff --git a/packages/shorebird_code_push_protocol/lib/src/messages/create_patch/create_patch_response.g.dart b/packages/shorebird_code_push_protocol/lib/src/messages/create_patch/create_patch_response.g.dart
index da073d5a..7a1be727 100644
--- a/packages/shorebird_code_push_protocol/lib/src/messages/create_patch/create_patch_response.g.dart
+++ b/packages/shorebird_code_push_protocol/lib/src/messages/create_patch/create_patch_response.g.dart
@@ -14,8 +14,8 @@ CreatePatchResponse _$CreatePatchResponseFromJson(Map<String, dynamic> json) =>
       json,
       ($checkedConvert) {
         final val = CreatePatchResponse(
-          id: $checkedConvert('id', (v) => v as int),
-          number: $checkedConvert('number', (v) => v as int),
+          id: $checkedConvert('id', (v) => (v as num).toInt()),
+          number: $checkedConvert('number', (v) => (v as num).toInt()),
         );
         return val;
       },
diff --git a/packages/shorebird_code_push_protocol/lib/src/messages/create_patch_artifact/create_patch_artifact_response.g.dart b/packages/shorebird_code_push_protocol/lib/src/messages/create_patch_artifact/create_patch_artifact_response.g.dart
index 58d79ec1..5a3aca31 100644
--- a/packages/shorebird_code_push_protocol/lib/src/messages/create_patch_artifact/create_patch_artifact_response.g.dart
+++ b/packages/shorebird_code_push_protocol/lib/src/messages/create_patch_artifact/create_patch_artifact_response.g.dart
@@ -15,13 +15,13 @@ CreatePatchArtifactResponse _$CreatePatchArtifactResponseFromJson(
       json,
       ($checkedConvert) {
         final val = CreatePatchArtifactResponse(
-          id: $checkedConvert('id', (v) => v as int),
-          patchId: $checkedConvert('patch_id', (v) => v as int),
+          id: $checkedConvert('id', (v) => (v as num).toInt()),
+          patchId: $checkedConvert('patch_id', (v) => (v as num).toInt()),
           arch: $checkedConvert('arch', (v) => v as String),
           platform: $checkedConvert(
               'platform', (v) => $enumDecode(_$ReleasePlatformEnumMap, v)),
           hash: $checkedConvert('hash', (v) => v as String),
-          size: $checkedConvert('size', (v) => v as int),
+          size: $checkedConvert('size', (v) => (v as num).toInt()),
           url: $checkedConvert('url', (v) => v as String),
         );
         return val;
diff --git a/packages/shorebird_code_push_protocol/lib/src/messages/create_release_artifact/create_release_artifact_response.g.dart b/packages/shorebird_code_push_protocol/lib/src/messages/create_release_artifact/create_release_artifact_response.g.dart
index be9c1b1f..ae1757fd 100644
--- a/packages/shorebird_code_push_protocol/lib/src/messages/create_release_artifact/create_release_artifact_response.g.dart
+++ b/packages/shorebird_code_push_protocol/lib/src/messages/create_release_artifact/create_release_artifact_response.g.dart
@@ -15,13 +15,13 @@ CreateReleaseArtifactResponse _$CreateReleaseArtifactResponseFromJson(
       json,
       ($checkedConvert) {
         final val = CreateReleaseArtifactResponse(
-          id: $checkedConvert('id', (v) => v as int),
-          releaseId: $checkedConvert('release_id', (v) => v as int),
+          id: $checkedConvert('id', (v) => (v as num).toInt()),
+          releaseId: $checkedConvert('release_id', (v) => (v as num).toInt()),
           arch: $checkedConvert('arch', (v) => v as String),
           platform: $checkedConvert(
               'platform', (v) => $enumDecode(_$ReleasePlatformEnumMap, v)),
           hash: $checkedConvert('hash', (v) => v as String),
-          size: $checkedConvert('size', (v) => v as int),
+          size: $checkedConvert('size', (v) => (v as num).toInt()),
           url: $checkedConvert('url', (v) => v as String),
         );
         return val;
diff --git a/packages/shorebird_code_push_protocol/lib/src/messages/promote_patch/promote_patch_request.g.dart b/packages/shorebird_code_push_protocol/lib/src/messages/promote_patch/promote_patch_request.g.dart
index a2203ab1..26468805 100644
--- a/packages/shorebird_code_push_protocol/lib/src/messages/promote_patch/promote_patch_request.g.dart
+++ b/packages/shorebird_code_push_protocol/lib/src/messages/promote_patch/promote_patch_request.g.dart
@@ -14,8 +14,8 @@ PromotePatchRequest _$PromotePatchRequestFromJson(Map<String, dynamic> json) =>
       json,
       ($checkedConvert) {
         final val = PromotePatchRequest(
-          patchId: $checkedConvert('patch_id', (v) => v as int),
-          channelId: $checkedConvert('channel_id', (v) => v as int),
+          patchId: $checkedConvert('patch_id', (v) => (v as num).toInt()),
+          channelId: $checkedConvert('channel_id', (v) => (v as num).toInt()),
         );
         return val;
       },
diff --git a/packages/shorebird_code_push_protocol/lib/src/models/app_metadata.g.dart b/packages/shorebird_code_push_protocol/lib/src/models/app_metadata.g.dart
index 9a4240c8..2d4c248a 100644
--- a/packages/shorebird_code_push_protocol/lib/src/models/app_metadata.g.dart
+++ b/packages/shorebird_code_push_protocol/lib/src/models/app_metadata.g.dart
@@ -21,8 +21,8 @@ AppMetadata _$AppMetadataFromJson(Map<String, dynamic> json) => $checkedCreate(
               $checkedConvert('updated_at', (v) => DateTime.parse(v as String)),
           latestReleaseVersion:
               $checkedConvert('latest_release_version', (v) => v as String?),
-          latestPatchNumber:
-              $checkedConvert('latest_patch_number', (v) => v as int?),
+          latestPatchNumber: $checkedConvert(
+              'latest_patch_number', (v) => (v as num?)?.toInt()),
         );
         return val;
       },
diff --git a/packages/shorebird_code_push_protocol/lib/src/models/channel.g.dart b/packages/shorebird_code_push_protocol/lib/src/models/channel.g.dart
index 2ddcafe4..3f53b490 100644
--- a/packages/shorebird_code_push_protocol/lib/src/models/channel.g.dart
+++ b/packages/shorebird_code_push_protocol/lib/src/models/channel.g.dart
@@ -13,7 +13,7 @@ Channel _$ChannelFromJson(Map<String, dynamic> json) => $checkedCreate(
       json,
       ($checkedConvert) {
         final val = Channel(
-          id: $checkedConvert('id', (v) => v as int),
+          id: $checkedConvert('id', (v) => (v as num).toInt()),
           appId: $checkedConvert('app_id', (v) => v as String),
           name: $checkedConvert('name', (v) => v as String),
         );
diff --git a/packages/shorebird_code_push_protocol/lib/src/models/patch.g.dart b/packages/shorebird_code_push_protocol/lib/src/models/patch.g.dart
index 3f04be68..77dae73e 100644
--- a/packages/shorebird_code_push_protocol/lib/src/models/patch.g.dart
+++ b/packages/shorebird_code_push_protocol/lib/src/models/patch.g.dart
@@ -13,8 +13,8 @@ Patch _$PatchFromJson(Map<String, dynamic> json) => $checkedCreate(
       json,
       ($checkedConvert) {
         final val = Patch(
-          id: $checkedConvert('id', (v) => v as int),
-          number: $checkedConvert('number', (v) => v as int),
+          id: $checkedConvert('id', (v) => (v as num).toInt()),
+          number: $checkedConvert('number', (v) => (v as num).toInt()),
         );
         return val;
       },
diff --git a/packages/shorebird_code_push_protocol/lib/src/models/release.g.dart b/packages/shorebird_code_push_protocol/lib/src/models/release.g.dart
index 11e6c22c..535e894d 100644
--- a/packages/shorebird_code_push_protocol/lib/src/models/release.g.dart
+++ b/packages/shorebird_code_push_protocol/lib/src/models/release.g.dart
@@ -13,7 +13,7 @@ Release _$ReleaseFromJson(Map<String, dynamic> json) => $checkedCreate(
       json,
       ($checkedConvert) {
         final val = Release(
-          id: $checkedConvert('id', (v) => v as int),
+          id: $checkedConvert('id', (v) => (v as num).toInt()),
           appId: $checkedConvert('app_id', (v) => v as String),
           version: $checkedConvert('version', (v) => v as String),
           flutterRevision:
diff --git a/packages/shorebird_code_push_protocol/lib/src/models/release_artifact.g.dart b/packages/shorebird_code_push_protocol/lib/src/models/release_artifact.g.dart
index d06b3e84..84ede88c 100644
--- a/packages/shorebird_code_push_protocol/lib/src/models/release_artifact.g.dart
+++ b/packages/shorebird_code_push_protocol/lib/src/models/release_artifact.g.dart
@@ -14,13 +14,13 @@ ReleaseArtifact _$ReleaseArtifactFromJson(Map<String, dynamic> json) =>
       json,
       ($checkedConvert) {
         final val = ReleaseArtifact(
-          id: $checkedConvert('id', (v) => v as int),
-          releaseId: $checkedConvert('release_id', (v) => v as int),
+          id: $checkedConvert('id', (v) => (v as num).toInt()),
+          releaseId: $checkedConvert('release_id', (v) => (v as num).toInt()),
           arch: $checkedConvert('arch', (v) => v as String),
           platform: $checkedConvert(
               'platform', (v) => $enumDecode(_$ReleasePlatformEnumMap, v)),
           hash: $checkedConvert('hash', (v) => v as String),
-          size: $checkedConvert('size', (v) => v as int),
+          size: $checkedConvert('size', (v) => (v as num).toInt()),
           url: $checkedConvert('url', (v) => v as String),
         );
         return val;
diff --git a/packages/shorebird_code_push_protocol/lib/src/models/user.g.dart b/packages/shorebird_code_push_protocol/lib/src/models/user.g.dart
index 46c17f8c..6b1a055b 100644
--- a/packages/shorebird_code_push_protocol/lib/src/models/user.g.dart
+++ b/packages/shorebird_code_push_protocol/lib/src/models/user.g.dart
@@ -13,7 +13,7 @@ User _$UserFromJson(Map<String, dynamic> json) => $checkedCreate(
       json,
       ($checkedConvert) {
         final val = User(
-          id: $checkedConvert('id', (v) => v as int),
+          id: $checkedConvert('id', (v) => (v as num).toInt()),
           email: $checkedConvert('email', (v) => v as String),
           jwtIssuer: $checkedConvert('jwt_issuer', (v) => v as String),
           hasActiveSubscription: $checkedConvert(