Adopt Kotlin's binary compatibility validator (#7112)

build.gradle.kts

@@ -1,6 +1,7 @@
 import com.vanniktech.maven.publish.MavenPublishBaseExtension
 import com.vanniktech.maven.publish.SonatypeHost
 import java.net.URL
+import kotlinx.validation.ApiValidationExtension
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.jetbrains.dokka.gradle.DokkaTask
 import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
@@ -21,6 +22,7 @@ buildscript {
     classpath(libs.gradlePlugin.errorprone)
     classpath(libs.gradlePlugin.spotless)
     classpath(libs.gradlePlugin.mavenPublish)
+    classpath(libs.gradlePlugin.binaryCompatibilityValidator)
   }
 
   repositories {
@@ -233,6 +235,18 @@ subprojects {
       }
     }
   }
+
+  plugins.withId("binary-compatibility-validator") {
+    configure<ApiValidationExtension> {
+      ignoredPackages += "okhttp3.logging.internal"
+      ignoredPackages += "mockwebserver3.internal"
+      ignoredPackages += "okhttp3.internal"
+      ignoredPackages += "mockwebserver3.junit5.internal"
+      ignoredPackages += "okhttp3.brotli.internal"
+      ignoredPackages += "okhttp3.sse.internal"
+      ignoredPackages += "okhttp3.tls.internal"
+    }
+  }
 }
 
 tasks.wrapper {

gradle/libs.versions.toml

@@ -33,6 +33,7 @@ findbugs-jsr305 = "com.google.code.findbugs:jsr305:3.0.2"
 gradlePlugin-android = "com.android.tools.build:gradle:7.1.2"
 gradlePlugin-androidJunit5 = "de.mannodermaus.gradle.plugins:android-junit5:1.8.2.0"
 gradlePlugin-animalsniffer = "ru.vyarus:gradle-animalsniffer-plugin:1.5.4"
+gradlePlugin-binaryCompatibilityValidator = "org.jetbrains.kotlinx.binary-compatibility-validator:org.jetbrains.kotlinx.binary-compatibility-validator.gradle.plugin:0.8.0"
 gradlePlugin-bnd = { module = "biz.aQute.bnd:biz.aQute.bnd.gradle", version.ref = "biz-aQute-bnd" }
 gradlePlugin-dokka = "org.jetbrains.dokka:dokka-gradle-plugin:1.6.10"
 gradlePlugin-errorprone = "net.ltgt.gradle:gradle-errorprone-plugin:2.0.2"

mockwebserver-deprecated/api/mockwebserver.api

@@ -0,0 +1,178 @@
+public abstract class okhttp3/mockwebserver/Dispatcher {
+	public fun <init> ()V
+	public abstract fun dispatch (Lokhttp3/mockwebserver/RecordedRequest;)Lokhttp3/mockwebserver/MockResponse;
+	public fun peek ()Lokhttp3/mockwebserver/MockResponse;
+	public fun shutdown ()V
+}
+
+public final class okhttp3/mockwebserver/MockResponse : java/lang/Cloneable {
+	public static final field Companion Lokhttp3/mockwebserver/MockResponse$Companion;
+	public final fun -deprecated_getHeaders ()Lokhttp3/Headers;
+	public final fun -deprecated_getHttp2ErrorCode ()I
+	public final fun -deprecated_getSocketPolicy ()Lokhttp3/mockwebserver/SocketPolicy;
+	public final fun -deprecated_getStatus ()Ljava/lang/String;
+	public final fun -deprecated_getTrailers ()Lokhttp3/Headers;
+	public fun <init> ()V
+	public final fun addHeader (Ljava/lang/String;)Lokhttp3/mockwebserver/MockResponse;
+	public final fun addHeader (Ljava/lang/String;Ljava/lang/Object;)Lokhttp3/mockwebserver/MockResponse;
+	public final fun addHeaderLenient (Ljava/lang/String;Ljava/lang/Object;)Lokhttp3/mockwebserver/MockResponse;
+	public final fun clearHeaders ()Lokhttp3/mockwebserver/MockResponse;
+	public synthetic fun clone ()Ljava/lang/Object;
+	public fun clone ()Lokhttp3/mockwebserver/MockResponse;
+	public final fun getBody ()Lokio/Buffer;
+	public final fun getBodyDelay (Ljava/util/concurrent/TimeUnit;)J
+	public final fun getHeaders ()Lokhttp3/Headers;
+	public final fun getHeadersDelay (Ljava/util/concurrent/TimeUnit;)J
+	public final fun getHttp2ErrorCode ()I
+	public final fun getPushPromises ()Ljava/util/List;
+	public final fun getSettings ()Lokhttp3/internal/http2/Settings;
+	public final fun getSocketPolicy ()Lokhttp3/mockwebserver/SocketPolicy;
+	public final fun getStatus ()Ljava/lang/String;
+	public final fun getThrottleBytesPerPeriod ()J
+	public final fun getThrottlePeriod (Ljava/util/concurrent/TimeUnit;)J
+	public final fun getTrailers ()Lokhttp3/Headers;
+	public final fun getWebSocketListener ()Lokhttp3/WebSocketListener;
+	public final fun headers (Lokhttp3/Headers;)V
+	public final fun http2ErrorCode (I)V
+	public final fun removeHeader (Ljava/lang/String;)Lokhttp3/mockwebserver/MockResponse;
+	public final fun setBody (Ljava/lang/String;)Lokhttp3/mockwebserver/MockResponse;
+	public final fun setBody (Lokio/Buffer;)Lokhttp3/mockwebserver/MockResponse;
+	public final fun setBodyDelay (JLjava/util/concurrent/TimeUnit;)Lokhttp3/mockwebserver/MockResponse;
+	public final fun setChunkedBody (Ljava/lang/String;I)Lokhttp3/mockwebserver/MockResponse;
+	public final fun setChunkedBody (Lokio/Buffer;I)Lokhttp3/mockwebserver/MockResponse;
+	public final fun setHeader (Ljava/lang/String;Ljava/lang/Object;)Lokhttp3/mockwebserver/MockResponse;
+	public final fun setHeaders (Lokhttp3/Headers;)Lokhttp3/mockwebserver/MockResponse;
+	public final fun setHeadersDelay (JLjava/util/concurrent/TimeUnit;)Lokhttp3/mockwebserver/MockResponse;
+	public final fun setHttp2ErrorCode (I)Lokhttp3/mockwebserver/MockResponse;
+	public final fun setResponseCode (I)Lokhttp3/mockwebserver/MockResponse;
+	public final fun setSocketPolicy (Lokhttp3/mockwebserver/SocketPolicy;)Lokhttp3/mockwebserver/MockResponse;
+	public final fun setStatus (Ljava/lang/String;)Lokhttp3/mockwebserver/MockResponse;
+	public final fun setTrailers (Lokhttp3/Headers;)Lokhttp3/mockwebserver/MockResponse;
+	public final fun socketPolicy (Lokhttp3/mockwebserver/SocketPolicy;)V
+	public final fun status (Ljava/lang/String;)V
+	public final fun throttleBody (JJLjava/util/concurrent/TimeUnit;)Lokhttp3/mockwebserver/MockResponse;
+	public fun toString ()Ljava/lang/String;
+	public final fun trailers (Lokhttp3/Headers;)V
+	public final fun withPush (Lokhttp3/mockwebserver/PushPromise;)Lokhttp3/mockwebserver/MockResponse;
+	public final fun withSettings (Lokhttp3/internal/http2/Settings;)Lokhttp3/mockwebserver/MockResponse;
+	public final fun withWebSocketUpgrade (Lokhttp3/WebSocketListener;)Lokhttp3/mockwebserver/MockResponse;
+}
+
+public final class okhttp3/mockwebserver/MockResponse$Companion {
+}
+
+public final class okhttp3/mockwebserver/MockWebServer : org/junit/rules/ExternalResource, java/io/Closeable {
+	public static final field Companion Lokhttp3/mockwebserver/MockWebServer$Companion;
+	public final fun -deprecated_bodyLimit (J)V
+	public final fun -deprecated_port ()I
+	public final fun -deprecated_protocolNegotiationEnabled (Z)V
+	public final fun -deprecated_protocols ()Ljava/util/List;
+	public final fun -deprecated_protocols (Ljava/util/List;)V
+	public final fun -deprecated_requestCount ()I
+	public final fun -deprecated_serverSocketFactory (Ljavax/net/ServerSocketFactory;)V
+	public fun <init> ()V
+	public fun close ()V
+	public final fun enqueue (Lokhttp3/mockwebserver/MockResponse;)V
+	public final fun getBodyLimit ()J
+	public static fun getBodyLimit$delegate (Lokhttp3/mockwebserver/MockWebServer;)Ljava/lang/Object;
+	public final fun getDelegate ()Lmockwebserver3/MockWebServer;
+	public final fun getDispatcher ()Lokhttp3/mockwebserver/Dispatcher;
+	public final fun getHostName ()Ljava/lang/String;
+	public final fun getPort ()I
+	public final fun getProtocolNegotiationEnabled ()Z
+	public static fun getProtocolNegotiationEnabled$delegate (Lokhttp3/mockwebserver/MockWebServer;)Ljava/lang/Object;
+	public final fun getRequestCount ()I
+	public static fun getRequestCount$delegate (Lokhttp3/mockwebserver/MockWebServer;)Ljava/lang/Object;
+	public final fun getServerSocketFactory ()Ljavax/net/ServerSocketFactory;
+	public static fun getServerSocketFactory$delegate (Lokhttp3/mockwebserver/MockWebServer;)Ljava/lang/Object;
+	public final fun noClientAuth ()V
+	public final fun protocols ()Ljava/util/List;
+	public final fun requestClientAuth ()V
+	public final fun requireClientAuth ()V
+	public final fun setBodyLimit (J)V
+	public final fun setDispatcher (Lokhttp3/mockwebserver/Dispatcher;)V
+	public final fun setProtocolNegotiationEnabled (Z)V
+	public final fun setProtocols (Ljava/util/List;)V
+	public final fun setServerSocketFactory (Ljavax/net/ServerSocketFactory;)V
+	public final fun shutdown ()V
+	public final fun start ()V
+	public final fun start (I)V
+	public final fun start (Ljava/net/InetAddress;I)V
+	public static synthetic fun start$default (Lokhttp3/mockwebserver/MockWebServer;IILjava/lang/Object;)V
+	public final fun takeRequest ()Lokhttp3/mockwebserver/RecordedRequest;
+	public final fun takeRequest (JLjava/util/concurrent/TimeUnit;)Lokhttp3/mockwebserver/RecordedRequest;
+	public final fun toProxyAddress ()Ljava/net/Proxy;
+	public fun toString ()Ljava/lang/String;
+	public final fun url (Ljava/lang/String;)Lokhttp3/HttpUrl;
+	public final fun useHttps (Ljavax/net/ssl/SSLSocketFactory;Z)V
+}
+
+public final class okhttp3/mockwebserver/MockWebServer$Companion {
+}
+
+public final class okhttp3/mockwebserver/PushPromise {
+	public final fun -deprecated_headers ()Lokhttp3/Headers;
+	public final fun -deprecated_method ()Ljava/lang/String;
+	public final fun -deprecated_path ()Ljava/lang/String;
+	public final fun -deprecated_response ()Lokhttp3/mockwebserver/MockResponse;
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;Lokhttp3/Headers;Lokhttp3/mockwebserver/MockResponse;)V
+	public final fun headers ()Lokhttp3/Headers;
+	public final fun method ()Ljava/lang/String;
+	public final fun path ()Ljava/lang/String;
+	public final fun response ()Lokhttp3/mockwebserver/MockResponse;
+}
+
+public final class okhttp3/mockwebserver/QueueDispatcher : okhttp3/mockwebserver/Dispatcher {
+	public fun <init> ()V
+	public fun dispatch (Lokhttp3/mockwebserver/RecordedRequest;)Lokhttp3/mockwebserver/MockResponse;
+	public final fun enqueueResponse (Lokhttp3/mockwebserver/MockResponse;)V
+	public fun peek ()Lokhttp3/mockwebserver/MockResponse;
+	public final fun setFailFast (Lokhttp3/mockwebserver/MockResponse;)V
+	public final fun setFailFast (Z)V
+	public fun shutdown ()V
+}
+
+public final class okhttp3/mockwebserver/RecordedRequest {
+	public final fun -deprecated_utf8Body ()Ljava/lang/String;
+	public fun <init> (Ljava/lang/String;Lokhttp3/Headers;Ljava/util/List;JLokio/Buffer;ILjava/net/Socket;)V
+	public fun <init> (Ljava/lang/String;Lokhttp3/Headers;Ljava/util/List;JLokio/Buffer;ILjava/net/Socket;Ljava/io/IOException;)V
+	public synthetic fun <init> (Ljava/lang/String;Lokhttp3/Headers;Ljava/util/List;JLokio/Buffer;ILjava/net/Socket;Ljava/io/IOException;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun getBody ()Lokio/Buffer;
+	public final fun getBodySize ()J
+	public final fun getChunkSizes ()Ljava/util/List;
+	public final fun getFailure ()Ljava/io/IOException;
+	public final fun getHandshake ()Lokhttp3/Handshake;
+	public final fun getHeader (Ljava/lang/String;)Ljava/lang/String;
+	public final fun getHeaders ()Lokhttp3/Headers;
+	public final fun getMethod ()Ljava/lang/String;
+	public final fun getPath ()Ljava/lang/String;
+	public final fun getRequestLine ()Ljava/lang/String;
+	public final fun getRequestUrl ()Lokhttp3/HttpUrl;
+	public final fun getSequenceNumber ()I
+	public final fun getTlsVersion ()Lokhttp3/TlsVersion;
+	public final fun getUtf8Body ()Ljava/lang/String;
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class okhttp3/mockwebserver/SocketPolicy : java/lang/Enum {
+	public static final field CONTINUE_ALWAYS Lokhttp3/mockwebserver/SocketPolicy;
+	public static final field DISCONNECT_AFTER_REQUEST Lokhttp3/mockwebserver/SocketPolicy;
+	public static final field DISCONNECT_AT_END Lokhttp3/mockwebserver/SocketPolicy;
+	public static final field DISCONNECT_AT_START Lokhttp3/mockwebserver/SocketPolicy;
+	public static final field DISCONNECT_DURING_REQUEST_BODY Lokhttp3/mockwebserver/SocketPolicy;
+	public static final field DISCONNECT_DURING_RESPONSE_BODY Lokhttp3/mockwebserver/SocketPolicy;
+	public static final field DO_NOT_READ_REQUEST_BODY Lokhttp3/mockwebserver/SocketPolicy;
+	public static final field EXPECT_CONTINUE Lokhttp3/mockwebserver/SocketPolicy;
+	public static final field FAIL_HANDSHAKE Lokhttp3/mockwebserver/SocketPolicy;
+	public static final field KEEP_OPEN Lokhttp3/mockwebserver/SocketPolicy;
+	public static final field NO_RESPONSE Lokhttp3/mockwebserver/SocketPolicy;
+	public static final field RESET_STREAM_AT_START Lokhttp3/mockwebserver/SocketPolicy;
+	public static final field SHUTDOWN_INPUT_AT_END Lokhttp3/mockwebserver/SocketPolicy;
+	public static final field SHUTDOWN_OUTPUT_AT_END Lokhttp3/mockwebserver/SocketPolicy;
+	public static final field SHUTDOWN_SERVER_AFTER_RESPONSE Lokhttp3/mockwebserver/SocketPolicy;
+	public static final field STALL_SOCKET_AT_START Lokhttp3/mockwebserver/SocketPolicy;
+	public static final field UPGRADE_TO_SSL_AT_END Lokhttp3/mockwebserver/SocketPolicy;
+	public static fun valueOf (Ljava/lang/String;)Lokhttp3/mockwebserver/SocketPolicy;
+	public static fun values ()[Lokhttp3/mockwebserver/SocketPolicy;
+}
+

mockwebserver-deprecated/build.gradle.kts

@@ -7,6 +7,7 @@ plugins {
   kotlin("jvm")
   id("org.jetbrains.dokka")
   id("com.vanniktech.maven.publish.base")
+  id("binary-compatibility-validator")
   id("me.champeau.gradle.japicmp")
 }
 

mockwebserver-junit4/api/mockwebserver3-junit4.api

@@ -0,0 +1,9 @@
+public final class mockwebserver3/junit4/MockWebServerRule : org/junit/rules/ExternalResource {
+	public static final field Companion Lmockwebserver3/junit4/MockWebServerRule$Companion;
+	public fun <init> ()V
+	public final fun getServer ()Lmockwebserver3/MockWebServer;
+}
+
+public final class mockwebserver3/junit4/MockWebServerRule$Companion {
+}
+

mockwebserver-junit4/build.gradle.kts

@@ -5,6 +5,7 @@ plugins {
   kotlin("jvm")
   id("org.jetbrains.dokka")
   id("com.vanniktech.maven.publish.base")
+  id("binary-compatibility-validator")
 }
 
 tasks.jar {

mockwebserver-junit5/build.gradle.kts

@@ -5,6 +5,7 @@ plugins {
   kotlin("jvm")
   id("org.jetbrains.dokka")
   id("com.vanniktech.maven.publish.base")
+  id("binary-compatibility-validator")
 }
 
 tasks {

mockwebserver/api/mockwebserver3.api

@@ -0,0 +1,185 @@
+public abstract class mockwebserver3/Dispatcher {
+	public fun <init> ()V
+	public abstract fun dispatch (Lmockwebserver3/RecordedRequest;)Lmockwebserver3/MockResponse;
+	public fun peek ()Lmockwebserver3/MockResponse;
+	public fun shutdown ()V
+}
+
+public final class mockwebserver3/MockResponse : java/lang/Cloneable {
+	public static final field Companion Lmockwebserver3/MockResponse$Companion;
+	public final fun -deprecated_getHeaders ()Lokhttp3/Headers;
+	public final fun -deprecated_getHttp2ErrorCode ()I
+	public final fun -deprecated_getSocketPolicy ()Lmockwebserver3/SocketPolicy;
+	public final fun -deprecated_getStatus ()Ljava/lang/String;
+	public final fun -deprecated_getTrailers ()Lokhttp3/Headers;
+	public fun <init> ()V
+	public final fun addHeader (Ljava/lang/String;)Lmockwebserver3/MockResponse;
+	public final fun addHeader (Ljava/lang/String;Ljava/lang/Object;)Lmockwebserver3/MockResponse;
+	public final fun addHeaderLenient (Ljava/lang/String;Ljava/lang/Object;)Lmockwebserver3/MockResponse;
+	public final fun clearHeaders ()Lmockwebserver3/MockResponse;
+	public synthetic fun clone ()Ljava/lang/Object;
+	public fun clone ()Lmockwebserver3/MockResponse;
+	public final fun getBody ()Lokio/Buffer;
+	public final fun getBodyDelay (Ljava/util/concurrent/TimeUnit;)J
+	public final fun getDuplexResponseBody ()Lmockwebserver3/internal/duplex/DuplexResponseBody;
+	public final fun getHeaders ()Lokhttp3/Headers;
+	public final fun getHeadersDelay (Ljava/util/concurrent/TimeUnit;)J
+	public final fun getHttp2ErrorCode ()I
+	public final fun getPushPromises ()Ljava/util/List;
+	public final fun getSettings ()Lokhttp3/internal/http2/Settings;
+	public final fun getSocketPolicy ()Lmockwebserver3/SocketPolicy;
+	public final fun getStatus ()Ljava/lang/String;
+	public final fun getThrottleBytesPerPeriod ()J
+	public final fun getThrottlePeriod (Ljava/util/concurrent/TimeUnit;)J
+	public final fun getTrailers ()Lokhttp3/Headers;
+	public final fun getWebSocketListener ()Lokhttp3/WebSocketListener;
+	public final fun headers (Lokhttp3/Headers;)V
+	public final fun http2ErrorCode (I)V
+	public final fun isDuplex ()Z
+	public final fun removeHeader (Ljava/lang/String;)Lmockwebserver3/MockResponse;
+	public final fun setBody (Ljava/lang/String;)Lmockwebserver3/MockResponse;
+	public final fun setBody (Lmockwebserver3/internal/duplex/DuplexResponseBody;)Lmockwebserver3/MockResponse;
+	public final fun setBody (Lokio/Buffer;)Lmockwebserver3/MockResponse;
+	public final fun setBodyDelay (JLjava/util/concurrent/TimeUnit;)Lmockwebserver3/MockResponse;
+	public final fun setChunkedBody (Ljava/lang/String;I)Lmockwebserver3/MockResponse;
+	public final fun setChunkedBody (Lokio/Buffer;I)Lmockwebserver3/MockResponse;
+	public final fun setHeader (Ljava/lang/String;Ljava/lang/Object;)Lmockwebserver3/MockResponse;
+	public final fun setHeaders (Lokhttp3/Headers;)Lmockwebserver3/MockResponse;
+	public final fun setHeadersDelay (JLjava/util/concurrent/TimeUnit;)Lmockwebserver3/MockResponse;
+	public final fun setHttp2ErrorCode (I)Lmockwebserver3/MockResponse;
+	public final fun setResponseCode (I)Lmockwebserver3/MockResponse;
+	public final fun setSocketPolicy (Lmockwebserver3/SocketPolicy;)Lmockwebserver3/MockResponse;
+	public final fun setStatus (Ljava/lang/String;)Lmockwebserver3/MockResponse;
+	public final fun setTrailers (Lokhttp3/Headers;)Lmockwebserver3/MockResponse;
+	public final fun socketPolicy (Lmockwebserver3/SocketPolicy;)V
+	public final fun status (Ljava/lang/String;)V
+	public final fun throttleBody (JJLjava/util/concurrent/TimeUnit;)Lmockwebserver3/MockResponse;
+	public fun toString ()Ljava/lang/String;
+	public final fun trailers (Lokhttp3/Headers;)V
+	public final fun withPush (Lmockwebserver3/PushPromise;)Lmockwebserver3/MockResponse;
+	public final fun withSettings (Lokhttp3/internal/http2/Settings;)Lmockwebserver3/MockResponse;
+	public final fun withWebSocketUpgrade (Lokhttp3/WebSocketListener;)Lmockwebserver3/MockResponse;
+}
+
+public final class mockwebserver3/MockResponse$Companion {
+}
+
+public final class mockwebserver3/MockWebServer : java/io/Closeable {
+	public static final field Companion Lmockwebserver3/MockWebServer$Companion;
+	public final fun -deprecated_bodyLimit (J)V
+	public final fun -deprecated_port ()I
+	public final fun -deprecated_protocolNegotiationEnabled (Z)V
+	public final fun -deprecated_protocols ()Ljava/util/List;
+	public final fun -deprecated_protocols (Ljava/util/List;)V
+	public final fun -deprecated_requestCount ()I
+	public final fun -deprecated_serverSocketFactory (Ljavax/net/ServerSocketFactory;)V
+	public fun <init> ()V
+	public fun close ()V
+	public final fun enqueue (Lmockwebserver3/MockResponse;)V
+	public final fun getBodyLimit ()J
+	public final fun getDispatcher ()Lmockwebserver3/Dispatcher;
+	public final fun getHostName ()Ljava/lang/String;
+	public final fun getPort ()I
+	public final fun getProtocolNegotiationEnabled ()Z
+	public final fun getRequestCount ()I
+	public final fun getServerSocketFactory ()Ljavax/net/ServerSocketFactory;
+	public final fun getStarted ()Z
+	public final fun noClientAuth ()V
+	public final fun protocols ()Ljava/util/List;
+	public final fun requestClientAuth ()V
+	public final fun requireClientAuth ()V
+	public final fun setBodyLimit (J)V
+	public final fun setDispatcher (Lmockwebserver3/Dispatcher;)V
+	public final fun setProtocolNegotiationEnabled (Z)V
+	public final fun setProtocols (Ljava/util/List;)V
+	public final fun setServerSocketFactory (Ljavax/net/ServerSocketFactory;)V
+	public final fun setStarted (Z)V
+	public final fun shutdown ()V
+	public final fun start ()V
+	public final fun start (I)V
+	public final fun start (Ljava/net/InetAddress;I)V
+	public static synthetic fun start$default (Lmockwebserver3/MockWebServer;IILjava/lang/Object;)V
+	public final fun takeRequest ()Lmockwebserver3/RecordedRequest;
+	public final fun takeRequest (JLjava/util/concurrent/TimeUnit;)Lmockwebserver3/RecordedRequest;
+	public final fun toProxyAddress ()Ljava/net/Proxy;
+	public fun toString ()Ljava/lang/String;
+	public final fun url (Ljava/lang/String;)Lokhttp3/HttpUrl;
+	public final fun useHttps (Ljavax/net/ssl/SSLSocketFactory;Z)V
+}
+
+public final class mockwebserver3/MockWebServer$Companion {
+}
+
+public final class mockwebserver3/PushPromise {
+	public final fun -deprecated_headers ()Lokhttp3/Headers;
+	public final fun -deprecated_method ()Ljava/lang/String;
+	public final fun -deprecated_path ()Ljava/lang/String;
+	public final fun -deprecated_response ()Lmockwebserver3/MockResponse;
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;Lokhttp3/Headers;Lmockwebserver3/MockResponse;)V
+	public final fun headers ()Lokhttp3/Headers;
+	public final fun method ()Ljava/lang/String;
+	public final fun path ()Ljava/lang/String;
+	public final fun response ()Lmockwebserver3/MockResponse;
+}
+
+public class mockwebserver3/QueueDispatcher : mockwebserver3/Dispatcher {
+	public static final field Companion Lmockwebserver3/QueueDispatcher$Companion;
+	public fun <init> ()V
+	public fun clear ()V
+	public fun dispatch (Lmockwebserver3/RecordedRequest;)Lmockwebserver3/MockResponse;
+	public fun enqueueResponse (Lmockwebserver3/MockResponse;)V
+	protected final fun getResponseQueue ()Ljava/util/concurrent/BlockingQueue;
+	public fun peek ()Lmockwebserver3/MockResponse;
+	public fun setFailFast (Lmockwebserver3/MockResponse;)V
+	public fun setFailFast (Z)V
+	public fun shutdown ()V
+}
+
+public final class mockwebserver3/QueueDispatcher$Companion {
+}
+
+public final class mockwebserver3/RecordedRequest {
+	public final fun -deprecated_utf8Body ()Ljava/lang/String;
+	public fun <init> (Ljava/lang/String;Lokhttp3/Headers;Ljava/util/List;JLokio/Buffer;ILjava/net/Socket;)V
+	public fun <init> (Ljava/lang/String;Lokhttp3/Headers;Ljava/util/List;JLokio/Buffer;ILjava/net/Socket;Ljava/io/IOException;)V
+	public synthetic fun <init> (Ljava/lang/String;Lokhttp3/Headers;Ljava/util/List;JLokio/Buffer;ILjava/net/Socket;Ljava/io/IOException;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun getBody ()Lokio/Buffer;
+	public final fun getBodySize ()J
+	public final fun getChunkSizes ()Ljava/util/List;
+	public final fun getFailure ()Ljava/io/IOException;
+	public final fun getHandshake ()Lokhttp3/Handshake;
+	public final fun getHeader (Ljava/lang/String;)Ljava/lang/String;
+	public final fun getHeaders ()Lokhttp3/Headers;
+	public final fun getMethod ()Ljava/lang/String;
+	public final fun getPath ()Ljava/lang/String;
+	public final fun getRequestLine ()Ljava/lang/String;
+	public final fun getRequestUrl ()Lokhttp3/HttpUrl;
+	public final fun getSequenceNumber ()I
+	public final fun getTlsVersion ()Lokhttp3/TlsVersion;
+	public final fun getUtf8Body ()Ljava/lang/String;
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class mockwebserver3/SocketPolicy : java/lang/Enum {
+	public static final field CONTINUE_ALWAYS Lmockwebserver3/SocketPolicy;
+	public static final field DISCONNECT_AFTER_REQUEST Lmockwebserver3/SocketPolicy;
+	public static final field DISCONNECT_AT_END Lmockwebserver3/SocketPolicy;
+	public static final field DISCONNECT_AT_START Lmockwebserver3/SocketPolicy;
+	public static final field DISCONNECT_DURING_REQUEST_BODY Lmockwebserver3/SocketPolicy;
+	public static final field DISCONNECT_DURING_RESPONSE_BODY Lmockwebserver3/SocketPolicy;
+	public static final field DO_NOT_READ_REQUEST_BODY Lmockwebserver3/SocketPolicy;
+	public static final field EXPECT_CONTINUE Lmockwebserver3/SocketPolicy;
+	public static final field FAIL_HANDSHAKE Lmockwebserver3/SocketPolicy;
+	public static final field HALF_CLOSE_AFTER_REQUEST Lmockwebserver3/SocketPolicy;
+	public static final field KEEP_OPEN Lmockwebserver3/SocketPolicy;
+	public static final field NO_RESPONSE Lmockwebserver3/SocketPolicy;
+	public static final field RESET_STREAM_AT_START Lmockwebserver3/SocketPolicy;
+	public static final field SHUTDOWN_INPUT_AT_END Lmockwebserver3/SocketPolicy;
+	public static final field SHUTDOWN_OUTPUT_AT_END Lmockwebserver3/SocketPolicy;
+	public static final field SHUTDOWN_SERVER_AFTER_RESPONSE Lmockwebserver3/SocketPolicy;
+	public static final field STALL_SOCKET_AT_START Lmockwebserver3/SocketPolicy;
+	public static final field UPGRADE_TO_SSL_AT_END Lmockwebserver3/SocketPolicy;
+	public static fun valueOf (Ljava/lang/String;)Lmockwebserver3/SocketPolicy;
+	public static fun values ()[Lmockwebserver3/SocketPolicy;
+}
+

mockwebserver/build.gradle.kts

@@ -5,6 +5,7 @@ plugins {
   kotlin("jvm")
   id("org.jetbrains.dokka")
   id("com.vanniktech.maven.publish.base")
+  id("binary-compatibility-validator")
 }
 
 tasks.jar {

okhttp-brotli/api/okhttp-brotli.api

@@ -0,0 +1,5 @@
+public final class okhttp3/brotli/BrotliInterceptor : okhttp3/Interceptor {
+	public static final field INSTANCE Lokhttp3/brotli/BrotliInterceptor;
+	public fun intercept (Lokhttp3/Interceptor$Chain;)Lokhttp3/Response;
+}
+

okhttp-brotli/build.gradle.kts

@@ -5,6 +5,7 @@ plugins {
   kotlin("jvm")
   id("org.jetbrains.dokka")
   id("com.vanniktech.maven.publish.base")
+  id("binary-compatibility-validator")
 }
 
 project.applyOsgi(

okhttp-dnsoverhttps/api/okhttp-dnsoverhttps.api

@@ -0,0 +1,38 @@
+public final class okhttp3/dnsoverhttps/DnsOverHttps : okhttp3/Dns {
+	public static final field Companion Lokhttp3/dnsoverhttps/DnsOverHttps$Companion;
+	public static final field MAX_RESPONSE_SIZE I
+	public final fun client ()Lokhttp3/OkHttpClient;
+	public final fun includeIPv6 ()Z
+	public fun lookup (Ljava/lang/String;)Ljava/util/List;
+	public final fun post ()Z
+	public final fun resolvePrivateAddresses ()Z
+	public final fun resolvePublicAddresses ()Z
+	public final fun url ()Lokhttp3/HttpUrl;
+}
+
+public final class okhttp3/dnsoverhttps/DnsOverHttps$Builder {
+	public fun <init> ()V
+	public final fun bootstrapDnsHosts (Ljava/util/List;)Lokhttp3/dnsoverhttps/DnsOverHttps$Builder;
+	public final fun bootstrapDnsHosts ([Ljava/net/InetAddress;)Lokhttp3/dnsoverhttps/DnsOverHttps$Builder;
+	public final fun build ()Lokhttp3/dnsoverhttps/DnsOverHttps;
+	public final fun client (Lokhttp3/OkHttpClient;)Lokhttp3/dnsoverhttps/DnsOverHttps$Builder;
+	public final fun includeIPv6 (Z)Lokhttp3/dnsoverhttps/DnsOverHttps$Builder;
+	public final fun post (Z)Lokhttp3/dnsoverhttps/DnsOverHttps$Builder;
+	public final fun resolvePrivateAddresses (Z)Lokhttp3/dnsoverhttps/DnsOverHttps$Builder;
+	public final fun resolvePublicAddresses (Z)Lokhttp3/dnsoverhttps/DnsOverHttps$Builder;
+	public final fun systemDns (Lokhttp3/Dns;)Lokhttp3/dnsoverhttps/DnsOverHttps$Builder;
+	public final fun url (Lokhttp3/HttpUrl;)Lokhttp3/dnsoverhttps/DnsOverHttps$Builder;
+}
+
+public final class okhttp3/dnsoverhttps/DnsOverHttps$Companion {
+	public final fun getDNS_MESSAGE ()Lokhttp3/MediaType;
+}
+
+public final class okhttp3/dnsoverhttps/DnsRecordCodec {
+	public static final field INSTANCE Lokhttp3/dnsoverhttps/DnsRecordCodec;
+	public static final field TYPE_A I
+	public static final field TYPE_AAAA I
+	public final fun decodeAnswers (Ljava/lang/String;Lokio/ByteString;)Ljava/util/List;
+	public final fun encodeQuery (Ljava/lang/String;I)Lokio/ByteString;
+}
+

okhttp-dnsoverhttps/build.gradle.kts

@@ -5,6 +5,7 @@ plugins {
   kotlin("jvm")
   id("org.jetbrains.dokka")
   id("com.vanniktech.maven.publish.base")
+  id("binary-compatibility-validator")
 }
 
 project.applyOsgi(

okhttp-logging-interceptor/api/logging-interceptor.api

@@ -0,0 +1,70 @@
+public final class okhttp3/logging/HttpLoggingInterceptor : okhttp3/Interceptor {
+	public final fun -deprecated_level ()Lokhttp3/logging/HttpLoggingInterceptor$Level;
+	public fun <init> ()V
+	public fun <init> (Lokhttp3/logging/HttpLoggingInterceptor$Logger;)V
+	public synthetic fun <init> (Lokhttp3/logging/HttpLoggingInterceptor$Logger;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun getLevel ()Lokhttp3/logging/HttpLoggingInterceptor$Level;
+	public fun intercept (Lokhttp3/Interceptor$Chain;)Lokhttp3/Response;
+	public final fun level (Lokhttp3/logging/HttpLoggingInterceptor$Level;)V
+	public final fun redactHeader (Ljava/lang/String;)V
+	public final fun setLevel (Lokhttp3/logging/HttpLoggingInterceptor$Level;)Lokhttp3/logging/HttpLoggingInterceptor;
+}
+
+public final class okhttp3/logging/HttpLoggingInterceptor$Level : java/lang/Enum {
+	public static final field BASIC Lokhttp3/logging/HttpLoggingInterceptor$Level;
+	public static final field BODY Lokhttp3/logging/HttpLoggingInterceptor$Level;
+	public static final field HEADERS Lokhttp3/logging/HttpLoggingInterceptor$Level;
+	public static final field NONE Lokhttp3/logging/HttpLoggingInterceptor$Level;
+	public static fun valueOf (Ljava/lang/String;)Lokhttp3/logging/HttpLoggingInterceptor$Level;
+	public static fun values ()[Lokhttp3/logging/HttpLoggingInterceptor$Level;
+}
+
+public abstract interface class okhttp3/logging/HttpLoggingInterceptor$Logger {
+	public static final field Companion Lokhttp3/logging/HttpLoggingInterceptor$Logger$Companion;
+	public static final field DEFAULT Lokhttp3/logging/HttpLoggingInterceptor$Logger;
+	public abstract fun log (Ljava/lang/String;)V
+}
+
+public final class okhttp3/logging/HttpLoggingInterceptor$Logger$Companion {
+}
+
+public final class okhttp3/logging/LoggingEventListener : okhttp3/EventListener {
+	public synthetic fun <init> (Lokhttp3/logging/HttpLoggingInterceptor$Logger;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun cacheConditionalHit (Lokhttp3/Call;Lokhttp3/Response;)V
+	public fun cacheHit (Lokhttp3/Call;Lokhttp3/Response;)V
+	public fun cacheMiss (Lokhttp3/Call;)V
+	public fun callEnd (Lokhttp3/Call;)V
+	public fun callFailed (Lokhttp3/Call;Ljava/io/IOException;)V
+	public fun callStart (Lokhttp3/Call;)V
+	public fun canceled (Lokhttp3/Call;)V
+	public fun connectEnd (Lokhttp3/Call;Ljava/net/InetSocketAddress;Ljava/net/Proxy;Lokhttp3/Protocol;)V
+	public fun connectFailed (Lokhttp3/Call;Ljava/net/InetSocketAddress;Ljava/net/Proxy;Lokhttp3/Protocol;Ljava/io/IOException;)V
+	public fun connectStart (Lokhttp3/Call;Ljava/net/InetSocketAddress;Ljava/net/Proxy;)V
+	public fun connectionAcquired (Lokhttp3/Call;Lokhttp3/Connection;)V
+	public fun connectionReleased (Lokhttp3/Call;Lokhttp3/Connection;)V
+	public fun dnsEnd (Lokhttp3/Call;Ljava/lang/String;Ljava/util/List;)V
+	public fun dnsStart (Lokhttp3/Call;Ljava/lang/String;)V
+	public fun proxySelectEnd (Lokhttp3/Call;Lokhttp3/HttpUrl;Ljava/util/List;)V
+	public fun proxySelectStart (Lokhttp3/Call;Lokhttp3/HttpUrl;)V
+	public fun requestBodyEnd (Lokhttp3/Call;J)V
+	public fun requestBodyStart (Lokhttp3/Call;)V
+	public fun requestFailed (Lokhttp3/Call;Ljava/io/IOException;)V
+	public fun requestHeadersEnd (Lokhttp3/Call;Lokhttp3/Request;)V
+	public fun requestHeadersStart (Lokhttp3/Call;)V
+	public fun responseBodyEnd (Lokhttp3/Call;J)V
+	public fun responseBodyStart (Lokhttp3/Call;)V
+	public fun responseFailed (Lokhttp3/Call;Ljava/io/IOException;)V
+	public fun responseHeadersEnd (Lokhttp3/Call;Lokhttp3/Response;)V
+	public fun responseHeadersStart (Lokhttp3/Call;)V
+	public fun satisfactionFailure (Lokhttp3/Call;Lokhttp3/Response;)V
+	public fun secureConnectEnd (Lokhttp3/Call;Lokhttp3/Handshake;)V
+	public fun secureConnectStart (Lokhttp3/Call;)V
+}
+
+public class okhttp3/logging/LoggingEventListener$Factory : okhttp3/EventListener$Factory {
+	public fun <init> ()V
+	public fun <init> (Lokhttp3/logging/HttpLoggingInterceptor$Logger;)V
+	public synthetic fun <init> (Lokhttp3/logging/HttpLoggingInterceptor$Logger;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun create (Lokhttp3/Call;)Lokhttp3/EventListener;
+}
+

okhttp-logging-interceptor/build.gradle.kts

@@ -7,6 +7,7 @@ plugins {
   kotlin("jvm")
   id("org.jetbrains.dokka")
   id("com.vanniktech.maven.publish.base")
+  id("binary-compatibility-validator")
   id("me.champeau.gradle.japicmp")
 }
 

okhttp-sse/api/okhttp-sse.api

@@ -0,0 +1,23 @@
+public abstract interface class okhttp3/sse/EventSource {
+	public abstract fun cancel ()V
+	public abstract fun request ()Lokhttp3/Request;
+}
+
+public abstract interface class okhttp3/sse/EventSource$Factory {
+	public abstract fun newEventSource (Lokhttp3/Request;Lokhttp3/sse/EventSourceListener;)Lokhttp3/sse/EventSource;
+}
+
+public abstract class okhttp3/sse/EventSourceListener {
+	public fun <init> ()V
+	public fun onClosed (Lokhttp3/sse/EventSource;)V
+	public fun onEvent (Lokhttp3/sse/EventSource;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+	public fun onFailure (Lokhttp3/sse/EventSource;Ljava/lang/Throwable;Lokhttp3/Response;)V
+	public fun onOpen (Lokhttp3/sse/EventSource;Lokhttp3/Response;)V
+}
+
+public final class okhttp3/sse/EventSources {
+	public static final field INSTANCE Lokhttp3/sse/EventSources;
+	public static final fun createFactory (Lokhttp3/OkHttpClient;)Lokhttp3/sse/EventSource$Factory;
+	public static final fun processResponse (Lokhttp3/Response;Lokhttp3/sse/EventSourceListener;)V
+}
+

okhttp-sse/build.gradle.kts

@@ -7,6 +7,7 @@ plugins {
   kotlin("jvm")
   id("org.jetbrains.dokka")
   id("com.vanniktech.maven.publish.base")
+  id("binary-compatibility-validator")
   id("me.champeau.gradle.japicmp")
 }
 

okhttp-tls/api/okhttp-tls.api

@@ -0,0 +1,63 @@
+public final class okhttp3/tls/Certificates {
+	public static final fun certificatePem (Ljava/security/cert/X509Certificate;)Ljava/lang/String;
+	public static final fun decodeCertificatePem (Ljava/lang/String;)Ljava/security/cert/X509Certificate;
+}
+
+public final class okhttp3/tls/HandshakeCertificates {
+	public final fun -deprecated_keyManager ()Ljavax/net/ssl/X509KeyManager;
+	public final fun -deprecated_trustManager ()Ljavax/net/ssl/X509TrustManager;
+	public synthetic fun <init> (Ljavax/net/ssl/X509KeyManager;Ljavax/net/ssl/X509TrustManager;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun keyManager ()Ljavax/net/ssl/X509KeyManager;
+	public final fun sslContext ()Ljavax/net/ssl/SSLContext;
+	public final fun sslSocketFactory ()Ljavax/net/ssl/SSLSocketFactory;
+	public final fun trustManager ()Ljavax/net/ssl/X509TrustManager;
+}
+
+public final class okhttp3/tls/HandshakeCertificates$Builder {
+	public fun <init> ()V
+	public final fun addInsecureHost (Ljava/lang/String;)Lokhttp3/tls/HandshakeCertificates$Builder;
+	public final fun addPlatformTrustedCertificates ()Lokhttp3/tls/HandshakeCertificates$Builder;
+	public final fun addTrustedCertificate (Ljava/security/cert/X509Certificate;)Lokhttp3/tls/HandshakeCertificates$Builder;
+	public final fun build ()Lokhttp3/tls/HandshakeCertificates;
+	public final fun heldCertificate (Lokhttp3/tls/HeldCertificate;[Ljava/security/cert/X509Certificate;)Lokhttp3/tls/HandshakeCertificates$Builder;
+}
+
+public final class okhttp3/tls/HeldCertificate {
+	public static final field Companion Lokhttp3/tls/HeldCertificate$Companion;
+	public final fun -deprecated_certificate ()Ljava/security/cert/X509Certificate;
+	public final fun -deprecated_keyPair ()Ljava/security/KeyPair;
+	public fun <init> (Ljava/security/KeyPair;Ljava/security/cert/X509Certificate;)V
+	public final fun certificate ()Ljava/security/cert/X509Certificate;
+	public final fun certificatePem ()Ljava/lang/String;
+	public static final fun decode (Ljava/lang/String;)Lokhttp3/tls/HeldCertificate;
+	public final fun keyPair ()Ljava/security/KeyPair;
+	public final fun privateKeyPkcs1Pem ()Ljava/lang/String;
+	public final fun privateKeyPkcs8Pem ()Ljava/lang/String;
+}
+
+public final class okhttp3/tls/HeldCertificate$Builder {
+	public static final field Companion Lokhttp3/tls/HeldCertificate$Builder$Companion;
+	public fun <init> ()V
+	public final fun addSubjectAlternativeName (Ljava/lang/String;)Lokhttp3/tls/HeldCertificate$Builder;
+	public final fun build ()Lokhttp3/tls/HeldCertificate;
+	public final fun certificateAuthority (I)Lokhttp3/tls/HeldCertificate$Builder;
+	public final fun commonName (Ljava/lang/String;)Lokhttp3/tls/HeldCertificate$Builder;
+	public final fun duration (JLjava/util/concurrent/TimeUnit;)Lokhttp3/tls/HeldCertificate$Builder;
+	public final fun ecdsa256 ()Lokhttp3/tls/HeldCertificate$Builder;
+	public final fun keyPair (Ljava/security/KeyPair;)Lokhttp3/tls/HeldCertificate$Builder;
+	public final fun keyPair (Ljava/security/PublicKey;Ljava/security/PrivateKey;)Lokhttp3/tls/HeldCertificate$Builder;
+	public final fun organizationalUnit (Ljava/lang/String;)Lokhttp3/tls/HeldCertificate$Builder;
+	public final fun rsa2048 ()Lokhttp3/tls/HeldCertificate$Builder;
+	public final fun serialNumber (J)Lokhttp3/tls/HeldCertificate$Builder;
+	public final fun serialNumber (Ljava/math/BigInteger;)Lokhttp3/tls/HeldCertificate$Builder;
+	public final fun signedBy (Lokhttp3/tls/HeldCertificate;)Lokhttp3/tls/HeldCertificate$Builder;
+	public final fun validityInterval (JJ)Lokhttp3/tls/HeldCertificate$Builder;
+}
+
+public final class okhttp3/tls/HeldCertificate$Builder$Companion {
+}
+
+public final class okhttp3/tls/HeldCertificate$Companion {
+	public final fun decode (Ljava/lang/String;)Lokhttp3/tls/HeldCertificate;
+}
+

okhttp-tls/build.gradle.kts

@@ -7,6 +7,7 @@ plugins {
   kotlin("jvm")
   id("org.jetbrains.dokka")
   id("com.vanniktech.maven.publish.base")
+  id("binary-compatibility-validator")
   id("me.champeau.gradle.japicmp")
   id("ru.vyarus.animalsniffer")
 }

okhttp-urlconnection/api/okhttp-urlconnection.api

@@ -0,0 +1,11 @@
+public final class okhttp3/JavaNetAuthenticator : okhttp3/Authenticator {
+	public fun <init> ()V
+	public fun authenticate (Lokhttp3/Route;Lokhttp3/Response;)Lokhttp3/Request;
+}
+
+public final class okhttp3/JavaNetCookieJar : okhttp3/CookieJar {
+	public fun <init> (Ljava/net/CookieHandler;)V
+	public fun loadForRequest (Lokhttp3/HttpUrl;)Ljava/util/List;
+	public fun saveFromResponse (Lokhttp3/HttpUrl;Ljava/util/List;)V
+}
+

okhttp-urlconnection/build.gradle.kts

@@ -7,6 +7,7 @@ plugins {
   kotlin("jvm")
   id("org.jetbrains.dokka")
   id("com.vanniktech.maven.publish.base")
+  id("binary-compatibility-validator")
   id("me.champeau.gradle.japicmp")
 }
 

okhttp/build.gradle.kts

@@ -8,6 +8,7 @@ plugins {
   kotlin("multiplatform")
   id("org.jetbrains.dokka")
   id("com.vanniktech.maven.publish.base")
+  id("binary-compatibility-validator")
   id("me.champeau.gradle.japicmp")
 }