Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions plugins/apple/swift/v1.35.0/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
*
!Dockerfile
!extramoduleimports.patch
19 changes: 19 additions & 0 deletions plugins/apple/swift/v1.35.0/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# syntax=docker/dockerfile:1.19
FROM swift:6.2.3-bookworm AS build

RUN apt-get update \
&& apt-get install -y libstdc++-12-dev unzip
COPY --link extramoduleimports.patch /app/extramoduleimports.patch
WORKDIR /app
RUN git clone --depth 1 --branch 1.35.0 https://github.com/apple/swift-protobuf --recursive
WORKDIR /app/swift-protobuf
RUN git apply /app/extramoduleimports.patch
RUN swift build -c release --static-swift-stdlib -Xlinker -s

FROM gcr.io/distroless/cc-debian12:latest@sha256:329e54034ce498f9c6b345044e8f530c6691f99e94a92446f68c0adf9baa8464 AS base

FROM scratch
COPY --link --from=base / /
COPY --link --from=build /app/swift-protobuf/.build/release/protoc-gen-swift .
USER nobody
ENTRYPOINT [ "/protoc-gen-swift" ]
21 changes: 21 additions & 0 deletions plugins/apple/swift/v1.35.0/buf.plugin.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
version: v1
name: buf.build/apple/swift
plugin_version: v1.35.0
source_url: https://github.com/apple/swift-protobuf
integration_guide_url: https://github.com/apple/swift-protobuf#getting-started
description: Base types for Swift. Generates message and enum types.
output_languages:
- swift
registry:
swift:
deps:
- source: https://github.com/apple/swift-protobuf.git
package: swift-protobuf
swift_versions: [ ".v5", ".v6" ]
products: [ SwiftProtobuf ]
version: 1.35.0
opts:
- Visibility=Public
- FileNaming=PathToUnderscores
spdx_license_id: Apache-2.0
license_url: https://github.com/apple/swift-protobuf/blob/1.35.0/LICENSE.txt
63 changes: 63 additions & 0 deletions plugins/apple/swift/v1.35.0/extramoduleimports.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
diff --git a/Sources/protoc-gen-swift/FileGenerator.swift b/Sources/protoc-gen-swift/FileGenerator.swift
index f0cddb24..e5864211 100644
--- a/Sources/protoc-gen-swift/FileGenerator.swift
+++ b/Sources/protoc-gen-swift/FileGenerator.swift
@@ -149,6 +149,14 @@ class FileGenerator {
return
}

+ let neededCustomImports = generatorOptions.extraModuleImports
+ if !neededCustomImports.isEmpty {
+ p.print()
+ for i in neededCustomImports {
+ p.print("import \(i)\n")
+ }
+ }
+
p.print()
generateVersionCheck(printer: &p)

diff --git a/Sources/protoc-gen-swift/GeneratorOptions.swift b/Sources/protoc-gen-swift/GeneratorOptions.swift
index 3224e138..8bfc1ce5 100644
--- a/Sources/protoc-gen-swift/GeneratorOptions.swift
+++ b/Sources/protoc-gen-swift/GeneratorOptions.swift
@@ -64,6 +64,7 @@ class GeneratorOptions {
}
}

+ let extraModuleImports: [String]
let outputNaming: OutputNaming
let protoToModuleMappings: ProtoFileToModuleMappings
let visibility: Visibility
@@ -74,6 +75,7 @@ class GeneratorOptions {
let visibilitySourceSnippet: String

init(parameter: any CodeGeneratorParameter) throws {
+ var externalModuleImports: [String] = []
var outputNaming: OutputNaming = .fullPath
var moduleMapPath: String?
var visibility: Visibility = .internal
@@ -146,6 +148,15 @@ class GeneratorOptions {
value: pair.value
)
}
+ case "ExtraModuleImports":
+ if !pair.value.isEmpty {
+ externalModuleImports.append(pair.value)
+ } else {
+ throw GenerationError.invalidParameterValue(
+ name: pair.key,
+ value: pair.value
+ )
+ }
default:
throw GenerationError.unknownParameter(name: pair.key)
}
@@ -179,6 +190,7 @@ class GeneratorOptions {
visibilitySourceSnippet = "package "
}

