Merge pull request #3260 from square/fix_missing_proto_message_confor…

…mance [swift] Fix conformance to ProtoMessage for heap allocated protos
square · Jan 23, 2025 · e8d52ce · e8d52ce
2 parents 81f9533 + 931f8fa
commit e8d52ce
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/wire-swift-generator/src/main/java/com/squareup/wire/swift/SwiftGenerator.kt b/wire-swift-generator/src/main/java/com/squareup/wire/swift/SwiftGenerator.kt
@@ -461,6 +461,11 @@ class SwiftGenerator private constructor(
         .build()
       fileMembers += FileMemberSpec.builder(structProtoCodableExtension).build()
 
+      val structMessageConformanceExtension = ExtensionSpec.builder(structType)
+        .messageConformanceExtension(type)
+        .build()
+      fileMembers += FileMemberSpec.builder(structMessageConformanceExtension).build()
+
       val structCodableExtension = heapCodableExtension(structType, storageName, storageType)
       fileMembers += FileMemberSpec.builder(structCodableExtension)
         .addGuard("!$FLAG_REMOVE_CODABLE")

diff --git a/wire-tests-swift/no-manifest/src/main/swift/AllTypes.swift b/wire-tests-swift/no-manifest/src/main/swift/AllTypes.swift
@@ -1911,6 +1911,14 @@ extension AllTypes : Proto2Codable {
 
 }
 
+extension AllTypes : ProtoMessage {
+
+    public static func protoMessageTypeURL() -> String {
+        return "type.googleapis.com/squareup.protos.kotlin.alltypes.AllTypes"
+    }
+
+}
+
 #if !WIRE_REMOVE_CODABLE
 extension AllTypes : Codable {