Skip to content

Commit 00a7005

Browse files
committed
WIP: generate protobufs and grpc services
Signed-off-by: Ricky Saechao <[email protected]>
1 parent c885c1c commit 00a7005

File tree

125 files changed

+24109
-11364
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+24109
-11364
lines changed

Package.resolved

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
"kind" : "remoteSourceControl",
5151
"location" : "https://github.com/grpc/grpc-swift.git",
5252
"state" : {
53-
"revision" : "8c5e99d0255c373e0330730d191a3423c57373fb",
54-
"version" : "1.24.2"
53+
"revision" : "c4d6281784f50bf2e60d3af45e83be1194056062",
54+
"version" : "2.1.2"
5555
}
5656
},
5757
{

Package.swift

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.6
1+
// swift-tools-version:5.9
22

33
// SPDX-License-Identifier: Apache-2.0
44

@@ -66,7 +66,7 @@ let exampleTargets = [
6666
let package = Package(
6767
name: "Hiero",
6868
platforms: [
69-
.macOS(.v11),
69+
.macOS(.v14),
7070
.iOS(.v13),
7171
],
7272
products: [
@@ -75,7 +75,7 @@ let package = Package(
7575
dependencies: [
7676
.package(url: "https://github.com/objecthub/swift-numberkit.git", from: "2.6.0"),
7777
.package(url: "https://github.com/thebarndog/swift-dotenv.git", from: "2.1.0"),
78-
.package(url: "https://github.com/grpc/grpc-swift.git", from: "1.24.2"),
78+
.package(url: "https://github.com/grpc/grpc-swift.git", from: "2.0.0"),
7979
.package(url: "https://github.com/apple/swift-protobuf.git", from: "1.28.2"),
8080
.package(url: "https://github.com/vsanthanam/AnyAsyncSequence.git", from: "1.0.2"),
8181
.package(url: "https://github.com/apple/swift-atomics.git", from: "1.2.0"),
@@ -85,22 +85,20 @@ let package = Package(
8585
.package(url: "https://github.com/pointfreeco/swift-snapshot-testing.git", from: "1.18.0"),
8686
.package(url: "https://github.com/vapor/vapor.git", from: "4.112.0"),
8787
.package(url: "https://github.com/attaswift/BigInt.git", from: "5.5.1"),
88-
// Currently, only used for keccak256
8988
.package(url: "https://github.com/krzyzanowskim/OpenSSL-Package.git", from: "3.3.2000"),
9089
],
9190
targets: [
9291
.target(
9392
name: "HieroProtobufs",
9493
dependencies: [
9594
.product(name: "SwiftProtobuf", package: "swift-protobuf"),
96-
.product(name: "GRPC", package: "grpc-swift"),
95+
.product(name: "GRPCCore", package: "grpc-swift"),
9796
],
9897
exclude: [
9998
"Protos",
10099
"update_protos.py",
101100
]
102101
),
103-
// weird name, but whatever, internal targets
104102
.target(
105103
name: "HieroExampleUtilities",
106104
dependencies: ["Hiero"],
@@ -114,16 +112,12 @@ let package = Package(
114112
.product(name: "SwiftASN1", package: "swift-asn1"),
115113
.product(name: "SwiftProtobuf", package: "swift-protobuf"),
116114
.product(name: "NumberKit", package: "swift-numberkit"),
117-
.product(name: "GRPC", package: "grpc-swift"),
115+
.product(name: "GRPCCore", package: "grpc-swift"),
118116
.product(name: "Atomics", package: "swift-atomics"),
119117
.product(name: "secp256k1", package: "secp256k1.swift"),
120118
.product(name: "BigInt", package: "BigInt"),
121119
.product(name: "OpenSSL", package: "OpenSSL-Package"),
122120
]
123-
// todo: find some way to enable these locally.
124-
// swiftSettings: [
125-
// .unsafeFlags(["-Xfrontend", "-warn-concurrency", "-Xfrontend", "-enable-actor-data-race-checks"])
126-
// ]
127121
),
128122
.executableTarget(
129123
name: "HieroTCK",

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ HieroProtobufs are entirely generated.
4646

4747
### Required Tooling
4848

49-
protoc
50-
protoc-gen-swift (from https://github.com/apple/swift-protobuf)
51-
protoc-gen-grpc-swift (from https://github.com/grpc/grpc-swift)
52-
task (from https://github.com/go-task/task)
53-
openSSL 3.4 (from https://openssl-library.org/source/)
49+
- protoc
50+
- protoc-gen-swift (from https://github.com/apple/swift-protobuf)
51+
- protoc-gen-grpc-swift (from https://github.com/grpc/grpc-swift)
52+
- task (from https://github.com/go-task/task)
53+
- openSSL 3.4 (from https://openssl-library.org/source/)
5454

5555
### Fetch Submodule and Generate Swift Protobufs (HieroProtobufs)
5656

0 commit comments

Comments
 (0)