Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update SwiftProtobuf to v1.26.0 #254

Merged
merged 3 commits into from
Mar 29, 2024
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
2 changes: 1 addition & 1 deletion Connect-Swift-Mocks.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Pod::Spec.new do |spec|
spec.watchos.deployment_target = '6.0'

spec.dependency 'Connect-Swift', "#{spec.version.to_s}"
spec.dependency 'SwiftProtobuf', '~> 1.25.2'
spec.dependency 'SwiftProtobuf', '~> 1.26.0'

spec.source_files = 'Libraries/ConnectMocks/**/*.swift'

Expand Down
2 changes: 1 addition & 1 deletion Connect-Swift.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Pod::Spec.new do |spec|
spec.tvos.deployment_target = '13.0'
spec.watchos.deployment_target = '6.0'

spec.dependency 'SwiftProtobuf', '~> 1.25.2'
spec.dependency 'SwiftProtobuf', '~> 1.26.0'

spec.source_files = 'Libraries/Connect/**/*.swift'

Expand Down
8 changes: 4 additions & 4 deletions Examples/ElizaCocoaPodsApp/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PODS:
- Connect-Swift (0.12.0):
- SwiftProtobuf (~> 1.25.2)
- SwiftProtobuf (1.25.2)
- SwiftProtobuf (~> 1.26.0)
- SwiftProtobuf (1.26.0)

DEPENDENCIES:
- Connect-Swift (from `../..`)
Expand All @@ -15,8 +15,8 @@ EXTERNAL SOURCES:
:path: "../.."

SPEC CHECKSUMS:
Connect-Swift: 1de2ef4a548c59ecaeb9120812dfe0d6e07a0d47
SwiftProtobuf: 407a385e97fd206c4fbe880cc84123989167e0d1
Connect-Swift: e95a0cf0aa6b368c279e8807f054cbecbaee0e5c
SwiftProtobuf: 5e8349171e7c2f88f5b9e683cb3cb79d1dc780b3

PODFILE CHECKSUM: b598f373a6ab5add976b09c2ac79029bf2200d48

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-protobuf.git",
"state" : {
"revision" : "65e8f29b2d63c4e38e736b25c27b83e012159be8",
"version" : "1.25.2"
"revision" : "9f0c76544701845ad98716f3f6a774a892152bcb",
"version" : "1.26.0"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion Examples/buf.gen.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version: v1
plugins:
- plugin: buf.build/apple/swift:v1.25.2
- plugin: buf.build/apple/swift:v1.26.0
opt: Visibility=Internal
out: ./ElizaSharedSources/GeneratedSources
- name: connect-swift
Expand Down
2 changes: 1 addition & 1 deletion Libraries/Connect/buf.gen.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
version: v1
plugins:
- plugin: buf.build/apple/swift:v1.25.2
- plugin: buf.build/apple/swift:v1.26.0
opt: Visibility=Internal
out: ./Internal/GeneratedSources
4 changes: 2 additions & 2 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-protobuf.git",
"state" : {
"revision" : "65e8f29b2d63c4e38e736b25c27b83e012159be8",
"version" : "1.25.2"
"revision" : "9f0c76544701845ad98716f3f6a774a892152bcb",
"version" : "1.26.0"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ let package = Package(
),
.package(
url: "https://github.com/apple/swift-protobuf.git",
from: "1.25.2"
from: "1.26.0"
),
],
targets: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,15 @@ extension Connectrpc_Conformance_V1_ClientCompatRequest: SwiftProtobuf.Message,
var _cancel: Connectrpc_Conformance_V1_ClientCompatRequest.Cancel? = nil
var _rawRequest: Connectrpc_Conformance_V1_RawHTTPRequest? = nil

static let defaultInstance = _StorageClass()
#if swift(>=5.10)
// This property is used as the initial default value for new instances of the type.
// The type itself is protecting the reference to its storage via CoW semantics.
// This will force a copy to be made of this reference when the first mutation occurs;
// hence, it is safe to mark this as `nonisolated(unsafe)`.
static nonisolated(unsafe) let defaultInstance = _StorageClass()
#else
static let defaultInstance = _StorageClass()
#endif

private init() {}

Expand Down
2 changes: 1 addition & 1 deletion Tests/ConformanceClient/buf.gen.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version: v1
plugins:
- plugin: buf.build/apple/swift:v1.25.2
- plugin: buf.build/apple/swift:v1.26.0
opt: Visibility=Internal
out: ./GeneratedSources
- name: connect-swift
Expand Down
Loading