Skip to content

Commit

Permalink
Update references to connect-swift (#2456)
Browse files Browse the repository at this point in the history
- Update `swiftversion` example 
- Update `bufpluginconfig` test for `connect-swift`
  • Loading branch information
smallsamantha authored Sep 18, 2023
1 parent f0e67d3 commit 10ad623
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 27 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func NewCommand(
return &appcmd.Command{
Use: name + " --module=<buf.build/owner/repository[:ref]> --plugin=<buf.build/owner/plugin[:version]>",
Short: bufcli.PackageVersionShortDescription(registryName),
Long: bufcli.PackageVersionLongDescription(registryName, name, "buf.build/bufbuild/connect-swift"),
Long: bufcli.PackageVersionLongDescription(registryName, name, "buf.build/connectrpc/swift"),
Args: cobra.NoArgs,
Run: builder.NewRunFunc(
func(ctx context.Context, container appflag.Container) error {
Expand Down
25 changes: 12 additions & 13 deletions private/bufpkg/bufplugin/bufpluginconfig/bufpluginconfig_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -257,40 +257,39 @@ func TestParsePluginConfigSwiftYAML(t *testing.T) {
t.Parallel()
pluginConfig, err := ParseConfig(filepath.Join("testdata", "success", "swift", "buf.plugin.yaml"))
require.NoError(t, err)
pluginIdentity, err := bufpluginref.PluginIdentityForString("buf.build/bufbuild/connect-swift")
pluginIdentity, err := bufpluginref.PluginIdentityForString("buf.build/connectrpc/swift")
require.NoError(t, err)
pluginDep, err := bufpluginref.PluginReferenceForString("buf.build/apple/swift:v1.21.0", 0)
pluginDep, err := bufpluginref.PluginReferenceForString("buf.build/apple/swift:v1.23.0", 0)
require.NoError(t, err)
require.Equal(
t,
&Config{
Name: pluginIdentity,
PluginVersion: "v0.5.0",
SourceURL: "https://github.com/bufbuild/connect-swift",
PluginVersion: "v0.8.0",
SourceURL: "https://github.com/connectrpc/connect-swift",
Description: "Idiomatic gRPC & Connect RPCs for Swift.",
Dependencies: []bufpluginref.PluginReference{pluginDep},
OutputLanguages: []string{"swift"},
Registry: &RegistryConfig{
Swift: &SwiftRegistryConfig{
Dependencies: []SwiftRegistryDependencyConfig{
{
Source: "https://github.com/apple/swift-protobuf.git",
Package: "swift-protobuf",
Version: "1.21.0",
Products: []string{"SwiftProtobuf"},
Source: "https://github.com/connectrpc/connect-swift.git",
Package: "connect-swift",
Version: "0.8.0",
Products: []string{"Connect"},
SwiftVersions: []string{".v5"},
Platforms: SwiftRegistryDependencyPlatformConfig{
MacOS: "v10_15",
IOS: "v10_15",
TVOS: "v10_15",
WatchOS: "v10_15",
MacOS: "v10_15",
IOS: "v12",
TVOS: "v13",
},
},
},
},
},
SPDXLicenseID: "Apache-2.0",
LicenseURL: "https://github.com/bufbuild/connect-swift/blob/0.5.0/LICENSE",
LicenseURL: "https://github.com/connectrpc/connect-swift/blob/0.8.0/LICENSE",
},
pluginConfig,
)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
version: v1
name: buf.build/bufbuild/connect-swift
plugin_version: v0.5.0
source_url: https://github.com/bufbuild/connect-swift
name: buf.build/connectrpc/swift
plugin_version: v0.8.0
source_url: https://github.com/connectrpc/connect-swift
description: Idiomatic gRPC & Connect RPCs for Swift.
deps:
- plugin: buf.build/apple/swift:v1.21.0
- plugin: buf.build/apple/swift:v1.23.0
output_languages:
- swift
registry:
swift:
deps:
- source: https://github.com/apple/swift-protobuf.git
package: swift-protobuf
products: [SwiftProtobuf]
version: 1.21.0
swift_versions: [".v5"]
- source: https://github.com/connectrpc/connect-swift.git
package: connect-swift
products: [ Connect ]
swift_versions: [ ".v5" ]
version: 0.8.0
platforms:
macos: v10_15
ios: v10_15
tvos: v10_15
watchos: v10_15
ios: v12
tvos: v13
spdx_license_id: Apache-2.0
license_url: https://github.com/bufbuild/connect-swift/blob/0.5.0/LICENSE
license_url: https://github.com/connectrpc/connect-swift/blob/0.8.0/LICENSE

0 comments on commit 10ad623

Please sign in to comment.