version bumps and related fixes

Author: jamesward

build.gradle.kts

@@ -3,7 +3,7 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.6.21" apply false
+    kotlin("jvm") version "1.9.10" apply false
     id("com.google.protobuf") version "0.9.4" apply false
     id("org.gradle.test-retry") version "1.5.5"
     id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
@@ -12,9 +12,9 @@ plugins {
 group = "io.grpc"
 version = "1.3.1" // CURRENT_GRPC_KOTLIN_VERSION
 
-ext["grpcVersion"] = "1.46.0"
-ext["protobufVersion"] = "3.20.1"
-ext["coroutinesVersion"] = "1.6.2"
+ext["grpcVersion"] = "1.57.2"
+ext["protobufVersion"] = "3.24.1"
+ext["coroutinesVersion"] = "1.7.3"
 
 subprojects {
 
@@ -134,11 +134,7 @@ subprojects {
     }
 }
 
-nexusPublishing {
-    repositories {
-        sonatype {
-            username.set(System.getenv("SONATYPE_USERNAME"))
-            password.set(System.getenv("SONATYPE_PASSWORD"))
-        }
-    }
+nexusPublishing.repositories.sonatype {
+    username.set(System.getenv("SONATYPE_USERNAME"))
+    password.set(System.getenv("SONATYPE_PASSWORD"))
 }

compiler/build.gradle.kts

@@ -18,7 +18,7 @@ dependencies {
 
     // Misc
     implementation(kotlin("reflect"))
-    implementation("com.squareup:kotlinpoet:1.11.0")
+    implementation("com.squareup:kotlinpoet:1.14.2")
     implementation("com.google.truth:truth:1.1.3")
 
     // Testing

compiler/src/test/java/io/grpc/kotlin/generator/protoc/DeclarationsTest.kt

@@ -58,11 +58,10 @@ class DeclarationsTest {
       package com.foo.bar
 
       import kotlin.Int
-      import kotlin.Unit
 
       public val someProperty: Int
 
-      public fun someFunction(): Unit {
+      public fun someFunction() {
       }
       """.trimIndent()
     )
@@ -111,10 +110,8 @@ class DeclarationsTest {
       """
       package com.foo.bar
 
-      import kotlin.Unit
-
       public object SomeObject {
-        public fun someFunction(): Unit {
+        public fun someFunction() {
         }
       }
       """.trimIndent()
@@ -172,9 +169,7 @@ class DeclarationsTest {
     assertThat(decls)
       .generatesTopLevel(
         """
-        import kotlin.Unit
-
-        public fun someFunction(): Unit {
+        public fun someFunction() {
         }
         """
       )

compiler/src/test/java/io/grpc/kotlin/generator/protoc/GeneratorConfigTest.kt

@@ -61,9 +61,7 @@ class GeneratorConfigTest {
         """
         package com.google
 
-        import kotlin.Unit
-
-        public fun fooBar(): Unit {
+        public fun fooBar() {
         }
         """.trimIndent()
       )
@@ -77,9 +75,7 @@ class GeneratorConfigTest {
         """
         package com.google
 
-        import kotlin.Unit
-
-        public inline fun fooBar(): Unit {
+        public inline fun fooBar() {
         }
         """.trimIndent()
       )

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,6 +198,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in
@@ -205,6 +214,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

gradlew.bat

@@ -61,8 +61,8 @@ import io.grpc.testing.integration.Messages.StreamingInputCallRequest
 import io.grpc.testing.integration.Messages.StreamingInputCallResponse
 import io.grpc.testing.integration.Messages.StreamingOutputCallRequest
 import io.grpc.testing.integration.Messages.StreamingOutputCallResponse
-import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.FlowPreview
 import kotlinx.coroutines.channels.toList
@@ -952,7 +952,7 @@ abstract class AbstractInteropTest {
       } catch (ex: StatusException) {
         assertEquals(Status.Code.DEADLINE_EXCEEDED, ex.status.code)
         assertThat(ex.status.description)
-          .startsWith("ClientCall started after deadline exceeded")
+          .startsWith("ClientCall started after CallOptions deadline was exceeded")
       }
       // warm up the channel
       stub.emptyCall(EmptyProtos.Empty.getDefaultInstance())
@@ -964,7 +964,7 @@ abstract class AbstractInteropTest {
       } catch (ex: StatusException) {
         assertEquals(Status.Code.DEADLINE_EXCEEDED, ex.status.code)
         assertThat(ex.status.description)
-          .startsWith("ClientCall started after deadline exceeded")
+          .startsWith("ClientCall started after CallOptions deadline was exceeded")
       }
       assertStatsTrace("grpc.testing.TestService/EmptyCall", Status.Code.OK)
     }
@@ -974,6 +974,7 @@ abstract class AbstractInteropTest {
     return 10485760
   }
 
+  @OptIn(DelicateCoroutinesApi::class)
   @Test
   fun gracefulShutdown() {
     runBlocking {

interop_testing/src/main/java/io/grpc/testing/integration/AbstractInteropTest.kt

@@ -37,6 +37,9 @@
 import io.netty.handler.ssl.SupportedCipherSuiteFilter;
 import java.io.IOException;
 import java.net.InetSocketAddress;
+import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
+import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLPeerUnverifiedException;
 import com.squareup.okhttp.ConnectionSpec;
 
@@ -74,12 +77,13 @@ protected ServerBuilder<?> getServerBuilder() {
       SslContextBuilder contextBuilder = SslContextBuilder
           .forServer(TestUtils.loadCert("server1.pem"), TestUtils.loadCert("server1.key"));
       GrpcSslContexts.configure(contextBuilder, sslProvider);
-      contextBuilder.ciphers(TestUtils.preferredTestCiphers(), SupportedCipherSuiteFilter.INSTANCE);
+      Iterable<String> ciphers = Arrays.asList(SSLContext.getDefault().getDefaultSSLParameters().getCipherSuites());
+      contextBuilder.ciphers(ciphers, SupportedCipherSuiteFilter.INSTANCE);
       return NettyServerBuilder.forPort(0)
           .flowControlWindow(65 * 1024)
           .maxInboundMessageSize(AbstractInteropTest.MAX_MESSAGE_SIZE)
           .sslContext(contextBuilder.build());
-    } catch (IOException ex) {
+    } catch (IOException | NoSuchAlgorithmException ex) {
       throw new RuntimeException(ex);
     }
   }