Skip to content

Commit

Permalink
Merge pull request #309 from salesforce/dependency-refresh
Browse files Browse the repository at this point in the history
Dependency refresh
  • Loading branch information
rmichela committed Apr 11, 2023
2 parents ae3f588 + 0e9eb9d commit 87f5b91
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions .java-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
11.0
2 changes: 1 addition & 1 deletion inerop/csharp/example-csharp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Google.Protobuf" Version="3.6.1" />
<PackageReference Include="Google.Protobuf" Version="3.15.0" />
<PackageReference Include="Grpc" Version="1.21.0" />
<PackageReference Include="Grpc.Tools" Version="1.21.0" PrivateAssets="All" />
</ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,13 @@

<!-- Dependency Versions -->
<reactive.streams.version>1.0.4</reactive.streams.version>
<grpc.version>1.42.1</grpc.version>
<protoc.version>3.19.1</protoc.version> <!-- Same version as grpc-proto -->
<grpc.version>1.54.0</grpc.version>
<protoc.version>3.22.2</protoc.version> <!-- Same version as grpc-proto -->
<jprotoc.version>1.2.0</jprotoc.version>

<rxjava.version>2.2.21</rxjava.version>
<reactor.version>3.4.7</reactor.version>
<rx3java.version>3.1.1</rx3java.version>
<reactor.version>3.5.4</reactor.version>
<rx3java.version>3.1.6</rx3java.version>

<!-- Test Dependency Versions -->
<grpc.contrib.version>0.8.1</grpc.contrib.version>
Expand Down

0 comments on commit 87f5b91

Please sign in to comment.