From c6a7d9f909b0a16f526fa6767ae81b50182656af Mon Sep 17 00:00:00 2001 From: Dimitris Koutsogiorgas Date: Wed, 4 Oct 2023 22:42:06 +0100 Subject: [PATCH] Use two different folders as output for Swift generated code as they erase each other --- gen-tests.gradle.kts | 8 +- wire-runtime-swift/build.gradle.kts | 1 + .../com/squareup/wire/swift/SwiftGenerator.kt | 12 +- .../module_one/SwiftModuleOneType.swift | 25 +++ .../module_two/SwiftModuleTwoMessage.swift | 189 ++++++++++++++++++ .../swift/{ => no-manifest}/AllTypes.swift | 0 .../{ => no-manifest}/DeprecatedEnum.swift | 0 .../{ => no-manifest}/DeprecatedProto.swift | 0 .../{ => no-manifest}/EmbeddedMessage.swift | 0 .../{ => no-manifest}/EnumVersionOne.swift | 0 .../{ => no-manifest}/EnumVersionTwo.swift | 0 .../{ => no-manifest}/ExternalMessage.swift | 0 .../main/swift/{ => no-manifest}/FooBar.swift | 0 .../swift/{ => no-manifest}/ForeignEnum.swift | 0 .../{ => no-manifest}/ForeignMessage.swift | 0 .../main/swift/{ => no-manifest}/Form.swift | 0 .../main/swift/{ => no-manifest}/Mappy.swift | 0 .../swift/{ => no-manifest}/MappyTwo.swift | 0 .../MessageUsingMultipleEnums.swift | 0 .../MessageWithOptions.swift | 0 .../{ => no-manifest}/MessageWithStatus.swift | 0 .../{ => no-manifest}/ModelEvaluation.swift | 0 .../{ => no-manifest}/NestedVersionOne.swift | 0 .../{ => no-manifest}/NestedVersionTwo.swift | 0 .../swift/{ => no-manifest}/NoFields.swift | 0 .../{ => no-manifest}/OneOfMessage.swift | 0 .../{ => no-manifest}/OptionalEnumUser.swift | 0 .../OtherMessageWithStatus.swift | 0 .../{ => no-manifest}/OuterMessage.swift | 0 .../swift/{ => no-manifest}/Percents.swift | 0 .../main/swift/{ => no-manifest}/Person.swift | 0 .../{ => no-manifest}/RedactedOneOf.swift | 0 .../main/swift/{ => no-manifest}/Thing.swift | 0 .../swift/{ => no-manifest}/VersionOne.swift | 0 .../swift/{ => no-manifest}/VersionTwo.swift | 0 ...LongProtoNameCausingBrokenLineBreaks.swift | 0 36 files changed, 225 insertions(+), 10 deletions(-) create mode 100644 wire-tests-swift/src/main/swift/manifest/module_one/SwiftModuleOneType.swift create mode 100644 wire-tests-swift/src/main/swift/manifest/module_two/SwiftModuleTwoMessage.swift rename wire-tests-swift/src/main/swift/{ => no-manifest}/AllTypes.swift (100%) rename wire-tests-swift/src/main/swift/{ => no-manifest}/DeprecatedEnum.swift (100%) rename wire-tests-swift/src/main/swift/{ => no-manifest}/DeprecatedProto.swift (100%) rename wire-tests-swift/src/main/swift/{ => no-manifest}/EmbeddedMessage.swift (100%) rename wire-tests-swift/src/main/swift/{ => no-manifest}/EnumVersionOne.swift (100%) rename wire-tests-swift/src/main/swift/{ => no-manifest}/EnumVersionTwo.swift (100%) rename wire-tests-swift/src/main/swift/{ => no-manifest}/ExternalMessage.swift (100%) rename wire-tests-swift/src/main/swift/{ => no-manifest}/FooBar.swift (100%) rename wire-tests-swift/src/main/swift/{ => no-manifest}/ForeignEnum.swift (100%) rename wire-tests-swift/src/main/swift/{ => no-manifest}/ForeignMessage.swift (100%) rename wire-tests-swift/src/main/swift/{ => no-manifest}/Form.swift (100%) rename wire-tests-swift/src/main/swift/{ => no-manifest}/Mappy.swift (100%) rename wire-tests-swift/src/main/swift/{ => no-manifest}/MappyTwo.swift (100%) rename wire-tests-swift/src/main/swift/{ => no-manifest}/MessageUsingMultipleEnums.swift (100%) rename wire-tests-swift/src/main/swift/{ => no-manifest}/MessageWithOptions.swift (100%) rename wire-tests-swift/src/main/swift/{ => no-manifest}/MessageWithStatus.swift (100%) rename wire-tests-swift/src/main/swift/{ => no-manifest}/ModelEvaluation.swift (100%) rename wire-tests-swift/src/main/swift/{ => no-manifest}/NestedVersionOne.swift (100%) rename wire-tests-swift/src/main/swift/{ => no-manifest}/NestedVersionTwo.swift (100%) rename wire-tests-swift/src/main/swift/{ => no-manifest}/NoFields.swift (100%) rename wire-tests-swift/src/main/swift/{ => no-manifest}/OneOfMessage.swift (100%) rename wire-tests-swift/src/main/swift/{ => no-manifest}/OptionalEnumUser.swift (100%) rename wire-tests-swift/src/main/swift/{ => no-manifest}/OtherMessageWithStatus.swift (100%) rename wire-tests-swift/src/main/swift/{ => no-manifest}/OuterMessage.swift (100%) rename wire-tests-swift/src/main/swift/{ => no-manifest}/Percents.swift (100%) rename wire-tests-swift/src/main/swift/{ => no-manifest}/Person.swift (100%) rename wire-tests-swift/src/main/swift/{ => no-manifest}/RedactedOneOf.swift (100%) rename wire-tests-swift/src/main/swift/{ => no-manifest}/Thing.swift (100%) rename wire-tests-swift/src/main/swift/{ => no-manifest}/VersionOne.swift (100%) rename wire-tests-swift/src/main/swift/{ => no-manifest}/VersionTwo.swift (100%) rename wire-tests-swift/src/main/swift/{ => no-manifest}/VeryLongProtoNameCausingBrokenLineBreaks.swift (100%) diff --git a/gen-tests.gradle.kts b/gen-tests.gradle.kts index 3fa3c7b401..84cf31e812 100644 --- a/gen-tests.gradle.kts +++ b/gen-tests.gradle.kts @@ -415,7 +415,7 @@ val generateSwiftProto3Tests by tasks.creating(JavaExec::class) { } val generateSwiftProto2ManifestTests by tasks.creating(JavaExec::class) { - val swiftOut = "wire-tests-swift/src/main/swift" + val swiftOut = "wire-tests-swift/src/main/swift/manifest" doFirst { val outFile = file(swiftOut) outFile.deleteRecursively() @@ -430,13 +430,13 @@ val generateSwiftProto2ManifestTests by tasks.creating(JavaExec::class) { "--proto_path=wire-tests/src/commonTest/proto/kotlin", "--swift_out=$swiftOut", "--experimental-module-manifest=wire-tests/src/commonTest/proto/kotlin/swift_modules_manifest.yaml", - // "swift_module_one.proto", + "swift_module_one.proto", "swift_module_two.proto" ) } val generateSwiftProto2Tests by tasks.creating(JavaExec::class) { - val swiftOut = "wire-tests-swift/src/main/swift/" + val swiftOut = "wire-tests-swift/src/main/swift/no-manifest" doFirst { val outFile = file(swiftOut) outFile.deleteRecursively() @@ -482,8 +482,8 @@ val generateSwiftTests by tasks.creating { group = "Generate Tests" description = "Generates Swift classes from the test protos" dependsOn( - generateSwiftProto2Tests, generateSwiftProto2ManifestTests, + generateSwiftProto2Tests, generateSwiftProto3Tests, ":wire-runtime-swift:generateTestProtos" ) diff --git a/wire-runtime-swift/build.gradle.kts b/wire-runtime-swift/build.gradle.kts index 6eabfbea34..d7e21be3c2 100644 --- a/wire-runtime-swift/build.gradle.kts +++ b/wire-runtime-swift/build.gradle.kts @@ -125,6 +125,7 @@ afterEvaluate { } tasks.withType(SwiftCompile::class).all { + println(module) // Include the ${DEVELOPER_DIR}/usr/lib as we also need to use libXCTestSwiftSupport.dylib as of // Xcode 12.5: // https://forums.swift.org/t/why-xcode-12-5b-cannot-find-xctassertequal-in-scope-in-playground/44411 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 index ff5efe4d53..0c3466dfc4 100644 --- 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 @@ -1206,12 +1206,12 @@ class SwiftGenerator private constructor( if (typeName is DeclaredTypeName) { imports.add(typeName.moduleName) } - // if (field.isRepeated && typeName is ParameterizedTypeName) { - // val declaredTypeName = typeName.typeArguments[0] - // if (declaredTypeName is DeclaredTypeName) { - // imports.add(declaredTypeName.moduleName) - // } - // } + if (field.isRepeated && typeName is ParameterizedTypeName) { + val declaredTypeName = typeName.typeArguments[0] + if (declaredTypeName is DeclaredTypeName) { + imports.add(declaredTypeName.moduleName) + } + } val property = PropertySpec.varBuilder(field.name, field.typeName, visibility) if (!forStorageType && field.documentation.isNotBlank()) { diff --git a/wire-tests-swift/src/main/swift/manifest/module_one/SwiftModuleOneType.swift b/wire-tests-swift/src/main/swift/manifest/module_one/SwiftModuleOneType.swift new file mode 100644 index 0000000000..7ade0670aa --- /dev/null +++ b/wire-tests-swift/src/main/swift/manifest/module_one/SwiftModuleOneType.swift @@ -0,0 +1,25 @@ +// Code generated by Wire protocol buffer compiler, do not edit. +// Source: squareup.protos.kotlin.swift_modules.SwiftModuleOneType in swift_module_one.proto +import Foundation +import Wire + +public enum SwiftModuleOneType : UInt32, CaseIterable, ProtoEnum { + + case DO_NOT_USE = 0 + case ONE = 1 + case TWO = 2 + + public var description: String { + switch self { + case .DO_NOT_USE: return "DO_NOT_USE" + case .ONE: return "ONE" + case .TWO: return "TWO" + } + } + +} + +#if swift(>=5.5) +extension SwiftModuleOneType : Sendable { +} +#endif diff --git a/wire-tests-swift/src/main/swift/manifest/module_two/SwiftModuleTwoMessage.swift b/wire-tests-swift/src/main/swift/manifest/module_two/SwiftModuleTwoMessage.swift new file mode 100644 index 0000000000..bcf34c5ad6 --- /dev/null +++ b/wire-tests-swift/src/main/swift/manifest/module_two/SwiftModuleTwoMessage.swift @@ -0,0 +1,189 @@ +// Code generated by Wire protocol buffer compiler, do not edit. +// Source: squareup.protos.kotlin.swift_modules.SwiftModuleTwoMessage in swift_module_two.proto +import Foundation +import Wire +import module_one + +public struct SwiftModuleTwoMessage { + + public var name: String? + public var unknownFields: Foundation.Data = .init() + + public init(configure: (inout Self) -> Swift.Void = { _ in }) { + configure(&self) + } + +} + +#if WIRE_INCLUDE_MEMBERWISE_INITIALIZER +extension SwiftModuleTwoMessage { + + @_disfavoredOverload + @available(*, deprecated) + public init(name: Swift.String? = nil) { + self.name = name + } + +} +#endif + +#if !WIRE_REMOVE_EQUATABLE +extension SwiftModuleTwoMessage : Equatable { +} +#endif + +#if !WIRE_REMOVE_HASHABLE +extension SwiftModuleTwoMessage : Hashable { +} +#endif + +#if swift(>=5.5) +extension SwiftModuleTwoMessage : Sendable { +} +#endif + +extension SwiftModuleTwoMessage : ProtoMessage { + + public static func protoMessageTypeURL() -> Swift.String { + return "type.googleapis.com/squareup.protos.kotlin.swift_modules.SwiftModuleTwoMessage" + } + +} + +extension SwiftModuleTwoMessage : Proto2Codable { + + public init(from protoReader: Wire.ProtoReader) throws { + var name: Swift.String? = nil + + let token = try protoReader.beginMessage() + while let tag = try protoReader.nextTag(token: token) { + switch tag { + case 1: name = try protoReader.decode(Swift.String.self) + default: try protoReader.readUnknownField(tag: tag) + } + } + self.unknownFields = try protoReader.endMessage(token: token) + + self.name = name + } + + public func encode(to protoWriter: Wire.ProtoWriter) throws { + try protoWriter.encode(tag: 1, value: self.name) + try protoWriter.writeUnknownFields(unknownFields) + } + +} + +#if !WIRE_REMOVE_CODABLE +extension SwiftModuleTwoMessage : Codable { + + public init(from decoder: Swift.Decoder) throws { + let container = try decoder.container(keyedBy: Wire.StringLiteralCodingKeys.self) + self.name = try container.decodeIfPresent(Swift.String.self, forKey: "name") + } + + public func encode(to encoder: Swift.Encoder) throws { + var container = encoder.container(keyedBy: Wire.StringLiteralCodingKeys.self) + + try container.encodeIfPresent(self.name, forKey: "name") + } + +} +#endif + +/** + * Subtypes within SwiftModuleTwoMessage + */ +extension SwiftModuleTwoMessage { + + public struct NestedMessage { + + public var types: [module_one.SwiftModuleOneType] = [] + public var unknownFields: Foundation.Data = .init() + + public init(configure: (inout Self) -> Swift.Void = { _ in }) { + configure(&self) + } + + } + +} + +#if WIRE_INCLUDE_MEMBERWISE_INITIALIZER +extension SwiftModuleTwoMessage.NestedMessage { + + @_disfavoredOverload + @available(*, deprecated) + public init(types: [module_one.SwiftModuleOneType] = []) { + self.types = types + } + +} +#endif + +#if !WIRE_REMOVE_EQUATABLE +extension SwiftModuleTwoMessage.NestedMessage : Equatable { +} +#endif + +#if !WIRE_REMOVE_HASHABLE +extension SwiftModuleTwoMessage.NestedMessage : Hashable { +} +#endif + +#if swift(>=5.5) +extension SwiftModuleTwoMessage.NestedMessage : Sendable { +} +#endif + +extension SwiftModuleTwoMessage.NestedMessage : ProtoMessage { + + public static func protoMessageTypeURL() -> Swift.String { + return "type.googleapis.com/squareup.protos.kotlin.swift_modules.SwiftModuleTwoMessage.NestedMessage" + } + +} + +extension SwiftModuleTwoMessage.NestedMessage : Proto2Codable { + + public init(from protoReader: Wire.ProtoReader) throws { + var types: [module_one.SwiftModuleOneType] = [] + + let token = try protoReader.beginMessage() + while let tag = try protoReader.nextTag(token: token) { + switch tag { + case 2: try protoReader.decode(into: &types) + default: try protoReader.readUnknownField(tag: tag) + } + } + self.unknownFields = try protoReader.endMessage(token: token) + + self.types = types + } + + public func encode(to protoWriter: Wire.ProtoWriter) throws { + try protoWriter.encode(tag: 2, value: self.types) + try protoWriter.writeUnknownFields(unknownFields) + } + +} + +#if !WIRE_REMOVE_CODABLE +extension SwiftModuleTwoMessage.NestedMessage : Codable { + + public init(from decoder: Swift.Decoder) throws { + let container = try decoder.container(keyedBy: Wire.StringLiteralCodingKeys.self) + self.types = try container.decodeProtoArray(module_one.SwiftModuleOneType.self, forKey: "types") + } + + public func encode(to encoder: Swift.Encoder) throws { + var container = encoder.container(keyedBy: Wire.StringLiteralCodingKeys.self) + let includeDefaults = encoder.protoDefaultValuesEncodingStrategy == .include + + if includeDefaults || !self.types.isEmpty { + try container.encodeProtoArray(self.types, forKey: "types") + } + } + +} +#endif diff --git a/wire-tests-swift/src/main/swift/AllTypes.swift b/wire-tests-swift/src/main/swift/no-manifest/AllTypes.swift similarity index 100% rename from wire-tests-swift/src/main/swift/AllTypes.swift rename to wire-tests-swift/src/main/swift/no-manifest/AllTypes.swift diff --git a/wire-tests-swift/src/main/swift/DeprecatedEnum.swift b/wire-tests-swift/src/main/swift/no-manifest/DeprecatedEnum.swift similarity index 100% rename from wire-tests-swift/src/main/swift/DeprecatedEnum.swift rename to wire-tests-swift/src/main/swift/no-manifest/DeprecatedEnum.swift diff --git a/wire-tests-swift/src/main/swift/DeprecatedProto.swift b/wire-tests-swift/src/main/swift/no-manifest/DeprecatedProto.swift similarity index 100% rename from wire-tests-swift/src/main/swift/DeprecatedProto.swift rename to wire-tests-swift/src/main/swift/no-manifest/DeprecatedProto.swift diff --git a/wire-tests-swift/src/main/swift/EmbeddedMessage.swift b/wire-tests-swift/src/main/swift/no-manifest/EmbeddedMessage.swift similarity index 100% rename from wire-tests-swift/src/main/swift/EmbeddedMessage.swift rename to wire-tests-swift/src/main/swift/no-manifest/EmbeddedMessage.swift diff --git a/wire-tests-swift/src/main/swift/EnumVersionOne.swift b/wire-tests-swift/src/main/swift/no-manifest/EnumVersionOne.swift similarity index 100% rename from wire-tests-swift/src/main/swift/EnumVersionOne.swift rename to wire-tests-swift/src/main/swift/no-manifest/EnumVersionOne.swift diff --git a/wire-tests-swift/src/main/swift/EnumVersionTwo.swift b/wire-tests-swift/src/main/swift/no-manifest/EnumVersionTwo.swift similarity index 100% rename from wire-tests-swift/src/main/swift/EnumVersionTwo.swift rename to wire-tests-swift/src/main/swift/no-manifest/EnumVersionTwo.swift diff --git a/wire-tests-swift/src/main/swift/ExternalMessage.swift b/wire-tests-swift/src/main/swift/no-manifest/ExternalMessage.swift similarity index 100% rename from wire-tests-swift/src/main/swift/ExternalMessage.swift rename to wire-tests-swift/src/main/swift/no-manifest/ExternalMessage.swift diff --git a/wire-tests-swift/src/main/swift/FooBar.swift b/wire-tests-swift/src/main/swift/no-manifest/FooBar.swift similarity index 100% rename from wire-tests-swift/src/main/swift/FooBar.swift rename to wire-tests-swift/src/main/swift/no-manifest/FooBar.swift diff --git a/wire-tests-swift/src/main/swift/ForeignEnum.swift b/wire-tests-swift/src/main/swift/no-manifest/ForeignEnum.swift similarity index 100% rename from wire-tests-swift/src/main/swift/ForeignEnum.swift rename to wire-tests-swift/src/main/swift/no-manifest/ForeignEnum.swift diff --git a/wire-tests-swift/src/main/swift/ForeignMessage.swift b/wire-tests-swift/src/main/swift/no-manifest/ForeignMessage.swift similarity index 100% rename from wire-tests-swift/src/main/swift/ForeignMessage.swift rename to wire-tests-swift/src/main/swift/no-manifest/ForeignMessage.swift diff --git a/wire-tests-swift/src/main/swift/Form.swift b/wire-tests-swift/src/main/swift/no-manifest/Form.swift similarity index 100% rename from wire-tests-swift/src/main/swift/Form.swift rename to wire-tests-swift/src/main/swift/no-manifest/Form.swift diff --git a/wire-tests-swift/src/main/swift/Mappy.swift b/wire-tests-swift/src/main/swift/no-manifest/Mappy.swift similarity index 100% rename from wire-tests-swift/src/main/swift/Mappy.swift rename to wire-tests-swift/src/main/swift/no-manifest/Mappy.swift diff --git a/wire-tests-swift/src/main/swift/MappyTwo.swift b/wire-tests-swift/src/main/swift/no-manifest/MappyTwo.swift similarity index 100% rename from wire-tests-swift/src/main/swift/MappyTwo.swift rename to wire-tests-swift/src/main/swift/no-manifest/MappyTwo.swift diff --git a/wire-tests-swift/src/main/swift/MessageUsingMultipleEnums.swift b/wire-tests-swift/src/main/swift/no-manifest/MessageUsingMultipleEnums.swift similarity index 100% rename from wire-tests-swift/src/main/swift/MessageUsingMultipleEnums.swift rename to wire-tests-swift/src/main/swift/no-manifest/MessageUsingMultipleEnums.swift diff --git a/wire-tests-swift/src/main/swift/MessageWithOptions.swift b/wire-tests-swift/src/main/swift/no-manifest/MessageWithOptions.swift similarity index 100% rename from wire-tests-swift/src/main/swift/MessageWithOptions.swift rename to wire-tests-swift/src/main/swift/no-manifest/MessageWithOptions.swift diff --git a/wire-tests-swift/src/main/swift/MessageWithStatus.swift b/wire-tests-swift/src/main/swift/no-manifest/MessageWithStatus.swift similarity index 100% rename from wire-tests-swift/src/main/swift/MessageWithStatus.swift rename to wire-tests-swift/src/main/swift/no-manifest/MessageWithStatus.swift diff --git a/wire-tests-swift/src/main/swift/ModelEvaluation.swift b/wire-tests-swift/src/main/swift/no-manifest/ModelEvaluation.swift similarity index 100% rename from wire-tests-swift/src/main/swift/ModelEvaluation.swift rename to wire-tests-swift/src/main/swift/no-manifest/ModelEvaluation.swift diff --git a/wire-tests-swift/src/main/swift/NestedVersionOne.swift b/wire-tests-swift/src/main/swift/no-manifest/NestedVersionOne.swift similarity index 100% rename from wire-tests-swift/src/main/swift/NestedVersionOne.swift rename to wire-tests-swift/src/main/swift/no-manifest/NestedVersionOne.swift diff --git a/wire-tests-swift/src/main/swift/NestedVersionTwo.swift b/wire-tests-swift/src/main/swift/no-manifest/NestedVersionTwo.swift similarity index 100% rename from wire-tests-swift/src/main/swift/NestedVersionTwo.swift rename to wire-tests-swift/src/main/swift/no-manifest/NestedVersionTwo.swift diff --git a/wire-tests-swift/src/main/swift/NoFields.swift b/wire-tests-swift/src/main/swift/no-manifest/NoFields.swift similarity index 100% rename from wire-tests-swift/src/main/swift/NoFields.swift rename to wire-tests-swift/src/main/swift/no-manifest/NoFields.swift diff --git a/wire-tests-swift/src/main/swift/OneOfMessage.swift b/wire-tests-swift/src/main/swift/no-manifest/OneOfMessage.swift similarity index 100% rename from wire-tests-swift/src/main/swift/OneOfMessage.swift rename to wire-tests-swift/src/main/swift/no-manifest/OneOfMessage.swift diff --git a/wire-tests-swift/src/main/swift/OptionalEnumUser.swift b/wire-tests-swift/src/main/swift/no-manifest/OptionalEnumUser.swift similarity index 100% rename from wire-tests-swift/src/main/swift/OptionalEnumUser.swift rename to wire-tests-swift/src/main/swift/no-manifest/OptionalEnumUser.swift diff --git a/wire-tests-swift/src/main/swift/OtherMessageWithStatus.swift b/wire-tests-swift/src/main/swift/no-manifest/OtherMessageWithStatus.swift similarity index 100% rename from wire-tests-swift/src/main/swift/OtherMessageWithStatus.swift rename to wire-tests-swift/src/main/swift/no-manifest/OtherMessageWithStatus.swift diff --git a/wire-tests-swift/src/main/swift/OuterMessage.swift b/wire-tests-swift/src/main/swift/no-manifest/OuterMessage.swift similarity index 100% rename from wire-tests-swift/src/main/swift/OuterMessage.swift rename to wire-tests-swift/src/main/swift/no-manifest/OuterMessage.swift diff --git a/wire-tests-swift/src/main/swift/Percents.swift b/wire-tests-swift/src/main/swift/no-manifest/Percents.swift similarity index 100% rename from wire-tests-swift/src/main/swift/Percents.swift rename to wire-tests-swift/src/main/swift/no-manifest/Percents.swift diff --git a/wire-tests-swift/src/main/swift/Person.swift b/wire-tests-swift/src/main/swift/no-manifest/Person.swift similarity index 100% rename from wire-tests-swift/src/main/swift/Person.swift rename to wire-tests-swift/src/main/swift/no-manifest/Person.swift diff --git a/wire-tests-swift/src/main/swift/RedactedOneOf.swift b/wire-tests-swift/src/main/swift/no-manifest/RedactedOneOf.swift similarity index 100% rename from wire-tests-swift/src/main/swift/RedactedOneOf.swift rename to wire-tests-swift/src/main/swift/no-manifest/RedactedOneOf.swift diff --git a/wire-tests-swift/src/main/swift/Thing.swift b/wire-tests-swift/src/main/swift/no-manifest/Thing.swift similarity index 100% rename from wire-tests-swift/src/main/swift/Thing.swift rename to wire-tests-swift/src/main/swift/no-manifest/Thing.swift diff --git a/wire-tests-swift/src/main/swift/VersionOne.swift b/wire-tests-swift/src/main/swift/no-manifest/VersionOne.swift similarity index 100% rename from wire-tests-swift/src/main/swift/VersionOne.swift rename to wire-tests-swift/src/main/swift/no-manifest/VersionOne.swift diff --git a/wire-tests-swift/src/main/swift/VersionTwo.swift b/wire-tests-swift/src/main/swift/no-manifest/VersionTwo.swift similarity index 100% rename from wire-tests-swift/src/main/swift/VersionTwo.swift rename to wire-tests-swift/src/main/swift/no-manifest/VersionTwo.swift diff --git a/wire-tests-swift/src/main/swift/VeryLongProtoNameCausingBrokenLineBreaks.swift b/wire-tests-swift/src/main/swift/no-manifest/VeryLongProtoNameCausingBrokenLineBreaks.swift similarity index 100% rename from wire-tests-swift/src/main/swift/VeryLongProtoNameCausingBrokenLineBreaks.swift rename to wire-tests-swift/src/main/swift/no-manifest/VeryLongProtoNameCausingBrokenLineBreaks.swift