Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 19 additions & 13 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[versions]
grpc-java = "1.76.0"
protobuf-java = "4.33.0"

[plugins]
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version = "2.2.20" }
protobuf = { id = "com.google.protobuf", version = "0.9.5" }
Expand All @@ -10,16 +14,21 @@ kotlin-power-assert = { id = "com.bnorm.power.kotlin-power-assert", version = "0
[libraries]
kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.10.2" }
kotlinx-coroutines-core-jvm = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core-jvm", version = "1.10.2" }
grpc-protobuf = { group = "io.grpc", name = "grpc-protobuf", version = "1.62.2" }
grpc-protobuf-lite = { group = "io.grpc", name = "grpc-protobuf-lite", version = "1.62.2" }
grpc-alts = { group = "io.grpc", name = "grpc-alts", version = "1.62.2" }
grpc-auth = { group = "io.grpc", name = "grpc-auth", version = "1.62.2" }
grpc-netty = { group = "io.grpc", name = "grpc-netty", version = "1.62.2" }
grpc-okhttp = { group = "io.grpc", name = "grpc-okhttp", version = "1.62.2" }
grpc-testing = { group = "io.grpc", name = "grpc-testing", version = "1.62.2" }
grpc-stub = { group = "io.grpc", name = "grpc-stub", version = "1.62.2" }
grpc-inprocess = { group = "io.grpc", name = "grpc-inprocess", version = "1.62.2" }
protoc-gen-grpc-java = { group = "io.grpc", name = "protoc-gen-grpc-java", version = "1.62.2" }

grpc-protobuf = { group = "io.grpc", name = "grpc-protobuf", version.ref = "grpc-java" }
grpc-protobuf-lite = { group = "io.grpc", name = "grpc-protobuf-lite", version.ref = "grpc-java" }
grpc-alts = { group = "io.grpc", name = "grpc-alts", version.ref = "grpc-java" }
grpc-auth = { group = "io.grpc", name = "grpc-auth", version.ref = "grpc-java" }
grpc-netty = { group = "io.grpc", name = "grpc-netty", version.ref = "grpc-java" }
grpc-okhttp = { group = "io.grpc", name = "grpc-okhttp", version.ref = "grpc-java" }
grpc-testing = { group = "io.grpc", name = "grpc-testing", version.ref = "grpc-java" }
grpc-stub = { group = "io.grpc", name = "grpc-stub", version.ref = "grpc-java" }
grpc-inprocess = { group = "io.grpc", name = "grpc-inprocess", version.ref = "grpc-java" }
protoc-gen-grpc-java = { group = "io.grpc", name = "protoc-gen-grpc-java", version.ref = "grpc-java" }

protoc = { group = "com.google.protobuf", name = "protoc", version.ref = "protobuf-java" }
protobuf-java = { group = "com.google.protobuf", name = "protobuf-java", version.ref = "protobuf-java" }

kotlinpoet = { group = "com.squareup", name = "kotlinpoet", version = "2.2.0" }
junit = { group = "junit", name = "junit", version = "4.13.2" }
junit-platform-launcher = { group = "org.junit.platform", name = "junit-platform-launcher", version = "1.10.2" }
Expand All @@ -29,12 +38,9 @@ protobuf-gradle-plugin = { group = "com.google.protobuf", name = "protobuf-gradl
junit-jupiter = { group = "org.junit.jupiter", name = "junit-jupiter", version = "5.13.4" }
junit-jupiter-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version = "5.13.4" }
mockito-core = { group = "org.mockito", name = "mockito-core", version = "5.17.0" }
protoc = { group = "com.google.protobuf", name = "protoc", version = "3.25.3" }
protobuf-java = { group = "com.google.protobuf", name = "protobuf-java", version = "3.25.3" }
truth = { group = "com.google.truth", name = "truth", version = "1.4.4" }
truth-proto-extension = { group = "com.google.truth.extensions", name = "truth-proto-extension", version = "1.4.4" }
okhttp = { group = "com.squareup.okhttp", name = "okhttp", version = "2.7.5" }
javax-annotation-api = { group = "javax.annotation", name = "javax.annotation-api", version = "1.3.2" }
testcontainers = { group = "org.testcontainers", name = "testcontainers", version = "1.21.3" }
slf4j-simple = { group = "org.slf4j", name = "slf4j-simple", version = "2.0.17" }
gradle-test-kit = { group = "org.gradle", name = "gradle-test-kit", version = "6.1" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -810,7 +810,7 @@ abstract class AbstractInteropTest {
Pattern.matches("deadline exceeded after .*s. \\[.*\\]", desc!!) ||
// If server expires first, it'd reset the stream and client would generate a different
// message
desc.startsWith("ClientCall was cancelled at or after deadline.")
desc.startsWith("CallOptions deadline exceeded")
)
}
assertStatsTrace("grpc.testing.TestService/EmptyCall", Status.Code.OK)
Expand Down
2 changes: 1 addition & 1 deletion stub/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies {
api(libs.grpc.stub)

// Java
api(libs.javax.annotation.api)
api(libs.protobuf.java)

// Testing
testImplementation(libs.junit)
Expand Down