+ self.extraModuleImports = externalModuleImports
self.experimentalStripNonfunctionalCodegen = experimentalStripNonfunctionalCodegen

switch (implementationOnlyImports, useAccessLevelOnImports) {
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*
!Dockerfile
15 changes: 15 additions & 0 deletions plugins/community/sudorandom-connect-openapi/v0.25.2/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# syntax=docker/dockerfile:1.19
FROM --platform=$BUILDPLATFORM golang:1.26.0-bookworm AS build

ARG TARGETOS TARGETARCH
ENV CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH

RUN --mount=type=cache,target=/go/pkg/mod \
go install -ldflags "-s -w" -tags remote_plugin -trimpath github.com/sudorandom/protoc-gen-connect-openapi@v0.25.2 \
&& mv /go/bin/${GOOS}_${GOARCH}/protoc-gen-connect-openapi /go/bin/protoc-gen-connect-openapi || true

FROM scratch
COPY --from=build --link /etc/passwd /etc/passwd
COPY --from=build --link --chown=root:root /go/bin/protoc-gen-connect-openapi .
USER nobody
ENTRYPOINT [ "/protoc-gen-connect-openapi" ]
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
version: v1
name: buf.build/community/sudorandom-connect-openapi
plugin_version: v0.25.2
source_url: https://github.com/sudorandom/protoc-gen-connect-openapi
description: Plugin for generating OpenAPIv3 from Protobufs matching the Connect RPC interface.
spdx_license_id: MIT
license_url: https://github.com/sudorandom/protoc-gen-connect-openapi/blob/v0.25.2/LICENSE
2 changes: 2 additions & 0 deletions plugins/connectrpc/swift-mocks/v1.2.1/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*
!Dockerfile
17 changes: 17 additions & 0 deletions plugins/connectrpc/swift-mocks/v1.2.1/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# syntax=docker/dockerfile:1.19
FROM swift:6.2.3-bookworm AS build

WORKDIR /app
RUN apt-get update \
&& apt-get install -y libstdc++-12-dev
RUN git clone --depth 1 --branch 1.2.1 https://github.com/connectrpc/connect-swift
WORKDIR /app/connect-swift
RUN swift build -c release --product protoc-gen-connect-swift-mocks --static-swift-stdlib -Xlinker -s

FROM gcr.io/distroless/cc-debian12:latest@sha256:329e54034ce498f9c6b345044e8f530c6691f99e94a92446f68c0adf9baa8464 AS base

FROM scratch
COPY --link --from=base / /
COPY --link --from=build /app/connect-swift/.build/release/protoc-gen-connect-swift-mocks .
USER nobody
ENTRYPOINT [ "/protoc-gen-connect-swift-mocks" ]
32 changes: 32 additions & 0 deletions plugins/connectrpc/swift-mocks/v1.2.1/buf.plugin.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
version: v1
name: buf.build/connectrpc/swift-mocks
plugin_version: v1.2.1
source_url: https://github.com/connectrpc/connect-swift
description: Generates mocks that are compatible with Connect-Swift clients.
deps:
- plugin: buf.build/apple/swift:v1.35.0
- plugin: buf.build/connectrpc/swift:v1.2.1
output_languages:
- swift
registry:
swift:
deps:
- source: https://github.com/connectrpc/connect-swift.git
package: connect-swift
version: 1.2.1
products:
- ConnectMocks
platforms:
macos: v10_15
ios: v12
tvos: v13
watchos: v6
swift_versions:
- .v5
- .v6
opts:
- Visibility=Public
- FileNaming=PathToUnderscores
spdx_license_id: Apache-2.0
license_url: https://github.com/connectrpc/connect-swift/blob/1.2.1/LICENSE
integration_guide_url: https://connectrpc.com/docs/swift/testing
2 changes: 2 additions & 0 deletions plugins/connectrpc/swift/v1.2.1/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*
!Dockerfile
17 changes: 17 additions & 0 deletions plugins/connectrpc/swift/v1.2.1/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# syntax=docker/dockerfile:1.19
FROM swift:6.2.3-bookworm AS build

WORKDIR /app
RUN apt-get update \
&& apt-get install -y libstdc++-12-dev
RUN git clone --depth 1 --branch 1.2.1 https://github.com/connectrpc/connect-swift
WORKDIR /app/connect-swift
RUN swift build -c release --product protoc-gen-connect-swift --static-swift-stdlib -Xlinker -s

FROM gcr.io/distroless/cc-debian12:latest@sha256:329e54034ce498f9c6b345044e8f530c6691f99e94a92446f68c0adf9baa8464 AS base

FROM scratch
COPY --link --from=base / /
COPY --link --from=build /app/connect-swift/.build/release/protoc-gen-connect-swift .
USER nobody
ENTRYPOINT [ "/protoc-gen-connect-swift" ]
31 changes: 31 additions & 0 deletions plugins/connectrpc/swift/v1.2.1/buf.plugin.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
version: v1
name: buf.build/connectrpc/swift
plugin_version: v1.2.1
source_url: https://github.com/connectrpc/connect-swift
description: Idiomatic gRPC & Connect RPCs for Swift.
deps:
- plugin: buf.build/apple/swift:v1.35.0
output_languages:
- swift
registry:
swift:
deps:
- source: https://github.com/connectrpc/connect-swift.git
package: connect-swift
version: 1.2.1
products:
- Connect
platforms:
macos: v10_15
ios: v12
tvos: v13
watchos: v6
swift_versions:
- .v5
- .v6
opts:
- Visibility=Public
- FileNaming=PathToUnderscores
spdx_license_id: Apache-2.0
license_url: https://github.com/connectrpc/connect-swift/blob/1.2.1/LICENSE
integration_guide_url: https://connectrpc.com/docs/swift/getting-started
3 changes: 3 additions & 0 deletions plugins/grpc/swift-protobuf/v2.2.0/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
*
!Dockerfile
!Package.resolved
18 changes: 18 additions & 0 deletions plugins/grpc/swift-protobuf/v2.2.0/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# syntax=docker/dockerfile:1.19
FROM swift:6.2.3-bookworm AS build

RUN apt-get update \
&& apt-get install -y unzip
WORKDIR /app
RUN git clone --depth 1 --branch 2.2.0 https://github.com/grpc/grpc-swift-protobuf --recursive
WORKDIR /app/grpc-swift-protobuf
COPY --link Package.resolved .
RUN swift build -c release --static-swift-stdlib --product protoc-gen-grpc-swift-2 -Xlinker -s --force-resolved-versions

FROM gcr.io/distroless/cc-debian12:latest@sha256:329e54034ce498f9c6b345044e8f530c6691f99e94a92446f68c0adf9baa8464 AS base

FROM scratch
COPY --link --from=base / /
COPY --link --from=build /app/grpc-swift-protobuf/.build/release/protoc-gen-grpc-swift-2 .
USER nobody
ENTRYPOINT [ "/protoc-gen-grpc-swift-2" ]
33 changes: 33 additions & 0 deletions plugins/grpc/swift-protobuf/v2.2.0/Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 30 additions & 0 deletions plugins/grpc/swift-protobuf/v2.2.0/buf.plugin.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
version: v1
name: buf.build/grpc/swift-protobuf
plugin_version: v2.2.0
source_url: https://github.com/grpc/grpc-swift-protobuf
description: Generates Swift client and server stubs for the gRPC framework.
deps:
- plugin: buf.build/apple/swift:v1.35.0
output_languages:
- swift
registry:
swift:
deps:
- source: https://github.com/grpc/grpc-swift-protobuf.git
package: grpc-swift-protobuf
version: 2.2.0
products:
- GRPCProtobuf
platforms:
macos: v15
ios: v18
tvos: v18
watchos: v11
swift_versions:
- .v6
opts:
- Visibility=Public
- FileNaming=PathToUnderscores
spdx_license_id: Apache-2.0
license_url: https://github.com/grpc/grpc-swift-protobuf/blob/2.2.0/LICENSE
integration_guide_url: https://swiftpackageindex.com/grpc/grpc-swift-protobuf/2.2.0/documentation/grpcprotobuf
2 changes: 2 additions & 0 deletions plugins/grpc/swift/v1.27.2/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*
!Dockerfile
17 changes: 17 additions & 0 deletions plugins/grpc/swift/v1.27.2/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# syntax=docker/dockerfile:1.19
FROM swift:6.2.3-bookworm AS build

RUN apt-get update \
&& apt-get install -y libstdc++-12-dev
WORKDIR /app
RUN git clone --depth 1 --branch 1.27.2 https://github.com/grpc/grpc-swift --recursive
WORKDIR /app/grpc-swift
RUN swift build -c release --static-swift-stdlib --product protoc-gen-grpc-swift -Xlinker -s

FROM gcr.io/distroless/cc-debian12:latest@sha256:329e54034ce498f9c6b345044e8f530c6691f99e94a92446f68c0adf9baa8464 AS base

FROM scratch
COPY --link --from=base / /
COPY --link --from=build /app/grpc-swift/.build/release/protoc-gen-grpc-swift .
USER nobody
ENTRYPOINT [ "/protoc-gen-grpc-swift" ]
23 changes: 23 additions & 0 deletions plugins/grpc/swift/v1.27.2/buf.plugin.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
version: v1
name: buf.build/grpc/swift
plugin_version: v1.27.2
source_url: https://github.com/grpc/grpc-swift
description: Generates Swift client and server stubs for the gRPC framework.
deps:
- plugin: buf.build/apple/swift:v1.35.0
output_languages:
- swift
registry:
swift:
deps:
- source: https://github.com/grpc/grpc-swift.git
package: grpc-swift
version: 1.27.2
products:
- GRPC
opts:
- Visibility=Public
- FileNaming=PathToUnderscores
spdx_license_id: Apache-2.0
license_url: https://github.com/grpc/grpc-swift/blob/1.27.2/LICENSE
integration_guide_url: https://github.com/grpc/grpc-swift#getting-grpc-swift
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
h1:ep7eRBaCZYegnNuYt01ISHnPmoQQfYD3cOiayRryTIU=
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
h1:o+/kvnlzpyklvikaJbtQBh4B02JI/Nk5DJU5q12mlZw=
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
h1:bfGIUhYwyjEaVR7OEPgI7au+mx+AM7kC8eo+1ET+VTM=
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
h1:tXvqQAI2yeM8+7VlRR4LY5WOPVz6elhwUNQjC7wJpeM=
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
h1:IFskm5Iu3LzqVRrv3i09NlJdy7N8s00Wymd+jnu80yI=
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
h1:24C0oBcfopWOWEbwUeY4S5TimRpKlB8ESoS2UjINjm4=
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
h1:6osQB7bm0YcckpFxzK/xT2Cvj9mECNDCM+8WJxW8qI8=
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
h1:0ab7wntSWxsB1ZdQOvDzZOhtiTMzeKpUqXf2GQ7VeYw=
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
h1:t5ycbVWI4y9Z5KuSJqQ4bQPdpHrWwVbMjESFbawChEE=
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
h1:icvJdhaYuOrR7ZCJZXU4y9CqvP1LJnJ+T7nvYk7SFuo=
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
h1:klAEUf7WFX/+TSOOUy7F75AMxFT6Xb3LNOx6aL9DYn0=
Loading