Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dump internal public APIs #1278

Merged
merged 2 commits into from
Jun 22, 2023
Merged

Dump internal public APIs #1278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eeefdbf
Dump internal public APIs
oldergod Jun 22, 2023
c12a566
Revert public API breaking change (#1279)
oldergod Jun 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import com.vanniktech.maven.publish.MavenPublishBaseExtension
import com.vanniktech.maven.publish.SonatypeHost
import groovy.util.Node
import groovy.util.NodeList
import kotlinx.validation.ApiValidationExtension
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
import org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED
import org.gradle.api.tasks.testing.logging.TestLogEvent.PASSED
Expand Down Expand Up @@ -172,12 +171,6 @@ subprojects {
}
}

plugins.withId("binary-compatibility-validator") {
configure<ApiValidationExtension> {
ignoredPackages += "okio.internal"
}
}

tasks.withType<KotlinCompile>().configureEach {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString()
Expand Down
14 changes: 10 additions & 4 deletions okio/api/okio.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -800,3 +796,13 @@ public final class okio/Utf8 {
public static synthetic fun size$default (Ljava/lang/String;IIILjava/lang/Object;)J
}

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;
}

4 changes: 1 addition & 3 deletions ...c/commonMain/kotlin/okio/internal/Utf8.kt → .../commonMain/kotlin/okio/internal/-Utf8.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// ktlint-disable filename
/*
* Copyright (C) 2018 Square, Inc.
*
Expand All @@ -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
Expand Down
3 changes: 1 addition & 2 deletions okio/src/jvmMain/kotlin/okio/JvmPlatform.kt → okio/src/jvmMain/kotlin/okio/-JvmPlatform.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// ktlint-disable filename
/*
* Copyright (C) 2018 Square, Inc.
*
Expand All @@ -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
Expand Down