From 1f7e653e8cd2dfbfe5e29de9b0cf165d5b0ac986 Mon Sep 17 00:00:00 2001 From: Jesse Wilson Date: Tue, 28 Jul 2026 10:01:43 -0400 Subject: [PATCH 1/2] Hide some accidentally public symbols --- .../api/okio-wasifilesystem.klib.api | 191 ------------------ .../kotlin/okio/internal/ErrnoException.kt | 2 +- .../kotlin/okio/internal/preview1/Errno.kt | 2 +- .../kotlin/okio/internal/preview1/Fdflags.kt | 12 +- .../kotlin/okio/internal/preview1/Filetype.kt | 18 +- .../okio/internal/preview1/LookupFlags.kt | 4 +- .../kotlin/okio/internal/preview1/OFlags.kt | 10 +- .../kotlin/okio/internal/preview1/Preview1.kt | 14 +- .../kotlin/okio/internal/preview1/Rights.kt | 62 +++--- okio/api/okio.api | 6 - okio/api/okio.klib.api | 12 -- .../okio/benchmarks/BenchmarkUtils.kt | 5 + .../commonMain/kotlin/okio/internal/-Utf8.kt | 4 +- .../nativeMain/kotlin/okio/internal/CRC32.kt | 2 +- .../zlibMain/kotlin/okio/internal/CRC32.kt | 2 +- 15 files changed, 71 insertions(+), 275 deletions(-) diff --git a/okio-wasifilesystem/api/okio-wasifilesystem.klib.api b/okio-wasifilesystem/api/okio-wasifilesystem.klib.api index 6823a39d60..eafb4af9b9 100644 --- a/okio-wasifilesystem/api/okio-wasifilesystem.klib.api +++ b/okio-wasifilesystem/api/okio-wasifilesystem.klib.api @@ -6,100 +6,6 @@ // - Show declarations: true // Library unique name: -final enum class okio.internal.preview1/Errno : kotlin/Enum { // okio.internal.preview1/Errno|null[0] - enum entry acces // okio.internal.preview1/Errno.acces|null[0] - enum entry addrinuse // okio.internal.preview1/Errno.addrinuse|null[0] - enum entry addrnotavail // okio.internal.preview1/Errno.addrnotavail|null[0] - enum entry afnosupport // okio.internal.preview1/Errno.afnosupport|null[0] - enum entry again // okio.internal.preview1/Errno.again|null[0] - enum entry already // okio.internal.preview1/Errno.already|null[0] - enum entry badf // okio.internal.preview1/Errno.badf|null[0] - enum entry badmsg // okio.internal.preview1/Errno.badmsg|null[0] - enum entry busy // okio.internal.preview1/Errno.busy|null[0] - enum entry canceled // okio.internal.preview1/Errno.canceled|null[0] - enum entry child // okio.internal.preview1/Errno.child|null[0] - enum entry connaborted // okio.internal.preview1/Errno.connaborted|null[0] - enum entry connrefused // okio.internal.preview1/Errno.connrefused|null[0] - enum entry connreset // okio.internal.preview1/Errno.connreset|null[0] - enum entry deadlk // okio.internal.preview1/Errno.deadlk|null[0] - enum entry destaddrreq // okio.internal.preview1/Errno.destaddrreq|null[0] - enum entry dom // okio.internal.preview1/Errno.dom|null[0] - enum entry dquot // okio.internal.preview1/Errno.dquot|null[0] - enum entry exist // okio.internal.preview1/Errno.exist|null[0] - enum entry fault // okio.internal.preview1/Errno.fault|null[0] - enum entry fbig // okio.internal.preview1/Errno.fbig|null[0] - enum entry hostunreach // okio.internal.preview1/Errno.hostunreach|null[0] - enum entry idrm // okio.internal.preview1/Errno.idrm|null[0] - enum entry ilseq // okio.internal.preview1/Errno.ilseq|null[0] - enum entry inprogress // okio.internal.preview1/Errno.inprogress|null[0] - enum entry intr // okio.internal.preview1/Errno.intr|null[0] - enum entry inval // okio.internal.preview1/Errno.inval|null[0] - enum entry io // okio.internal.preview1/Errno.io|null[0] - enum entry isconn // okio.internal.preview1/Errno.isconn|null[0] - enum entry isdir // okio.internal.preview1/Errno.isdir|null[0] - enum entry loop // okio.internal.preview1/Errno.loop|null[0] - enum entry mfile // okio.internal.preview1/Errno.mfile|null[0] - enum entry mlink // okio.internal.preview1/Errno.mlink|null[0] - enum entry msgsize // okio.internal.preview1/Errno.msgsize|null[0] - enum entry multihop // okio.internal.preview1/Errno.multihop|null[0] - enum entry nametoolong // okio.internal.preview1/Errno.nametoolong|null[0] - enum entry netdown // okio.internal.preview1/Errno.netdown|null[0] - enum entry netreset // okio.internal.preview1/Errno.netreset|null[0] - enum entry netunreach // okio.internal.preview1/Errno.netunreach|null[0] - enum entry nfile // okio.internal.preview1/Errno.nfile|null[0] - enum entry nobufs // okio.internal.preview1/Errno.nobufs|null[0] - enum entry nodev // okio.internal.preview1/Errno.nodev|null[0] - enum entry noent // okio.internal.preview1/Errno.noent|null[0] - enum entry noexec // okio.internal.preview1/Errno.noexec|null[0] - enum entry nolck // okio.internal.preview1/Errno.nolck|null[0] - enum entry nolink // okio.internal.preview1/Errno.nolink|null[0] - enum entry nomem // okio.internal.preview1/Errno.nomem|null[0] - enum entry nomsg // okio.internal.preview1/Errno.nomsg|null[0] - enum entry noprotoopt // okio.internal.preview1/Errno.noprotoopt|null[0] - enum entry nospc // okio.internal.preview1/Errno.nospc|null[0] - enum entry nosys // okio.internal.preview1/Errno.nosys|null[0] - enum entry notcapable // okio.internal.preview1/Errno.notcapable|null[0] - enum entry notconn // okio.internal.preview1/Errno.notconn|null[0] - enum entry notdir // okio.internal.preview1/Errno.notdir|null[0] - enum entry notempty // okio.internal.preview1/Errno.notempty|null[0] - enum entry notrecoverable // okio.internal.preview1/Errno.notrecoverable|null[0] - enum entry notsock // okio.internal.preview1/Errno.notsock|null[0] - enum entry notsup // okio.internal.preview1/Errno.notsup|null[0] - enum entry notty // okio.internal.preview1/Errno.notty|null[0] - enum entry nxio // okio.internal.preview1/Errno.nxio|null[0] - enum entry overflow // okio.internal.preview1/Errno.overflow|null[0] - enum entry ownerdead // okio.internal.preview1/Errno.ownerdead|null[0] - enum entry perm // okio.internal.preview1/Errno.perm|null[0] - enum entry pipe // okio.internal.preview1/Errno.pipe|null[0] - enum entry proto // okio.internal.preview1/Errno.proto|null[0] - enum entry protonosupport // okio.internal.preview1/Errno.protonosupport|null[0] - enum entry prototype_ // okio.internal.preview1/Errno.prototype_|null[0] - enum entry range // okio.internal.preview1/Errno.range|null[0] - enum entry rofs // okio.internal.preview1/Errno.rofs|null[0] - enum entry spipe // okio.internal.preview1/Errno.spipe|null[0] - enum entry srch // okio.internal.preview1/Errno.srch|null[0] - enum entry stale // okio.internal.preview1/Errno.stale|null[0] - enum entry success // okio.internal.preview1/Errno.success|null[0] - enum entry timedout // okio.internal.preview1/Errno.timedout|null[0] - enum entry toobig // okio.internal.preview1/Errno.toobig|null[0] - enum entry txtbsy // okio.internal.preview1/Errno.txtbsy|null[0] - enum entry xdev // okio.internal.preview1/Errno.xdev|null[0] - - final val entries // okio.internal.preview1/Errno.entries|#static{}entries[0] - final fun (): kotlin.enums/EnumEntries // okio.internal.preview1/Errno.entries.|#static(){}[0] - - final fun valueOf(kotlin/String): okio.internal.preview1/Errno // okio.internal.preview1/Errno.valueOf|valueOf#static(kotlin.String){}[0] - final fun values(): kotlin/Array // okio.internal.preview1/Errno.values|values#static(){}[0] -} - -final class okio.internal/ErrnoException : okio/IOException { // okio.internal/ErrnoException|null[0] - constructor (kotlin/Short) // okio.internal/ErrnoException.|(kotlin.Short){}[0] - constructor (okio.internal.preview1/Errno) // okio.internal/ErrnoException.|(okio.internal.preview1.Errno){}[0] - - final val errno // okio.internal/ErrnoException.errno|{}errno[0] - final fun (): okio.internal.preview1/Errno // okio.internal/ErrnoException.errno.|(){}[0] -} - final object okio/WasiFileSystem : okio/FileSystem { // okio/WasiFileSystem|null[0] final fun appendingSink(okio/Path, kotlin/Boolean): okio/Sink // okio/WasiFileSystem.appendingSink|appendingSink(okio.Path;kotlin.Boolean){}[0] final fun atomicMove(okio/Path, okio/Path) // okio/WasiFileSystem.atomicMove|atomicMove(okio.Path;okio.Path){}[0] @@ -116,100 +22,3 @@ final object okio/WasiFileSystem : okio/FileSystem { // okio/WasiFileSystem|null final fun source(okio/Path): okio/Source // okio/WasiFileSystem.source|source(okio.Path){}[0] final fun toString(): kotlin/String // okio/WasiFileSystem.toString|toString(){}[0] } - -final val okio.internal.preview1/fdflags_append // okio.internal.preview1/fdflags_append|{}fdflags_append[0] - final fun (): kotlin/Short // okio.internal.preview1/fdflags_append.|(){}[0] -final val okio.internal.preview1/fdflags_dsync // okio.internal.preview1/fdflags_dsync|{}fdflags_dsync[0] - final fun (): kotlin/Short // okio.internal.preview1/fdflags_dsync.|(){}[0] -final val okio.internal.preview1/fdflags_nonblock // okio.internal.preview1/fdflags_nonblock|{}fdflags_nonblock[0] - final fun (): kotlin/Short // okio.internal.preview1/fdflags_nonblock.|(){}[0] -final val okio.internal.preview1/fdflags_rsync // okio.internal.preview1/fdflags_rsync|{}fdflags_rsync[0] - final fun (): kotlin/Short // okio.internal.preview1/fdflags_rsync.|(){}[0] -final val okio.internal.preview1/fdflags_sync // okio.internal.preview1/fdflags_sync|{}fdflags_sync[0] - final fun (): kotlin/Short // okio.internal.preview1/fdflags_sync.|(){}[0] -final val okio.internal.preview1/filetype_block_device // okio.internal.preview1/filetype_block_device|{}filetype_block_device[0] - final fun (): kotlin/Byte // okio.internal.preview1/filetype_block_device.|(){}[0] -final val okio.internal.preview1/filetype_character_device // okio.internal.preview1/filetype_character_device|{}filetype_character_device[0] - final fun (): kotlin/Byte // okio.internal.preview1/filetype_character_device.|(){}[0] -final val okio.internal.preview1/filetype_directory // okio.internal.preview1/filetype_directory|{}filetype_directory[0] - final fun (): kotlin/Byte // okio.internal.preview1/filetype_directory.|(){}[0] -final val okio.internal.preview1/filetype_regular_file // okio.internal.preview1/filetype_regular_file|{}filetype_regular_file[0] - final fun (): kotlin/Byte // okio.internal.preview1/filetype_regular_file.|(){}[0] -final val okio.internal.preview1/filetype_socket_dgram // okio.internal.preview1/filetype_socket_dgram|{}filetype_socket_dgram[0] - final fun (): kotlin/Byte // okio.internal.preview1/filetype_socket_dgram.|(){}[0] -final val okio.internal.preview1/filetype_socket_stream // okio.internal.preview1/filetype_socket_stream|{}filetype_socket_stream[0] - final fun (): kotlin/Byte // okio.internal.preview1/filetype_socket_stream.|(){}[0] -final val okio.internal.preview1/filetype_symbolic_link // okio.internal.preview1/filetype_symbolic_link|{}filetype_symbolic_link[0] - final fun (): kotlin/Byte // okio.internal.preview1/filetype_symbolic_link.|(){}[0] -final val okio.internal.preview1/filetype_unknown // okio.internal.preview1/filetype_unknown|{}filetype_unknown[0] - final fun (): kotlin/Byte // okio.internal.preview1/filetype_unknown.|(){}[0] -final val okio.internal.preview1/lookupflags_symlink_follow // okio.internal.preview1/lookupflags_symlink_follow|{}lookupflags_symlink_follow[0] - final fun (): kotlin/Int // okio.internal.preview1/lookupflags_symlink_follow.|(){}[0] -final val okio.internal.preview1/oflag_creat // okio.internal.preview1/oflag_creat|{}oflag_creat[0] - final fun (): kotlin/Int // okio.internal.preview1/oflag_creat.|(){}[0] -final val okio.internal.preview1/oflag_directory // okio.internal.preview1/oflag_directory|{}oflag_directory[0] - final fun (): kotlin/Int // okio.internal.preview1/oflag_directory.|(){}[0] -final val okio.internal.preview1/oflag_excl // okio.internal.preview1/oflag_excl|{}oflag_excl[0] - final fun (): kotlin/Int // okio.internal.preview1/oflag_excl.|(){}[0] -final val okio.internal.preview1/oflag_trunc // okio.internal.preview1/oflag_trunc|{}oflag_trunc[0] - final fun (): kotlin/Int // okio.internal.preview1/oflag_trunc.|(){}[0] -final val okio.internal.preview1/right_fd_advise // okio.internal.preview1/right_fd_advise|{}right_fd_advise[0] - final fun (): kotlin/Long // okio.internal.preview1/right_fd_advise.|(){}[0] -final val okio.internal.preview1/right_fd_allocate // okio.internal.preview1/right_fd_allocate|{}right_fd_allocate[0] - final fun (): kotlin/Long // okio.internal.preview1/right_fd_allocate.|(){}[0] -final val okio.internal.preview1/right_fd_datasync // okio.internal.preview1/right_fd_datasync|{}right_fd_datasync[0] - final fun (): kotlin/Long // okio.internal.preview1/right_fd_datasync.|(){}[0] -final val okio.internal.preview1/right_fd_fdstat_set_flags // okio.internal.preview1/right_fd_fdstat_set_flags|{}right_fd_fdstat_set_flags[0] - final fun (): kotlin/Long // okio.internal.preview1/right_fd_fdstat_set_flags.|(){}[0] -final val okio.internal.preview1/right_fd_filestat_get // okio.internal.preview1/right_fd_filestat_get|{}right_fd_filestat_get[0] - final fun (): kotlin/Long // okio.internal.preview1/right_fd_filestat_get.|(){}[0] -final val okio.internal.preview1/right_fd_filestat_set_size // okio.internal.preview1/right_fd_filestat_set_size|{}right_fd_filestat_set_size[0] - final fun (): kotlin/Long // okio.internal.preview1/right_fd_filestat_set_size.|(){}[0] -final val okio.internal.preview1/right_fd_filestat_set_times // okio.internal.preview1/right_fd_filestat_set_times|{}right_fd_filestat_set_times[0] - final fun (): kotlin/Long // okio.internal.preview1/right_fd_filestat_set_times.|(){}[0] -final val okio.internal.preview1/right_fd_read // okio.internal.preview1/right_fd_read|{}right_fd_read[0] - final fun (): kotlin/Long // okio.internal.preview1/right_fd_read.|(){}[0] -final val okio.internal.preview1/right_fd_readdir // okio.internal.preview1/right_fd_readdir|{}right_fd_readdir[0] - final fun (): kotlin/Long // okio.internal.preview1/right_fd_readdir.|(){}[0] -final val okio.internal.preview1/right_fd_seek // okio.internal.preview1/right_fd_seek|{}right_fd_seek[0] - final fun (): kotlin/Long // okio.internal.preview1/right_fd_seek.|(){}[0] -final val okio.internal.preview1/right_fd_sync // okio.internal.preview1/right_fd_sync|{}right_fd_sync[0] - final fun (): kotlin/Long // okio.internal.preview1/right_fd_sync.|(){}[0] -final val okio.internal.preview1/right_fd_tell // okio.internal.preview1/right_fd_tell|{}right_fd_tell[0] - final fun (): kotlin/Long // okio.internal.preview1/right_fd_tell.|(){}[0] -final val okio.internal.preview1/right_fd_write // okio.internal.preview1/right_fd_write|{}right_fd_write[0] - final fun (): kotlin/Long // okio.internal.preview1/right_fd_write.|(){}[0] -final val okio.internal.preview1/right_path_create_directory // okio.internal.preview1/right_path_create_directory|{}right_path_create_directory[0] - final fun (): kotlin/Long // okio.internal.preview1/right_path_create_directory.|(){}[0] -final val okio.internal.preview1/right_path_create_file // okio.internal.preview1/right_path_create_file|{}right_path_create_file[0] - final fun (): kotlin/Long // okio.internal.preview1/right_path_create_file.|(){}[0] -final val okio.internal.preview1/right_path_filestat_get // okio.internal.preview1/right_path_filestat_get|{}right_path_filestat_get[0] - final fun (): kotlin/Long // okio.internal.preview1/right_path_filestat_get.|(){}[0] -final val okio.internal.preview1/right_path_filestat_set_size // okio.internal.preview1/right_path_filestat_set_size|{}right_path_filestat_set_size[0] - final fun (): kotlin/Long // okio.internal.preview1/right_path_filestat_set_size.|(){}[0] -final val okio.internal.preview1/right_path_filestat_set_times // okio.internal.preview1/right_path_filestat_set_times|{}right_path_filestat_set_times[0] - final fun (): kotlin/Long // okio.internal.preview1/right_path_filestat_set_times.|(){}[0] -final val okio.internal.preview1/right_path_link_source // okio.internal.preview1/right_path_link_source|{}right_path_link_source[0] - final fun (): kotlin/Long // okio.internal.preview1/right_path_link_source.|(){}[0] -final val okio.internal.preview1/right_path_link_target // okio.internal.preview1/right_path_link_target|{}right_path_link_target[0] - final fun (): kotlin/Long // okio.internal.preview1/right_path_link_target.|(){}[0] -final val okio.internal.preview1/right_path_open // okio.internal.preview1/right_path_open|{}right_path_open[0] - final fun (): kotlin/Long // okio.internal.preview1/right_path_open.|(){}[0] -final val okio.internal.preview1/right_path_readlink // okio.internal.preview1/right_path_readlink|{}right_path_readlink[0] - final fun (): kotlin/Long // okio.internal.preview1/right_path_readlink.|(){}[0] -final val okio.internal.preview1/right_path_remove_directory // okio.internal.preview1/right_path_remove_directory|{}right_path_remove_directory[0] - final fun (): kotlin/Long // okio.internal.preview1/right_path_remove_directory.|(){}[0] -final val okio.internal.preview1/right_path_rename_source // okio.internal.preview1/right_path_rename_source|{}right_path_rename_source[0] - final fun (): kotlin/Long // okio.internal.preview1/right_path_rename_source.|(){}[0] -final val okio.internal.preview1/right_path_rename_target // okio.internal.preview1/right_path_rename_target|{}right_path_rename_target[0] - final fun (): kotlin/Long // okio.internal.preview1/right_path_rename_target.|(){}[0] -final val okio.internal.preview1/right_path_symlink // okio.internal.preview1/right_path_symlink|{}right_path_symlink[0] - final fun (): kotlin/Long // okio.internal.preview1/right_path_symlink.|(){}[0] -final val okio.internal.preview1/right_path_unlink_file // okio.internal.preview1/right_path_unlink_file|{}right_path_unlink_file[0] - final fun (): kotlin/Long // okio.internal.preview1/right_path_unlink_file.|(){}[0] -final val okio.internal.preview1/right_poll_fd_readwrite // okio.internal.preview1/right_poll_fd_readwrite|{}right_poll_fd_readwrite[0] - final fun (): kotlin/Long // okio.internal.preview1/right_poll_fd_readwrite.|(){}[0] -final val okio.internal.preview1/right_sock_accept // okio.internal.preview1/right_sock_accept|{}right_sock_accept[0] - final fun (): kotlin/Long // okio.internal.preview1/right_sock_accept.|(){}[0] -final val okio.internal.preview1/right_sock_shutdown // okio.internal.preview1/right_sock_shutdown|{}right_sock_shutdown[0] - final fun (): kotlin/Long // okio.internal.preview1/right_sock_shutdown.|(){}[0] diff --git a/okio-wasifilesystem/src/wasmWasiMain/kotlin/okio/internal/ErrnoException.kt b/okio-wasifilesystem/src/wasmWasiMain/kotlin/okio/internal/ErrnoException.kt index fb3aa2ac84..e2aabf2227 100644 --- a/okio-wasifilesystem/src/wasmWasiMain/kotlin/okio/internal/ErrnoException.kt +++ b/okio-wasifilesystem/src/wasmWasiMain/kotlin/okio/internal/ErrnoException.kt @@ -19,7 +19,7 @@ import okio.IOException import okio.internal.preview1.Errno import okio.internal.preview1.errno -class ErrnoException( +internal class ErrnoException( val errno: Errno, ) : IOException(errno.name) { constructor(errno: errno) : this(Errno.entries[errno.toInt()]) diff --git a/okio-wasifilesystem/src/wasmWasiMain/kotlin/okio/internal/preview1/Errno.kt b/okio-wasifilesystem/src/wasmWasiMain/kotlin/okio/internal/preview1/Errno.kt index bc5a4555ab..b8f7b20436 100644 --- a/okio-wasifilesystem/src/wasmWasiMain/kotlin/okio/internal/preview1/Errno.kt +++ b/okio-wasifilesystem/src/wasmWasiMain/kotlin/okio/internal/preview1/Errno.kt @@ -4,7 +4,7 @@ package okio.internal.preview1 @Suppress("ktlint:enum-entry-name-case") -enum class Errno { +internal enum class Errno { /** `success`: No error occurred. System call completed successfully. */ success, diff --git a/okio-wasifilesystem/src/wasmWasiMain/kotlin/okio/internal/preview1/Fdflags.kt b/okio-wasifilesystem/src/wasmWasiMain/kotlin/okio/internal/preview1/Fdflags.kt index 5c3bf21754..63f480e24a 100644 --- a/okio-wasifilesystem/src/wasmWasiMain/kotlin/okio/internal/preview1/Fdflags.kt +++ b/okio-wasifilesystem/src/wasmWasiMain/kotlin/okio/internal/preview1/Fdflags.kt @@ -8,19 +8,19 @@ package okio.internal.preview1 * * File descriptor flags. */ -typealias fdflags = Short +internal typealias fdflags = Short /** Data written to the file is always appended to the file's end. */ -val fdflags_append: Short = (1 shl 0).toShort() +internal val fdflags_append: Short = (1 shl 0).toShort() /** Write according to synchronized I/O data integrity completion. Only the data stored in the file is synchronized. */ -val fdflags_dsync: Short = (1 shl 1).toShort() +internal val fdflags_dsync: Short = (1 shl 1).toShort() /** Non-blocking mode. */ -val fdflags_nonblock: Short = (1 shl 2).toShort() +internal val fdflags_nonblock: Short = (1 shl 2).toShort() /** Synchronized read I/O operations. */ -val fdflags_rsync: Short = (1 shl 3).toShort() +internal val fdflags_rsync: Short = (1 shl 3).toShort() /** Write according to synchronized I/O file integrity completion. In addition to synchronizing the data stored in the file, the implementation may also synchronously update the file's metadata. */ -val fdflags_sync: Short = (1 shl 4).toShort() +internal val fdflags_sync: Short = (1 shl 4).toShort() diff --git a/okio-wasifilesystem/src/wasmWasiMain/kotlin/okio/internal/preview1/Filetype.kt b/okio-wasifilesystem/src/wasmWasiMain/kotlin/okio/internal/preview1/Filetype.kt index f4788b3683..65fb649e2b 100644 --- a/okio-wasifilesystem/src/wasmWasiMain/kotlin/okio/internal/preview1/Filetype.kt +++ b/okio-wasifilesystem/src/wasmWasiMain/kotlin/okio/internal/preview1/Filetype.kt @@ -8,28 +8,28 @@ package okio.internal.preview1 * * The type of a file descriptor or file. */ -typealias filetype = Byte +internal typealias filetype = Byte /** The type of the file descriptor or file is unknown or is different from any of the other types specified. */ -val filetype_unknown: filetype = 0 +internal val filetype_unknown: filetype = 0 /** The file descriptor or file refers to a block device inode. */ -val filetype_block_device: filetype = 1 +internal val filetype_block_device: filetype = 1 /** The file descriptor or file refers to a character device inode. */ -val filetype_character_device: filetype = 2 +internal val filetype_character_device: filetype = 2 /** The file descriptor or file refers to a directory inode. */ -val filetype_directory: filetype = 3 +internal val filetype_directory: filetype = 3 /** The file descriptor or file refers to a regular file inode. */ -val filetype_regular_file: filetype = 4 +internal val filetype_regular_file: filetype = 4 /** The file descriptor or file refers to a datagram socket. */ -val filetype_socket_dgram: filetype = 5 +internal val filetype_socket_dgram: filetype = 5 /** The file descriptor or file refers to a byte-stream socket. */ -val filetype_socket_stream: filetype = 6 +internal val filetype_socket_stream: filetype = 6 /** The file refers to a symbolic link inode. */ -val filetype_symbolic_link: filetype = 7 +internal val filetype_symbolic_link: filetype = 7 diff --git a/okio-wasifilesystem/src/wasmWasiMain/kotlin/okio/internal/preview1/LookupFlags.kt b/okio-wasifilesystem/src/wasmWasiMain/kotlin/okio/internal/preview1/LookupFlags.kt index 5608f44529..256c2bedb1 100644 --- a/okio-wasifilesystem/src/wasmWasiMain/kotlin/okio/internal/preview1/LookupFlags.kt +++ b/okio-wasifilesystem/src/wasmWasiMain/kotlin/okio/internal/preview1/LookupFlags.kt @@ -11,7 +11,7 @@ package okio.internal.preview1 * Bit0: * symlink_follow: */ -typealias lookupflags = Int +internal typealias lookupflags = Int /** As long as the resolved path corresponds to a symbolic link, it is expanded. */ -val lookupflags_symlink_follow = 1 shl 0 +internal val lookupflags_symlink_follow = 1 shl 0 diff --git a/okio-wasifilesystem/src/wasmWasiMain/kotlin/okio/internal/preview1/OFlags.kt b/okio-wasifilesystem/src/wasmWasiMain/kotlin/okio/internal/preview1/OFlags.kt index 3efeb7641d..ebccdda594 100644 --- a/okio-wasifilesystem/src/wasmWasiMain/kotlin/okio/internal/preview1/OFlags.kt +++ b/okio-wasifilesystem/src/wasmWasiMain/kotlin/okio/internal/preview1/OFlags.kt @@ -8,16 +8,16 @@ package okio.internal.preview1 * * Open flags used by path_open. */ -typealias oflags = Int +internal typealias oflags = Int /** Create file if it does not exist. */ -val oflag_creat = 1 shl 0 +internal val oflag_creat = 1 shl 0 /** Fail if not a directory. */ -val oflag_directory = 1 shl 1 +internal val oflag_directory = 1 shl 1 /** Fail if file already exists. */ -val oflag_excl = 1 shl 2 +internal val oflag_excl = 1 shl 2 /** Truncate file to size 0. */ -val oflag_trunc = 1 shl 3 +internal val oflag_trunc = 1 shl 3 diff --git a/okio-wasifilesystem/src/wasmWasiMain/kotlin/okio/internal/preview1/Preview1.kt b/okio-wasifilesystem/src/wasmWasiMain/kotlin/okio/internal/preview1/Preview1.kt index 4183c6a851..b0cfe11a52 100644 --- a/okio-wasifilesystem/src/wasmWasiMain/kotlin/okio/internal/preview1/Preview1.kt +++ b/okio-wasifilesystem/src/wasmWasiMain/kotlin/okio/internal/preview1/Preview1.kt @@ -4,14 +4,14 @@ package okio.internal.preview1 /** `u32`. */ -typealias size = Int +internal typealias size = Int /** * `Handle`. * * A file descriptor handle. */ -typealias fd = Int +internal typealias fd = Int /** * `u64`. @@ -20,7 +20,7 @@ typealias fd = Int * * The value 0 signifies the start of the directory. */ -typealias dircookie = Long +internal typealias dircookie = Long /** * `Variant`. @@ -29,26 +29,26 @@ typealias dircookie = Long * provided by this API; some are used in higher-level library layers, and others are provided * merely for alignment with POSIX. */ -typealias errno = Short +internal typealias errno = Short /** * `u64`. * * File serial number that is unique within its file system. */ -typealias inode = Long +internal typealias inode = Long /** * `u32`. * * The type for the [`dirent::d_namlen`](#dirent.d_namlen) field of [`dirent`](#dirent) struct. */ -typealias dirnamelen = Int +internal typealias dirnamelen = Int /** * `Pointer`. */ -typealias PointerU8 = Int +internal typealias PointerU8 = Int /** * path_create_directory(fd: fd, path: string) -> Result<(), errno> diff --git a/okio-wasifilesystem/src/wasmWasiMain/kotlin/okio/internal/preview1/Rights.kt b/okio-wasifilesystem/src/wasmWasiMain/kotlin/okio/internal/preview1/Rights.kt index b72f26f44f..b111eda2b0 100644 --- a/okio-wasifilesystem/src/wasmWasiMain/kotlin/okio/internal/preview1/Rights.kt +++ b/okio-wasifilesystem/src/wasmWasiMain/kotlin/okio/internal/preview1/Rights.kt @@ -4,86 +4,86 @@ package okio.internal.preview1 /** `rights: Record`. */ -typealias rights = Long +internal typealias rights = Long /** * The right to invoke [`fd_datasync`](#fd_datasync)0 * If [`path_open`](#path_open) is set, includes the right to invoke * [`path_open`](#path_open) with [`fdflags::dsync`](#fdflags.dsync). */ -val right_fd_datasync = 1L shl 0 +internal val right_fd_datasync = 1L shl 0 /** * The right to invoke [`fd_read`](#fd_read) and [`sock_recv`](#sock_recv). * If [`rights::fd_seek`](#rights.fd_seek) is set, includes the right to invoke [`fd_pread`](#fd_pread). */ -val right_fd_read = 1L shl 1 +internal val right_fd_read = 1L shl 1 /** The right to invoke [`fd_seek`](#fd_seek). This flag implies [`rights::fd_tell`](#rights.fd_tell). */ -val right_fd_seek = 1L shl 2 +internal val right_fd_seek = 1L shl 2 /** The right to invoke [`fd_fdstat_set_flags`](#fd_fdstat_set_flags). */ -val right_fd_fdstat_set_flags = 1L shl 3 +internal val right_fd_fdstat_set_flags = 1L shl 3 /** * The right to invoke [`fd_sync`](#fd_sync). * If [`path_open`](#path_open) is set, includes the right to invoke * [`path_open`](#path_open) with [`fdflags::rsync`](#fdflags.rsync) and [`fdflags::dsync`](#fdflags.dsync). */ -val right_fd_sync = 1L shl 4 +internal val right_fd_sync = 1L shl 4 /** * The right to invoke [`fd_seek`](#fd_seek) in such a way that the file offset * remains unaltered (i.e., [`whence::cur`](#whence.cur) with offset zero), or to * invoke [`fd_tell`](#fd_tell). */ -val right_fd_tell = 1L shl 5 +internal val right_fd_tell = 1L shl 5 /** * The right to invoke [`fd_write`](#fd_write) and [`sock_send`](#sock_send). * If [`rights::fd_seek`](#rights.fd_seek) is set, includes the right to invoke [`fd_pwrite`](#fd_pwrite). */ -val right_fd_write = 1L shl 6 +internal val right_fd_write = 1L shl 6 /** The right to invoke [`fd_advise`](#fd_advise). */ -val right_fd_advise = 1L shl 7 +internal val right_fd_advise = 1L shl 7 /** The right to invoke [`fd_allocate`](#fd_allocate). */ -val right_fd_allocate = 1L shl 8 +internal val right_fd_allocate = 1L shl 8 /** The right to invoke [`path_create_directory`](#path_create_directory). */ -val right_path_create_directory = 1L shl 9 +internal val right_path_create_directory = 1L shl 9 /** If [`path_open`](#path_open) is set, the right to invoke [`path_open`](#path_open) with [`oflags::creat`](#oflags.creat). */ -val right_path_create_file = 1L shl 10 +internal val right_path_create_file = 1L shl 10 /** * The right to invoke [`path_link`](#path_link) with the file descriptor as the * source directory. */ -val right_path_link_source = 1L shl 11 +internal val right_path_link_source = 1L shl 11 /** The right to invoke [`path_link`](#path_link) with the file descriptor as the target directory. */ -val right_path_link_target = 1L shl 12 +internal val right_path_link_target = 1L shl 12 /** The right to invoke [`path_open`](#path_open). */ -val right_path_open = 1L shl 13 +internal val right_path_open = 1L shl 13 /** The right to invoke [`fd_readdir`](#fd_readdir). */ -val right_fd_readdir = 1L shl 14 +internal val right_fd_readdir = 1L shl 14 /** The right to invoke [`path_readlink`](#path_readlink). */ -val right_path_readlink = 1L shl 15 +internal val right_path_readlink = 1L shl 15 /** The right to invoke [`path_rename`](#path_rename) with the file descriptor as the source directory. */ -val right_path_rename_source = 1L shl 16 +internal val right_path_rename_source = 1L shl 16 /** The right to invoke [`path_rename`](#path_rename) with the file descriptor as the target directory. */ -val right_path_rename_target = 1L shl 17 +internal val right_path_rename_target = 1L shl 17 /** The right to invoke [`path_filestat_get`](#path_filestat_get). */ -val right_path_filestat_get = 1L shl 18 +internal val right_path_filestat_get = 1L shl 18 /** * The right to change a file's size. @@ -94,37 +94,37 @@ val right_path_filestat_get = 1L shl 18 * no use cases for it since no code written for POSIX systems would use it. * Moreover, implementing it would require multiple syscalls, leading to inferior performance. */ -val right_path_filestat_set_size = 1L shl 19 +internal val right_path_filestat_set_size = 1L shl 19 /** The right to invoke [`path_filestat_set_times`](#path_filestat_set_times). */ -val right_path_filestat_set_times = 1L shl 20 +internal val right_path_filestat_set_times = 1L shl 20 /** The right to invoke [`fd_filestat_get`](#fd_filestat_get). */ -val right_fd_filestat_get = 1L shl 21 +internal val right_fd_filestat_get = 1L shl 21 /** The right to invoke [`fd_filestat_set_size`](#fd_filestat_set_size). */ -val right_fd_filestat_set_size = 1L shl 22 +internal val right_fd_filestat_set_size = 1L shl 22 /** The right to invoke [`fd_filestat_set_times`](#fd_filestat_set_times). */ -val right_fd_filestat_set_times = 1L shl 23 +internal val right_fd_filestat_set_times = 1L shl 23 /** The right to invoke [`path_symlink`](#path_symlink). */ -val right_path_symlink = 1L shl 24 +internal val right_path_symlink = 1L shl 24 /** The right to invoke [`path_remove_directory`](#path_remove_directory). */ -val right_path_remove_directory = 1L shl 25 +internal val right_path_remove_directory = 1L shl 25 /** The right to invoke [`path_unlink_file`](#path_unlink_file). */ -val right_path_unlink_file = 1L shl 26 +internal val right_path_unlink_file = 1L shl 26 /** * If [`rights::fd_read`](#rights.fd_read) is set, includes the right to invoke [`poll_oneoff`](#poll_oneoff) to subscribe to [`eventtype::fd_read`](#eventtype.fd_read). * If [`rights::fd_write`](#rights.fd_write) is set, includes the right to invoke [`poll_oneoff`](#poll_oneoff) to subscribe to [`eventtype::fd_write`](#eventtype.fd_write). */ -val right_poll_fd_readwrite = 1L shl 27 +internal val right_poll_fd_readwrite = 1L shl 27 /** The right to invoke [`sock_shutdown`](#sock_shutdown). */ -val right_sock_shutdown = 1L shl 28 +internal val right_sock_shutdown = 1L shl 28 /** The right to invoke [`sock_accept`](#sock_accept). */ -val right_sock_accept = 1L shl 29 +internal val right_sock_accept = 1L shl 29 diff --git a/okio/api/okio.api b/okio/api/okio.api index 924e95f866..de0bf0caa4 100644 --- a/okio/api/okio.api +++ b/okio/api/okio.api @@ -860,9 +860,3 @@ 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/api/okio.klib.api b/okio/api/okio.klib.api index 5d683df877..5effa9a883 100644 --- a/okio/api/okio.klib.api +++ b/okio/api/okio.klib.api @@ -569,8 +569,6 @@ open class okio/Timeout { // okio/Timeout|null[0] } } -final fun (kotlin/ByteArray).okio.internal/commonToUtf8String(kotlin/Int = ..., kotlin/Int = ...): kotlin/String // okio.internal/commonToUtf8String|commonToUtf8String@kotlin.ByteArray(kotlin.Int;kotlin.Int){}[0] -final fun (kotlin/String).okio.internal/commonAsUtf8ToByteArray(): kotlin/ByteArray // okio.internal/commonAsUtf8ToByteArray|commonAsUtf8ToByteArray@kotlin.String(){}[0] final fun (kotlin/String).okio/utf8Size(kotlin/Int = ..., kotlin/Int = ...): kotlin/Long // okio/utf8Size|utf8Size@kotlin.String(kotlin.Int;kotlin.Int){}[0] final fun (okio/Sink).okio/buffer(): okio/BufferedSink // okio/buffer|buffer@okio.Sink(){}[0] final fun (okio/Source).okio/buffer(): okio/BufferedSource // okio/buffer|buffer@okio.Source(){}[0] @@ -593,16 +591,6 @@ final inline fun <#A: okio/BufferedSink> (#A).okio/writeUShort(kotlin/UShort): # final inline fun <#A: okio/BufferedSink> (#A).okio/writeUShortLe(kotlin/UShort): #A // okio/writeUShortLe|writeUShortLe@0:0(kotlin.UShort){0§}[0] final inline fun <#A: okio/Closeable?, #B: kotlin/Any?> (#A).okio/use(kotlin/Function1<#A, #B>): #B // okio/use|use@0:0(kotlin.Function1<0:0,0:1>){0§;1§}[0] -// Targets: [native] -final class okio.internal/CRC32 { // okio.internal/CRC32|null[0] - constructor () // okio.internal/CRC32.|(){}[0] - - final fun getValue(): kotlin/Long // okio.internal/CRC32.getValue|getValue(){}[0] - final fun reset() // okio.internal/CRC32.reset|reset(){}[0] - final fun update(kotlin/ByteArray) // okio.internal/CRC32.update|update(kotlin.ByteArray){}[0] - final fun update(kotlin/ByteArray, kotlin/Int, kotlin/Int) // okio.internal/CRC32.update|update(kotlin.ByteArray;kotlin.Int;kotlin.Int){}[0] -} - // Targets: [native] final class okio/Deflater { // okio/Deflater|null[0] constructor () // okio/Deflater.|(){}[0] diff --git a/okio/jvm/jmh/src/jmh/java/com/squareup/okio/benchmarks/BenchmarkUtils.kt b/okio/jvm/jmh/src/jmh/java/com/squareup/okio/benchmarks/BenchmarkUtils.kt index 5c7b81166a..4b9ed8a273 100644 --- a/okio/jvm/jmh/src/jmh/java/com/squareup/okio/benchmarks/BenchmarkUtils.kt +++ b/okio/jvm/jmh/src/jmh/java/com/squareup/okio/benchmarks/BenchmarkUtils.kt @@ -13,6 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +@file:Suppress( + "CANNOT_OVERRIDE_INVISIBLE_MEMBER", + "INVISIBLE_MEMBER", + "INVISIBLE_REFERENCE", +) package com.squareup.okio.benchmarks import okio.internal.commonAsUtf8ToByteArray diff --git a/okio/src/commonMain/kotlin/okio/internal/-Utf8.kt b/okio/src/commonMain/kotlin/okio/internal/-Utf8.kt index 865ff2c1f2..3e8eb65ea2 100644 --- a/okio/src/commonMain/kotlin/okio/internal/-Utf8.kt +++ b/okio/src/commonMain/kotlin/okio/internal/-Utf8.kt @@ -24,7 +24,7 @@ import okio.processUtf8Bytes // to everything else. Putting them in this file, `-Utf8.kt`, makes them invisible to // Java but still visible to Kotlin. -fun ByteArray.commonToUtf8String(beginIndex: Int = 0, endIndex: Int = size): String { +internal fun ByteArray.commonToUtf8String(beginIndex: Int = 0, endIndex: Int = size): String { if (beginIndex < 0 || endIndex > size || beginIndex > endIndex) { throw ArrayIndexOutOfBoundsException("size=$size beginIndex=$beginIndex endIndex=$endIndex") } @@ -38,7 +38,7 @@ fun ByteArray.commonToUtf8String(beginIndex: Int = 0, endIndex: Int = size): Str return chars.concatToString(0, length) } -fun String.commonAsUtf8ToByteArray(): ByteArray { +internal fun String.commonAsUtf8ToByteArray(): ByteArray { val bytes = ByteArray(4 * length) // Assume ASCII until a UTF-8 code point is observed. This is ugly but yields diff --git a/okio/src/nativeMain/kotlin/okio/internal/CRC32.kt b/okio/src/nativeMain/kotlin/okio/internal/CRC32.kt index 4abe072336..42ff9a79fc 100644 --- a/okio/src/nativeMain/kotlin/okio/internal/CRC32.kt +++ b/okio/src/nativeMain/kotlin/okio/internal/CRC32.kt @@ -23,7 +23,7 @@ import platform.zlib.crc32 import platform.zlib.uBytefVar @OptIn(UnsafeNumber::class) -actual class CRC32 { +internal actual class CRC32 { private var crc = crc32(0u, null, 0u) actual fun update(content: ByteArray, offset: Int, byteCount: Int) { diff --git a/okio/src/zlibMain/kotlin/okio/internal/CRC32.kt b/okio/src/zlibMain/kotlin/okio/internal/CRC32.kt index a987fda131..2105c84e18 100644 --- a/okio/src/zlibMain/kotlin/okio/internal/CRC32.kt +++ b/okio/src/zlibMain/kotlin/okio/internal/CRC32.kt @@ -15,7 +15,7 @@ */ package okio.internal -expect class CRC32() { +internal expect class CRC32() { fun update(content: ByteArray, offset: Int, byteCount: Int) fun update(content: ByteArray) fun getValue(): Long From 94c6ebd28bbcaaa160b0ccd1c228ccd6cf31bbc0 Mon Sep 17 00:00:00 2001 From: Jesse Wilson Date: Tue, 28 Jul 2026 14:15:01 -0400 Subject: [PATCH 2/2] Spotless --- .../src/jmh/java/com/squareup/okio/benchmarks/BenchmarkUtils.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/okio/jvm/jmh/src/jmh/java/com/squareup/okio/benchmarks/BenchmarkUtils.kt b/okio/jvm/jmh/src/jmh/java/com/squareup/okio/benchmarks/BenchmarkUtils.kt index 4b9ed8a273..c5740a5e73 100644 --- a/okio/jvm/jmh/src/jmh/java/com/squareup/okio/benchmarks/BenchmarkUtils.kt +++ b/okio/jvm/jmh/src/jmh/java/com/squareup/okio/benchmarks/BenchmarkUtils.kt @@ -18,6 +18,7 @@ "INVISIBLE_MEMBER", "INVISIBLE_REFERENCE", ) + package com.squareup.okio.benchmarks import okio.internal.commonAsUtf8ToByteArray