Skip to content

Commit

Permalink
bump protobuf to 3.10.0
Browse files Browse the repository at this point in the history
  • Loading branch information
lperron committed Oct 11, 2019
1 parent 3a6f923 commit 73450eb
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Dependencies.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Protobuf=3.9.1
Protobuf=3.10.0
gflags=2.2.2
glog=0.4.0
Cbc=2.10.3
Expand Down
4 changes: 2 additions & 2 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ git_repository(

git_repository(
name = "com_google_protobuf",
commit = "655310c", # release v3.9.1
commit = "6d4e7fd", # release v3.10.0
remote = "https://github.com/protocolbuffers/protobuf.git",
)

git_repository(
name = "com_google_protobuf_cc",
commit = "655310c", # release v3.9.1
commit = "6d4e7fd", # release v3.10.0
remote = "https://github.com/protocolbuffers/protobuf.git",
)

Expand Down
2 changes: 1 addition & 1 deletion makefiles/Makefile.third_party.unix.mk
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ PROTOC_BINARY := $(shell $(WHICH) ${UNIX_PROTOC_BINARY})
# Tags of dependencies to checkout.
GFLAGS_TAG = 2.2.2
GLOG_TAG = 0.4.0
PROTOBUF_TAG = 3.9.1
PROTOBUF_TAG = 3.10.0
ABSL_TAG = bf29470
CBC_TAG = 2.10.3
CGL_TAG = 0.60.2
Expand Down
2 changes: 1 addition & 1 deletion makefiles/Makefile.third_party.win.mk
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ ZLIB_TAG = 1.2.11
ZLIB_ARCHIVE_TAG = 1211
GFLAGS_TAG = 2.2.2
GLOG_TAG = 0.4.0
PROTOBUF_TAG = 3.9.1
PROTOBUF_TAG = 3.10.0
ABSL_TAG = bf29470
CBC_TAG = 2.10.3
CGL_TAG = 0.60.2
Expand Down
2 changes: 1 addition & 1 deletion ortools/dotnet/Google.OrTools/Google.OrTools.csproj.in
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Google.Protobuf" Version="3.9.1"/>
<PackageReference Include="Google.Protobuf" Version="3.10.0"/>
</ItemGroup>

<!-- Need to add required runtime dependencies so Meta-Project will pull runtime Nuget(s) -->
Expand Down

0 comments on commit 73450eb

Please sign in to comment.