Kotlin 1.4 dependency upgrade and language features

build.gradle

@@ -1,4 +1,4 @@
-import net.ltgt.gradle.errorprone.CheckSeverity
+//import net.ltgt.gradle.errorprone.CheckSeverity
 
 buildscript {
   ext.versions = [
@@ -15,10 +15,10 @@ buildscript {
       'jnrUnixsocket': '0.28',
       'jsoup': '1.13.1',
       'junit': '4.13',
-      'kotlin': '1.3.72',
+      'kotlin': '1.4.0',
       'moshi': '1.9.2',
       'okio': '2.7.0',
-      'ktlint': '0.36.0',
+      'ktlint': '0.37.0',
       'picocli': '4.2.0',
       'openjsse': '1.1.0'
   ]
@@ -39,32 +39,35 @@ buildscript {
       'jsoup': "org.jsoup:jsoup:${versions.jsoup}",
       'jsr305': "com.google.code.findbugs:jsr305:${versions.findbugs}",
       'junit': "junit:junit:${versions.junit}",
-      'kotlinStdlib': "org.jetbrains.kotlin:kotlin-stdlib:${versions.kotlin}",
+      'kotlinStdlib': "org.jetbrains.kotlin:kotlin-stdlib:1.4.0",
       'moshi': "com.squareup.moshi:moshi:${versions.moshi}",
       'moshiKotlin': "com.squareup.moshi:moshi-kotlin-codegen:${versions.moshi}",
       'okio': "com.squareup.okio:okio:${versions.okio}",
       'openjsse': "org.openjsse:openjsse:${versions.openjsse}"
   ]
 
   dependencies {
-    classpath 'net.ltgt.gradle:gradle-errorprone-plugin:1.1.1'
-    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0"
     classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.10.1"
-    classpath 'com.diffplug.spotless:spotless-plugin-gradle:3.27.1'
-    classpath 'com.android.tools.build:gradle:3.6.2'
+    classpath 'com.android.tools.build:gradle:3.6.4'
   }
 
   repositories {
     mavenCentral()
     gradlePluginPortal()
     google()
+    maven {
+      url = "https://dl.bintray.com/kotlin/kotlin-dev/"
+    }
   }
 }
 
 plugins {
   id 'ru.vyarus.animalsniffer' version '1.5.0'
   id 'com.github.johnrengelman.shadow' version '5.2.0'
   id 'me.champeau.gradle.japicmp' version '0.2.9'
+  id "com.diffplug.spotless" version "5.1.1"
+  id("net.ltgt.errorprone") version "1.2.1"
 }
 
 /** Returns the artifact ID for the project, or null if it is not published. */
@@ -97,6 +100,9 @@ allprojects {
       url 'https://dl.bintray.com/kotlin/dokka'
     }
     google()
+    maven {
+      url = "https://dl.bintray.com/kotlin/kotlin-dev/"
+    }
   }
 
   task downloadDependencies() {
@@ -112,14 +118,12 @@ subprojects { project ->
   if (project.name == 'android-test') return
   if (project.name == 'okhttp-bom') return
 
+  apply plugin: "kotlin"
   apply plugin: 'java'
   apply plugin: 'java-library'
-  apply plugin: 'org.jetbrains.kotlin.platform.jvm'
   apply plugin: 'checkstyle'
   apply plugin: 'ru.vyarus.animalsniffer'
-  apply plugin: 'net.ltgt.errorprone'
   apply plugin: 'org.jetbrains.dokka'
-  apply plugin: 'com.diffplug.gradle.spotless'
   sourceCompatibility = JavaVersion.VERSION_1_8
   targetCompatibility = JavaVersion.VERSION_1_8
 
@@ -152,16 +156,18 @@ subprojects { project ->
     signature 'org.codehaus.mojo.signature:java18:1.0@signature'
   }
 
-  spotless {
-    kotlin {
-      target "**/*.kt"
-      ktlint(versions.ktlint).userData(['indent_size': '2', 'continuation_indent_size': '2'])
-    }
-  }
+//  spotless {
+//    kotlin {
+//      target "**/*.kt"
+//      ktlint(versions.ktlint).userData(['indent_size': '2', 'continuation_indent_size': '2'])
+//    }
+//  }
 
   tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
     kotlinOptions {
       jvmTarget = "1.8"
+      apiVersion = "1.4"
+      languageVersion = "1.4"
     }
   }
 
@@ -205,20 +211,20 @@ subprojects { project ->
     }
   }
 
