Skip to content

Commit

Permalink
version bumps
Browse files Browse the repository at this point in the history
  • Loading branch information
@jamesward
jamesward committed Feb 27, 2024
1 parent b11dbfd commit 54266a8
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 28 deletions.
14 changes: 7 additions & 7 deletions examples/gradle/libs.versions.toml
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
[plugins]
android-application = { id = "com.android.application", version = "8.2.2" }
android-library = { id = "com.android.library", version = "8.2.0" }
android-library = { id = "com.android.library", version = "8.2.2" }
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version = "1.9.22" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version = "1.9.21" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version = "1.9.22" }
protobuf = { id = "com.google.protobuf", version = "0.9.4" }
ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "12.1.0" }
palantir-graal = { id = "com.palantir.graal", version = "0.12.0" }
jib = { id = "com.google.cloud.tools.jib", version = "3.4.0" }

[libraries]
kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.7.3" }
grpc-protobuf = { group = "io.grpc", name = "grpc-protobuf", version = "1.60.0" }
grpc-protobuf-lite = { group = "io.grpc", name = "grpc-protobuf-lite", version = "1.60.0" }
grpc-netty = { group = "io.grpc", name = "grpc-netty", version = "1.60.0" }
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-netty = { group = "io.grpc", name = "grpc-netty", version = "1.62.2" }
grpc-okhttp = { group = "io.grpc", name = "grpc-okhttp", version = "1.61.1" }
grpc-testing = { group = "io.grpc", name = "grpc-testing", version = "1.60.0" }
grpc-stub = { group = "io.grpc", name = "grpc-stub", version = "1.60.0" }
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-kotlin-stub = { group = "io.grpc", name = "grpc-kotlin-stub", version = "1.4.1" }

protoc = { group = "com.google.protobuf", name = "protoc", version = "3.25.1" }
Expand Down
19 changes: 12 additions & 7 deletions gradle/libs.versions.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,16 @@ kotlin-power-assert = { id = "com.bnorm.power.kotlin-power-assert", version = "0
kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version = "1.7.3" }
kotlinx-coroutines-core-jvm = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core-jvm", version = "1.7.3" }
kotlinx-coroutines-debug = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-debug", version = "1.8.0" }
grpc-protobuf = { group = "io.grpc", name = "grpc-protobuf", version = "1.60.0" }
grpc-alts = { group = "io.grpc", name = "grpc-alts", version = "1.60.0" }
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.60.0" }
grpc-okhttp = { group = "io.grpc", name = "grpc-okhttp", version = "1.60.0" }
grpc-testing = { group = "io.grpc", name = "grpc-testing", version = "1.60.0" }
grpc-stub = { group = "io.grpc", name = "grpc-stub", version = "1.60.0" }
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" }
kotlinpoet = { group = "com.squareup", name = "kotlinpoet", version = "1.16.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 @@ -30,10 +33,12 @@ junit-jupiter-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engi
mockito-core = { group = "org.mockito", name = "mockito-core", version = "4.11.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" }
protoc-gen-grpc-java = { group = "io.grpc", name = "protoc-gen-grpc-java", version = "1.61.1" }
truth = { group = "com.google.truth", name = "truth", version = "1.4.1" }
truth-proto-extension = { group = "com.google.truth.extensions", name = "truth-proto-extension", version = "1.4.1" }
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.19.6" }
slf4j-simple = { group = "org.slf4j", name = "slf4j-simple", version = "2.0.12" }
gradle-test-kit = { group = "org.gradle", name = "gradle-test-kit", version = "6.1" }
gradle-tooling-api = { group = "org.gradle", name = "gradle-tooling-api", version = "8.6" }
commons-io = { group = "commons-io", name = "commons-io", version = "2.15.1" }
7 changes: 3 additions & 4 deletions integration_testing/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@ kotlin {

dependencies {
testImplementation(libs.testcontainers)
testImplementation("org.gradle:gradle-test-kit:6.1")
testImplementation("org.gradle:gradle-test-kit:6.1")
testImplementation("commons-io:commons-io:2.15.1")
testImplementation("org.gradle:gradle-tooling-api:8.6")
testImplementation(libs.gradle.test.kit)
testImplementation(libs.gradle.tooling.api)
testImplementation(libs.commons.io)
testImplementation(libs.junit.jupiter)
testRuntimeOnly(libs.junit.platform.launcher)
testRuntimeOnly(libs.slf4j.simple)
Expand Down
1 change: 1 addition & 0 deletions interop_testing/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ dependencies {
implementation(project(":stub"))

implementation(libs.grpc.protobuf)
implementation(libs.grpc.protobuf.lite)
implementation(libs.grpc.auth)
implementation(libs.grpc.alts)
implementation(libs.grpc.netty)
Expand Down
16 changes: 6 additions & 10 deletions interop_testing/src/test/java/io/grpc/stub/StubConfigTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,9 @@
import static org.junit.Assert.assertNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.same;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.*;

import io.grpc.CallOptions;
import io.grpc.Channel;
import io.grpc.ClientCall;
import io.grpc.Deadline;
import io.grpc.MethodDescriptor;
import io.grpc.internal.NoopClientCall;
import io.grpc.*;
import io.grpc.testing.integration.Messages.SimpleRequest;
import io.grpc.testing.integration.Messages.SimpleResponse;
import io.grpc.testing.integration.TestServiceGrpc;
Expand All @@ -54,13 +48,15 @@ public class StubConfigTest {
@Mock
private StreamObserver<SimpleResponse> responseObserver;

@Mock
private ClientCall<SimpleRequest, SimpleResponse> call;

/**
* Sets up mocks.
*/
@Before public void setUp() {
MockitoAnnotations.openMocks(this);
ClientCall<SimpleRequest, SimpleResponse> call =
new NoopClientCall<>();

when(channel.newCall(
ArgumentMatchers.<MethodDescriptor<SimpleRequest, SimpleResponse>>any(),
any(CallOptions.class)))
Expand Down
1 change: 1 addition & 0 deletions stub/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ dependencies {
testImplementation(libs.truth.proto.extension)
testImplementation(libs.grpc.protobuf)
testImplementation(libs.grpc.testing)
testImplementation(libs.grpc.inprocess)
}

java {
Expand Down

0 comments on commit 54266a8

Please sign in to comment.