Upgrade Kotlin to 1.9.21, Okio to 3.7.0 (#8140)

* Upgrade Kotlin to 1.9.21, Okio to 3.7.0 * Suppress Boolean.hashCode warning * call the right cancel * More AnimalSniffer ignores
square · Dec 17, 2023 · 6ba49ad · 6ba49ad
1 parent 3afe55c
commit 6ba49ad
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,14 +2,14 @@
 biz-aQute-bnd = "6.4.0"
 checkStyle = "10.12.5"
 com-squareup-moshi = "1.15.0"
-com-squareup-okio = "3.6.0"
+com-squareup-okio = "3.7.0"
 de-mannodermaus-junit5 = "1.4.0"
 graalvm = "22.3.2"
 kotlinx-serialization = "1.6.0"
 org-bouncycastle = "1.76"
 org-conscrypt = "2.5.2"
 org-jetbrains-coroutines = "1.7.3"
-org-jetbrains-kotlin = "1.9.0"
+org-jetbrains-kotlin = "1.9.21"
 org-junit-jupiter = "5.10.1"
 
 [libraries]

diff --git a/okhttp-tls/src/main/kotlin/okhttp3/tls/internal/der/certificates.kt b/okhttp-tls/src/main/kotlin/okhttp3/tls/internal/der/certificates.kt
@@ -24,6 +24,7 @@ import java.security.cert.CertificateFactory
 import java.security.cert.X509Certificate
 import okio.Buffer
 import okio.ByteString
+import org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
 
 internal data class Certificate(
   val tbsCertificate: TbsCertificate,
@@ -162,12 +163,14 @@ internal data class SubjectPublicKeyInfo(
   val subjectPublicKey: BitString
 )
 
+@IgnoreJRERequirement // As of AGP 3.4.1, D8 desugars API 24 hashCode methods.
 internal data class Extension(
   val id: String,
   val critical: Boolean,
   val value: Any?
 )
 
+@IgnoreJRERequirement // As of AGP 3.4.1, D8 desugars API 24 hashCode methods.
 internal data class BasicConstraints(
   /** True if this certificate can be used as a Certificate Authority (CA). */
   val ca: Boolean,

diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/connection/RealCall.kt b/okhttp/src/jvmMain/kotlin/okhttp3/internal/connection/RealCall.kt
@@ -71,7 +71,7 @@ class RealCall(
 
   private val timeout = object : AsyncTimeout() {
     override fun timedOut() {
-      cancel()
+      this@RealCall.cancel()
     }
   }.apply {
     timeout(client.callTimeoutMillis.toLong(), MILLISECONDS)

diff --git a/okhttp/src/jvmMain/kotlin/okhttp3/internal/ws/WebSocketExtensions.kt b/okhttp/src/jvmMain/kotlin/okhttp3/internal/ws/WebSocketExtensions.kt
@@ -19,6 +19,7 @@ import java.io.IOException
 import okhttp3.Headers
 import okhttp3.internal.delimiterOffset
 import okhttp3.internal.trimSubstring
+import org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
 
 /**
  * Models the contents of a `Sec-WebSocket-Extensions` response header. OkHttp honors one extension
@@ -56,6 +57,7 @@ import okhttp3.internal.trimSubstring
  *
  * [rfc_7692]: https://tools.ietf.org/html/rfc7692#section-7.1
  */
+@IgnoreJRERequirement // As of AGP 3.4.1, D8 desugars API 24 hashCode methods.
 data class WebSocketExtensions(
   /** True if the agreed upon extensions includes the permessage-deflate extension. */
   @JvmField val perMessageDeflate: Boolean = false,

diff --git a/samples/tlssurvey/build.gradle.kts b/samples/tlssurvey/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
   kotlin("jvm")
   application
-  id("com.google.devtools.ksp").version("1.9.0-1.0.13")
+  id("com.google.devtools.ksp").version("1.9.21-1.0.16")
 }
 
 application {