-  dependencies {
-    //noinspection GradleDynamicVersion
-    errorproneJavac 'com.google.errorprone:javac:9+181-r4173-1'
-    errorprone 'com.google.errorprone:error_prone_core:2.3.4'
-  }
+//  dependencies {
+//    //noinspection GradleDynamicVersion
+//    errorproneJavac 'com.google.errorprone:javac:9+181-r4173-1'
+//    errorprone 'com.google.errorprone:error_prone_core:2.4.0'
+//  }
   tasks.withType(JavaCompile).configureEach {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
 
-    options.errorprone {
-      check("MissingFail", CheckSeverity.ERROR)
-      check("MissingOverride", CheckSeverity.ERROR)
-      enabled = JavaVersion.current() < JavaVersion.VERSION_12
-    }
+//    options.errorprone {
+//      check("MissingFail", net.ltgt.gradle.errorprone.CheckSeverity.ERROR)
+//      check("MissingOverride", net.ltgt.gradle.errorprone.CheckSeverity.ERROR)
+//      enabled = JavaVersion.current() < JavaVersion.VERSION_12
+//    }
   }
 
   dokka {

okcurl/src/main/kotlin/okhttp3/curl/Main.kt

@@ -168,11 +168,7 @@ class Main : Runnable {
       builder.hostnameVerifier(createInsecureHostnameVerifier())
     }
     if (verbose) {
-      val logger = object : HttpLoggingInterceptor.Logger {
-        override fun log(message: String) {
-          println(message)
-        }
-      }
+      val logger = HttpLoggingInterceptor.Logger(::println)
       builder.eventListenerFactory(LoggingEventListener.Factory(logger))
     }
     return builder.build()

okhttp-logging-interceptor/src/main/kotlin/okhttp3/logging/HttpLoggingInterceptor.kt

@@ -104,7 +104,7 @@ class HttpLoggingInterceptor @JvmOverloads constructor(
     BODY
   }
 
-  interface Logger {
+  fun interface Logger {
     fun log(message: String)
 
     companion object {

okhttp-logging-interceptor/src/test/java/okhttp3/logging/HttpLoggingInterceptorTest.java

@@ -107,6 +107,8 @@ private void setLevel(Level level) {
     try {
       applicationInterceptor.setLevel(null);
       fail();
+    } catch (NullPointerException expected) {
+      // Kotlin 1.4
     } catch (IllegalArgumentException expected) {
     }
   }

okhttp-sse/src/main/kotlin/okhttp3/sse/EventSource.kt

@@ -27,7 +27,7 @@ interface EventSource {
    */
   fun cancel()
 
-  interface Factory {
+  fun interface Factory {
     /**
      * Creates a new event source and immediately returns it. Creating an event source initiates an
      * asynchronous process to connect the socket. Once that succeeds or fails, `listener` will be

okhttp-sse/src/main/kotlin/okhttp3/sse/EventSources.kt

@@ -16,25 +16,22 @@
 package okhttp3.sse
 
 import okhttp3.OkHttpClient
-import okhttp3.Request
 import okhttp3.Response
 import okhttp3.internal.sse.RealEventSource
 
 object EventSources {
   @JvmStatic
   fun createFactory(client: OkHttpClient): EventSource.Factory {
-    return object : EventSource.Factory {
-      override fun newEventSource(request: Request, listener: EventSourceListener): EventSource {
-        val actualRequest =
-          if (request.header("Accept") == null) {
-            request.newBuilder().addHeader("Accept", "text/event-stream").build()
-          } else {
-            request
-          }
-
-        return RealEventSource(actualRequest, listener).apply {
-          connect(client)
+    return EventSource.Factory { request, listener ->
+      val actualRequest =
+        if (request.header("Accept") == null) {
+          request.newBuilder().addHeader("Accept", "text/event-stream").build()
+        } else {
+          request
         }
+
+      RealEventSource(actualRequest, listener).apply {
+        connect(client)
       }
     }
   }

okhttp-testing-support/src/main/kotlin/okhttp3/OkHttpClientTestRule.kt

@@ -92,14 +92,11 @@ class OkHttpClientTestRule : TestRule {
     Logger.getLogger("javax.net.ssl").fn()
   }
 
-  fun wrap(eventListener: EventListener) = object : EventListener.Factory {
-    override fun create(call: Call) = ClientRuleEventListener(eventListener) { addEvent(it) }
-  }
+  fun wrap(eventListener: EventListener) =
+    EventListener.Factory { ClientRuleEventListener(eventListener, ::addEvent) }
 
-  fun wrap(eventListenerFactory: EventListener.Factory) = object : EventListener.Factory {
-    override fun create(call: Call) =
-      ClientRuleEventListener(eventListenerFactory.create(call)) { addEvent(it) }
-  }
+  fun wrap(eventListenerFactory: EventListener.Factory) =
+    EventListener.Factory { call -> ClientRuleEventListener(eventListenerFactory.create(call), ::addEvent) }
 
   /**
    * Returns an OkHttpClient for tests to use as a starting point.
@@ -115,9 +112,8 @@ class OkHttpClientTestRule : TestRule {
     if (client == null) {
       client = OkHttpClient.Builder()
           .dns(SINGLE_INET_ADDRESS_DNS) // Prevent unexpected fallback addresses.
-          .eventListenerFactory(object : EventListener.Factory {
-            override fun create(call: Call) = ClientRuleEventListener { addEvent(it) }
-          })
+          .eventListenerFactory(
+              EventListener.Factory { ClientRuleEventListener(logger = ::addEvent) })
           .build()
       testClient = client
     }

okhttp-testing-support/src/main/kotlin/okhttp3/RecordingEventListener.kt

@@ -129,7 +129,7 @@ open class RecordingEventListener : EventListener() {
     for (lock in forbiddenLocks) {
       assertThat(Thread.holdsLock(lock))
           .overridingErrorMessage(lock.toString())
-          .isFalse()
+          .isFalse
     }
 
     val startEvent = e.closes(-1L)

okhttp/build.gradle

@@ -108,6 +108,8 @@ task japicmp(type: me.champeau.gradle.japicmp.JapicmpTask, dependsOn: 'jar') {
       'okhttp3.OkHttpClient#socketFactory()',
       'okhttp3.OkHttpClient#sslSocketFactory()',
       'okhttp3.OkHttpClient#writeTimeoutMillis()',
+      'okhttp3.OkHttpClient#writeTimeoutMillis()',
+      'okhttp3.Request$Builder#delete()',
   ]
 }
 check.dependsOn(japicmp)

okhttp/src/main/kotlin/okhttp3/Authenticator.kt

@@ -112,7 +112,7 @@ import okhttp3.internal.authenticator.JavaNetAuthenticator
  *
  * [1]: https://tools.ietf.org/html/rfc2817
  */
-interface Authenticator {
+fun interface Authenticator {
   /**
    * Returns a request that includes a credential to satisfy an authentication challenge in
    * [response]. Returns null if the challenge cannot be satisfied.

okhttp/src/main/kotlin/okhttp3/Cache.kt

@@ -386,12 +386,12 @@ class Cache internal constructor(
 
   @Synchronized fun requestCount(): Int = requestCount
 
-  private inner class RealCacheRequest internal constructor(
+  private inner class RealCacheRequest(
     private val editor: DiskLruCache.Editor
   ) : CacheRequest {
     private val cacheOut: Sink = editor.newSink(ENTRY_BODY)
     private val body: Sink
-    internal var done = false
+    var done = false
 
     init {
       this.body = object : ForwardingSink(cacheOut) {
@@ -489,8 +489,7 @@ class Cache internal constructor(
      * each on their own line. A length of -1 is used to encode a null array. The last line is
      * optional. If present, it contains the TLS version.
      */
-    @Throws(IOException::class)
-    internal constructor(rawSource: Source) {
+    @Throws(IOException::class) constructor(rawSource: Source) {
       try {
         val source = rawSource.buffer()
         url = source.readUtf8LineStrict()
@@ -542,7 +541,7 @@ class Cache internal constructor(
       }
     }
 
-    internal constructor(response: Response) {
+    constructor(response: Response) {
       this.url = response.request.url.toString()
       this.varyHeaders = response.varyHeaders()
       this.requestMethod = response.request.method
@@ -665,8 +664,8 @@ class Cache internal constructor(
     }
   }
 
-  private class CacheResponseBody internal constructor(
-    internal val snapshot: DiskLruCache.Snapshot,
+  private class CacheResponseBody(
+    val snapshot: DiskLruCache.Snapshot,
     private val contentType: String?,
     private val contentLength: String?
   ) : ResponseBody() {

okhttp/src/main/kotlin/okhttp3/Call.kt

@@ -93,7 +93,7 @@ interface Call : Cloneable {
    */
   public override fun clone(): Call
 
-  interface Factory {
+  fun interface Factory {
     fun newCall(request: Request): Call
   }
 }

okhttp/src/main/kotlin/okhttp3/EventListener.kt

@@ -457,7 +457,7 @@ abstract class EventListener {
   open fun cacheConditionalHit(call: Call, cachedResponse: Response) {
   }
 
-  interface Factory {
+  fun interface Factory {
     /**
      * Creates an instance of the [EventListener] for a particular [Call]. The returned
      * [EventListener] instance will be used during the lifecycle of [call].

okhttp/src/main/kotlin/okhttp3/Handshake.kt

@@ -52,7 +52,7 @@ class Handshake internal constructor(
     try {
       peerCertificatesFn()
     } catch (spue: SSLPeerUnverifiedException) {
-      listOf<Certificate>()
+      listOf()
     }
   }
 
@@ -160,7 +160,7 @@ class Handshake internal constructor(
       val peerCertificatesCopy = try {
         peerCertificates.toImmutableList()
       } catch (_: SSLPeerUnverifiedException) {
-        listOf<Certificate>()
+        listOf()
       }
 
       return Handshake(tlsVersion, cipherSuite,

okhttp/src/main/kotlin/okhttp3/Interceptor.kt

@@ -23,7 +23,7 @@ import java.util.concurrent.TimeUnit
  * responses coming back in. Typically interceptors add, remove, or transform headers on the request
  * or response.
  */
-interface Interceptor {
+fun interface Interceptor {
   @Throws(IOException::class)
   fun intercept(chain: Chain): Response
 
@@ -39,9 +39,7 @@ interface Interceptor {
      * ```
      */
     inline operator fun invoke(crossinline block: (chain: Chain) -> Response): Interceptor =
-        object : Interceptor {
-          override fun intercept(chain: Chain) = block(chain)
-        }
+      Interceptor { block(it) }
   }
 
   interface Chain {

okhttp/src/main/kotlin/okhttp3/WebSocket.kt

@@ -109,7 +109,7 @@ interface WebSocket {
    */
   fun cancel()
 
-  interface Factory {
+  fun interface Factory {
     /**
      * Creates a new web socket and immediately returns it. Creating a web socket initiates an
      * asynchronous process to connect the socket. Once that succeeds or fails, `listener` will be