Skip to content
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

Upgrade Kotlin to 1.9.21, Okio to 3.7.0 #8140

Merged
merged 4 commits into from
Dec 17, 2023
Merged

Upgrade Kotlin to 1.9.21, Okio to 3.7.0 #8140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0d23e7b
Upgrade Kotlin to 1.9.21, Okio to 3.7.0
squarejesse Dec 17, 2023
2ae45b6
Suppress Boolean.hashCode warning
squarejesse Dec 17, 2023
1f60fd6
call the right cancel
squarejesse Dec 17, 2023
a73b028
More AnimalSniffer ignores
squarejesse Dec 17, 2023
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
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
3 changes: 3 additions & 0 deletions okhttp-tls/src/main/kotlin/okhttp3/tls/internal/der/certificates.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion okhttp/src/jvmMain/kotlin/okhttp3/internal/connection/RealCall.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class RealCall(

private val timeout = object : AsyncTimeout() {
override fun timedOut() {
cancel()
this@RealCall.cancel()
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🙀

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch

}
}.apply {
timeout(client.callTimeoutMillis.toLong(), MILLISECONDS)
Expand Down
2 changes: 2 additions & 0 deletions okhttp/src/jvmMain/kotlin/okhttp3/internal/ws/WebSocketExtensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion samples/tlssurvey/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down