From bfc39c62969d6c6cbaa7387a0aa514b0f3c3560f Mon Sep 17 00:00:00 2001
From: Benoit Quenaudon <benoit@quenaudon.com>
Date: Thu, 22 Jun 2023 12:20:55 +0200
Subject: [PATCH] Revert public API breaking change

---
 okio/api/okio.api                                      | 10 +++++-----
 .../kotlin/okio/internal/{Utf8.kt => -Utf8.kt}         |  4 +---
 .../kotlin/okio/{JvmPlatform.kt => -JvmPlatform.kt}    |  3 +--
 3 files changed, 7 insertions(+), 10 deletions(-)
 rename okio/src/commonMain/kotlin/okio/internal/{Utf8.kt => -Utf8.kt} (95%)
 rename okio/src/jvmMain/kotlin/okio/{JvmPlatform.kt => -JvmPlatform.kt} (95%)

diff --git a/okio/api/okio.api b/okio/api/okio.api
index f7a80d22ef..b8c0e8d6de 100644
--- a/okio/api/okio.api
+++ b/okio/api/okio.api
@@ -43,10 +43,6 @@ public final class okio/-InflaterSourceExtensions {
 	public static synthetic fun inflate$default (Lokio/Source;Ljava/util/zip/Inflater;ILjava/lang/Object;)Lokio/InflaterSource;
 }
 
-public final class okio/-JvmPlatform {
-	public static final fun withLock (Ljava/util/concurrent/locks/ReentrantLock;Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;
-}
-
 public class okio/AsyncTimeout : okio/Timeout {
 	public static final field Companion Lokio/AsyncTimeout$Companion;
 	public fun <init> ()V
@@ -800,7 +796,11 @@ public final class okio/Utf8 {
 	public static synthetic fun size$default (Ljava/lang/String;IIILjava/lang/Object;)J
 }
 
-public final class okio/internal/-Utf8 {
+public final class okio/_JvmPlatformKt {
+	public static final fun withLock (Ljava/util/concurrent/locks/ReentrantLock;Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;
+}
+
+public final class okio/internal/_Utf8Kt {
 	public static final fun commonAsUtf8ToByteArray (Ljava/lang/String;)[B
 	public static final fun commonToUtf8String ([BII)Ljava/lang/String;
 	public static synthetic fun commonToUtf8String$default ([BIIILjava/lang/Object;)Ljava/lang/String;
diff --git a/okio/src/commonMain/kotlin/okio/internal/Utf8.kt b/okio/src/commonMain/kotlin/okio/internal/-Utf8.kt
similarity index 95%
rename from okio/src/commonMain/kotlin/okio/internal/Utf8.kt
rename to okio/src/commonMain/kotlin/okio/internal/-Utf8.kt
index 96e8c19ecc..865ff2c1f2 100644
--- a/okio/src/commonMain/kotlin/okio/internal/Utf8.kt
+++ b/okio/src/commonMain/kotlin/okio/internal/-Utf8.kt
@@ -1,3 +1,4 @@
+// ktlint-disable filename
 /*
  * Copyright (C) 2018 Square, Inc.
  *
@@ -13,11 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@file:JvmName("-Utf8") // A leading '-' hides this class from Java.
-
 package okio.internal
 
-import kotlin.jvm.JvmName
 import okio.ArrayIndexOutOfBoundsException
 import okio.processUtf16Chars
 import okio.processUtf8Bytes
diff --git a/okio/src/jvmMain/kotlin/okio/JvmPlatform.kt b/okio/src/jvmMain/kotlin/okio/-JvmPlatform.kt
similarity index 95%
rename from okio/src/jvmMain/kotlin/okio/JvmPlatform.kt
rename to okio/src/jvmMain/kotlin/okio/-JvmPlatform.kt
index 1a24275d9d..cf263c45ac 100644
--- a/okio/src/jvmMain/kotlin/okio/JvmPlatform.kt
+++ b/okio/src/jvmMain/kotlin/okio/-JvmPlatform.kt
@@ -1,3 +1,4 @@
+// ktlint-disable filename
 /*
  * Copyright (C) 2018 Square, Inc.
  *
@@ -13,8 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@file:JvmName("-JvmPlatform") // A leading '-' hides this class from Java.
-
 package okio
 
 import java.util.concurrent.locks.ReentrantLock