From 56e1ae640452f0aed10b31833754378675491591 Mon Sep 17 00:00:00 2001 From: Zac Sweers Date: Fri, 7 Jan 2022 21:02:16 -0500 Subject: [PATCH] Use Okio IOException in Kotlin classes (#1490) More portability! --- .../main/java/com/squareup/moshi/Rfc3339DateJsonAdapter.kt | 2 +- .../main/java/com/squareup/moshi/adapters/EnumJsonAdapter.kt | 2 +- .../squareup/moshi/adapters/PolymorphicJsonAdapterFactory.kt | 2 +- .../com/squareup/moshi/adapters/Rfc3339DateJsonAdapter.kt | 2 +- moshi/src/main/java/com/squareup/moshi/JsonUtf8Reader.kt | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/moshi-adapters/src/main/java/com/squareup/moshi/Rfc3339DateJsonAdapter.kt b/moshi-adapters/src/main/java/com/squareup/moshi/Rfc3339DateJsonAdapter.kt index 72d885b..55c4c43 100644 --- a/moshi-adapters/src/main/java/com/squareup/moshi/Rfc3339DateJsonAdapter.kt +++ b/moshi-adapters/src/main/java/com/squareup/moshi/Rfc3339DateJsonAdapter.kt @@ -16,7 +16,7 @@ package com.squareup.moshi import com.squareup.moshi.adapters.Rfc3339DateJsonAdapter -import java.io.IOException +import okio.IOException import java.util.Date @Deprecated( diff --git a/moshi-adapters/src/main/java/com/squareup/moshi/adapters/EnumJsonAdapter.kt b/moshi-adapters/src/main/java/com/squareup/moshi/adapters/EnumJsonAdapter.kt index 5e3f51f..8d62cc2 100644 --- a/moshi-adapters/src/main/java/com/squareup/moshi/adapters/EnumJsonAdapter.kt +++ b/moshi-adapters/src/main/java/com/squareup/moshi/adapters/EnumJsonAdapter.kt @@ -22,7 +22,7 @@ import com.squareup.moshi.JsonReader.Options import com.squareup.moshi.JsonReader.Token.STRING import com.squareup.moshi.JsonWriter import com.squareup.moshi.internal.jsonName -import java.io.IOException +import okio.IOException import java.lang.NoSuchFieldException /** diff --git a/moshi-adapters/src/main/java/com/squareup/moshi/adapters/PolymorphicJsonAdapterFactory.kt b/moshi-adapters/src/main/java/com/squareup/moshi/adapters/PolymorphicJsonAdapterFactory.kt index 3957efd..471ef04 100644 --- a/moshi-adapters/src/main/java/com/squareup/moshi/adapters/PolymorphicJsonAdapterFactory.kt +++ b/moshi-adapters/src/main/java/com/squareup/moshi/adapters/PolymorphicJsonAdapterFactory.kt @@ -23,7 +23,7 @@ import com.squareup.moshi.JsonReader.Options import com.squareup.moshi.JsonWriter import com.squareup.moshi.Moshi import com.squareup.moshi.rawType -import java.io.IOException +import okio.IOException import java.lang.reflect.Type import javax.annotation.CheckReturnValue diff --git a/moshi-adapters/src/main/java/com/squareup/moshi/adapters/Rfc3339DateJsonAdapter.kt b/moshi-adapters/src/main/java/com/squareup/moshi/adapters/Rfc3339DateJsonAdapter.kt index 96941bb..4b3e804 100644 --- a/moshi-adapters/src/main/java/com/squareup/moshi/adapters/Rfc3339DateJsonAdapter.kt +++ b/moshi-adapters/src/main/java/com/squareup/moshi/adapters/Rfc3339DateJsonAdapter.kt @@ -19,7 +19,7 @@ import com.squareup.moshi.JsonAdapter import com.squareup.moshi.JsonReader import com.squareup.moshi.JsonReader.Token.NULL import com.squareup.moshi.JsonWriter -import java.io.IOException +import okio.IOException import java.util.Date /** diff --git a/moshi/src/main/java/com/squareup/moshi/JsonUtf8Reader.kt b/moshi/src/main/java/com/squareup/moshi/JsonUtf8Reader.kt index cbaaa87..b6fead1 100644 --- a/moshi/src/main/java/com/squareup/moshi/JsonUtf8Reader.kt +++ b/moshi/src/main/java/com/squareup/moshi/JsonUtf8Reader.kt @@ -19,9 +19,9 @@ import okio.Buffer import okio.BufferedSource import okio.ByteString import okio.ByteString.Companion.encodeUtf8 +import okio.EOFException +import okio.IOException import okio.buffer -import java.io.EOFException -import java.io.IOException import java.math.BigDecimal import kotlin.contracts.contract