Skip to content

Commit b215fce

Browse files
committed
Use grpc 1.23 for the moment.
1 parent e51d89e commit b215fce

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

src/sw/tools/self_builder.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ void write_build_script(const std::unordered_map<UnresolvedPackage, LocalPackage
6868
{"org.sw.demo.google.protobuf.protobuf"},
6969

7070
// goes before sw cpp driver (client)
71-
{"org.sw.demo.google.grpc.cpp.plugin"},
71+
{"org.sw.demo.google.grpc.cpp.plugin-1.23"},
7272

7373
// goes before sw cpp driver (client)
7474
{"pub.egorpugin.primitives.filesystem-master"},

sw.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#pragma sw require header pub.egorpugin.primitives.tools.embedder-master
2-
#pragma sw require header org.sw.demo.google.grpc.cpp.plugin
2+
#pragma sw require header org.sw.demo.google.grpc.cpp.plugin-1.23
33
#pragma sw require header org.sw.demo.lexxmark.winflexbison.bison-master
44
#pragma sw require header org.sw.demo.qtproject.qt.base.tools.moc-*
55

@@ -67,14 +67,14 @@ void build(Solution &s)
6767
protos.CPPVersion = CPPLanguageStandard::CPP17;
6868
protos += "src/sw/protocol/.*"_rr;
6969
protos.Public +=
70-
"org.sw.demo.google.grpc.cpp"_dep,
70+
"org.sw.demo.google.grpc.cpp-1.23"_dep,
7171
"pub.egorpugin.primitives.templates-master"_dep,
7272
"pub.egorpugin.primitives.log-master"_dep;
7373
ProtobufData d;
7474
d.public_protobuf = true;
7575
d.addIncludeDirectory(protos.SourceDir / "src");
7676
for (auto &[p, _] : protos["src/sw/protocol/.*\\.proto"_rr])
77-
gen_grpc_cpp("org.sw.demo.google.protobuf"_dep, "org.sw.demo.google.grpc.cpp.plugin"_dep, protos, p, d);
77+
gen_grpc_cpp("org.sw.demo.google.protobuf"_dep, "org.sw.demo.google.grpc.cpp.plugin-1.23"_dep, protos, p, d);
7878
}
7979

8080
auto &manager = p.addTarget<LibraryTarget>("manager");

0 commit comments

Comments
 (0)