mirror of
https://github.com/square/okhttp.git
synced 2025-07-29 17:41:17 +03:00
Upgrade Okio and some build dependencies
The new ktlint sorts imports which makes this diff large. The new japicmp ignores 'final' modifier changes in final classes. We adopt the Google style for checkstyle.xml. Okio readByteString() now uses segments more aggressively, so we need to mitigate that to avoid tracking those segments in a test.
This commit is contained in:
@ -15,9 +15,9 @@
|
||||
*/
|
||||
package okhttp3.dnsoverhttps
|
||||
|
||||
import okhttp3.Dns
|
||||
import java.net.InetAddress
|
||||
import java.net.UnknownHostException
|
||||
import okhttp3.Dns
|
||||
|
||||
/**
|
||||
* Internal Bootstrap DNS implementation for handling initial connection to DNS over HTTPS server.
|
||||
|
@ -15,6 +15,11 @@
|
||||
*/
|
||||
package okhttp3.dnsoverhttps
|
||||
|
||||
import java.io.IOException
|
||||
import java.net.InetAddress
|
||||
import java.net.UnknownHostException
|
||||
import java.util.ArrayList
|
||||
import java.util.concurrent.CountDownLatch
|
||||
import okhttp3.CacheControl
|
||||
import okhttp3.Call
|
||||
import okhttp3.Callback
|
||||
@ -29,11 +34,6 @@ import okhttp3.RequestBody.Companion.toRequestBody
|
||||
import okhttp3.Response
|
||||
import okhttp3.internal.platform.Platform
|
||||
import okhttp3.internal.publicsuffix.PublicSuffixDatabase
|
||||
import java.io.IOException
|
||||
import java.net.InetAddress
|
||||
import java.net.UnknownHostException
|
||||
import java.util.ArrayList
|
||||
import java.util.concurrent.CountDownLatch
|
||||
|
||||
/**
|
||||
* [DNS over HTTPS implementation][doh_spec].
|
||||
|
@ -15,13 +15,13 @@
|
||||
|
||||
package okhttp3.dnsoverhttps
|
||||
|
||||
import okio.Buffer
|
||||
import okio.ByteString
|
||||
import okio.utf8Size
|
||||
import java.io.EOFException
|
||||
import java.net.InetAddress
|
||||
import java.net.UnknownHostException
|
||||
import java.nio.charset.StandardCharsets
|
||||
import okio.Buffer
|
||||
import okio.ByteString
|
||||
import okio.utf8Size
|
||||
|
||||
/**
|
||||
* Trivial Dns Encoder/Decoder, basically ripped from Netty full implementation.
|
||||
|
Reference in New Issue
Block a user