Skip to content

List the com.google.protobuf protos version in BuildInfo #1330

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.

Sign up for GitHub

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

Merged
raboof merged 3 commits into from
Apr 29, 2021
Merged

List the com.google.protobuf protos version in BuildInfo #1330

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c2ae61
List the com.google.protobuf protos version in BuildInfo
ennru Apr 29, 2021
a162375
Rename and use
ennru Apr 29, 2021
d22caa5
Use it more
ennru Apr 29, 2021
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
1 change: 1 addition & 0 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ lazy val codegen = Project(id = akkaGrpcCodegenId, base = file("codegen"))
buildInfoKeys += "akkaVersion" → Dependencies.Versions.akka,
buildInfoKeys += "akkaHttpVersion" → Dependencies.Versions.akkaHttp,
buildInfoKeys += "grpcVersion" → Dependencies.Versions.grpc,
buildInfoKeys += "googleProtobufVersion" → Dependencies.Versions.googleProtobuf,
buildInfoPackage := "akka.grpc.gen",
artifact in (Compile, assembly) := {
val art = (artifact in (Compile, assembly)).value
Expand Down
4 changes: 3 additions & 1 deletion project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ object Dependencies {
val akkaHttpBinary = "10.2"

val grpc = "1.37.0" // checked synced by GrpcVersionSyncCheckPlugin
// Even referenced explicitly in the sbt-plugin's sbt-tests
val googleProtobuf = "3.15.8"

val scalaTest = "3.1.4"

Expand Down Expand Up @@ -73,7 +75,7 @@ object Dependencies {
}

object Protobuf {
val googleCommonProtos = "com.google.protobuf" % "protobuf-java" % "3.15.8" % "protobuf"
val googleCommonProtos = "com.google.protobuf" % "protobuf-java" % Versions.googleProtobuf % "protobuf"
}

object Plugins {
Expand Down
2 changes: 1 addition & 1 deletion sbt-plugin/src/sbt-test/gen-java/01-gen-basic-java/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ javacOptions += "-Xdoclint:all"

akkaGrpcGeneratedLanguages := Seq(AkkaGrpc.Java)

libraryDependencies += "com.google.protobuf" % "protobuf-java" % "3.15.8" % "protobuf"
libraryDependencies += "com.google.protobuf" % "protobuf-java" % akka.grpc.gen.BuildInfo.googleProtobufVersion % "protobuf"
Comment thread
ennru marked this conversation as resolved.