From 2e030f213b48e5ef28c4828e6dbee0d38673a851 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Tue, 19 Sep 2023 13:47:21 +0200 Subject: [PATCH] [stdlib] Explicit visibility and return types: JVM --- libraries/stdlib/jdk7/src/kotlin/AutoCloseableJVM.kt | 2 +- libraries/stdlib/jdk7/src/kotlin/io/path/PathUtils.kt | 2 +- .../jvm/runtime/kotlin/KotlinNullPointerException.kt | 4 ++-- .../jvm/runtime/kotlin/NoWhenBranchMatchedException.kt | 8 ++++---- libraries/stdlib/jvm/runtime/kotlin/TypeCastException.kt | 4 ++-- .../kotlin/UninitializedPropertyAccessException.kt | 8 ++++---- .../kotlin/jvm/KotlinReflectionNotSupportedError.kt | 8 ++++---- .../jvm/runtime/kotlin/jvm/internal/CollectionToArray.kt | 4 ++-- libraries/stdlib/jvm/src/kotlin/concurrent/Timer.kt | 2 +- .../jvm/src/kotlin/internal/PlatformImplementations.kt | 2 +- libraries/stdlib/jvm/src/kotlin/io/Closeable.kt | 2 +- libraries/stdlib/jvm/src/kotlin/io/Console.kt | 2 +- libraries/stdlib/jvm/src/kotlin/jvm/JvmDefault.kt | 6 +++--- libraries/stdlib/jvm/src/kotlin/reflect/KVisibility.kt | 2 +- libraries/stdlib/jvm/src/kotlin/text/CharCategoryJVM.kt | 2 +- libraries/stdlib/jvm/src/kotlin/text/StringBuilderJVM.kt | 2 +- libraries/stdlib/jvm/src/kotlin/text/regex/Regex.kt | 2 +- 17 files changed, 31 insertions(+), 31 deletions(-) diff --git a/libraries/stdlib/jdk7/src/kotlin/AutoCloseableJVM.kt b/libraries/stdlib/jdk7/src/kotlin/AutoCloseableJVM.kt index 027417eaabb..96376949f32 100644 --- a/libraries/stdlib/jdk7/src/kotlin/AutoCloseableJVM.kt +++ b/libraries/stdlib/jdk7/src/kotlin/AutoCloseableJVM.kt @@ -41,7 +41,7 @@ public actual inline fun T.use(block: (T) -> R @SinceKotlin("1.2") @PublishedApi -internal fun java.lang.AutoCloseable?.closeFinally(cause: Throwable?) = when { +internal fun java.lang.AutoCloseable?.closeFinally(cause: Throwable?): Unit = when { this == null -> {} cause == null -> close() else -> diff --git a/libraries/stdlib/jdk7/src/kotlin/io/path/PathUtils.kt b/libraries/stdlib/jdk7/src/kotlin/io/path/PathUtils.kt index a9ad3be8fce..00abc909806 100644 --- a/libraries/stdlib/jdk7/src/kotlin/io/path/PathUtils.kt +++ b/libraries/stdlib/jdk7/src/kotlin/io/path/PathUtils.kt @@ -482,7 +482,7 @@ public inline fun Path.deleteExisting() { @WasExperimental(ExperimentalPathApi::class) @Throws(IOException::class) @kotlin.internal.InlineOnly -public inline fun Path.deleteIfExists() = +public inline fun Path.deleteIfExists(): Boolean = Files.deleteIfExists(this) /** diff --git a/libraries/stdlib/jvm/runtime/kotlin/KotlinNullPointerException.kt b/libraries/stdlib/jvm/runtime/kotlin/KotlinNullPointerException.kt index f57fbdf12e4..0f634f79a16 100644 --- a/libraries/stdlib/jvm/runtime/kotlin/KotlinNullPointerException.kt +++ b/libraries/stdlib/jvm/runtime/kotlin/KotlinNullPointerException.kt @@ -6,7 +6,7 @@ package kotlin public open class KotlinNullPointerException : NullPointerException { - constructor() + public constructor() - constructor(message: String?) : super(message) + public constructor(message: String?) : super(message) } diff --git a/libraries/stdlib/jvm/runtime/kotlin/NoWhenBranchMatchedException.kt b/libraries/stdlib/jvm/runtime/kotlin/NoWhenBranchMatchedException.kt index 7a20844dd15..54b80a60b38 100644 --- a/libraries/stdlib/jvm/runtime/kotlin/NoWhenBranchMatchedException.kt +++ b/libraries/stdlib/jvm/runtime/kotlin/NoWhenBranchMatchedException.kt @@ -6,11 +6,11 @@ package kotlin public actual open class NoWhenBranchMatchedException : RuntimeException { - actual constructor() + public actual constructor() - actual constructor(message: String?) : super(message) + public actual constructor(message: String?) : super(message) - actual constructor(message: String?, cause: Throwable?) : super(message, cause) + public actual constructor(message: String?, cause: Throwable?) : super(message, cause) - actual constructor(cause: Throwable?) : super(cause) + public actual constructor(cause: Throwable?) : super(cause) } diff --git a/libraries/stdlib/jvm/runtime/kotlin/TypeCastException.kt b/libraries/stdlib/jvm/runtime/kotlin/TypeCastException.kt index 5bf72bf3c75..b193b71eb9e 100644 --- a/libraries/stdlib/jvm/runtime/kotlin/TypeCastException.kt +++ b/libraries/stdlib/jvm/runtime/kotlin/TypeCastException.kt @@ -6,7 +6,7 @@ package kotlin public open class TypeCastException : ClassCastException { - constructor() + public constructor() - constructor(message: String?) : super(message) + public constructor(message: String?) : super(message) } diff --git a/libraries/stdlib/jvm/runtime/kotlin/UninitializedPropertyAccessException.kt b/libraries/stdlib/jvm/runtime/kotlin/UninitializedPropertyAccessException.kt index 28319b985e2..d9a12c62b23 100644 --- a/libraries/stdlib/jvm/runtime/kotlin/UninitializedPropertyAccessException.kt +++ b/libraries/stdlib/jvm/runtime/kotlin/UninitializedPropertyAccessException.kt @@ -6,11 +6,11 @@ package kotlin public actual class UninitializedPropertyAccessException : RuntimeException { - actual constructor() + public actual constructor() - actual constructor(message: String?) : super(message) + public actual constructor(message: String?) : super(message) - actual constructor(message: String?, cause: Throwable?) : super(message, cause) + public actual constructor(message: String?, cause: Throwable?) : super(message, cause) - actual constructor(cause: Throwable?) : super(cause) + public actual constructor(cause: Throwable?) : super(cause) } diff --git a/libraries/stdlib/jvm/runtime/kotlin/jvm/KotlinReflectionNotSupportedError.kt b/libraries/stdlib/jvm/runtime/kotlin/jvm/KotlinReflectionNotSupportedError.kt index b719ffd5ced..73e7d1408ab 100644 --- a/libraries/stdlib/jvm/runtime/kotlin/jvm/KotlinReflectionNotSupportedError.kt +++ b/libraries/stdlib/jvm/runtime/kotlin/jvm/KotlinReflectionNotSupportedError.kt @@ -8,11 +8,11 @@ package kotlin.jvm import java.lang.Error public open class KotlinReflectionNotSupportedError : Error { - constructor() : super("Kotlin reflection implementation is not found at runtime. Make sure you have kotlin-reflect.jar in the classpath") + public constructor() : super("Kotlin reflection implementation is not found at runtime. Make sure you have kotlin-reflect.jar in the classpath") - constructor(message: String?) : super(message) + public constructor(message: String?) : super(message) - constructor(message: String?, cause: Throwable?) : super(message, cause) + public constructor(message: String?, cause: Throwable?) : super(message, cause) - constructor(cause: Throwable?) : super(cause) + public constructor(cause: Throwable?) : super(cause) } diff --git a/libraries/stdlib/jvm/runtime/kotlin/jvm/internal/CollectionToArray.kt b/libraries/stdlib/jvm/runtime/kotlin/jvm/internal/CollectionToArray.kt index 502ba26572e..382788bd763 100644 --- a/libraries/stdlib/jvm/runtime/kotlin/jvm/internal/CollectionToArray.kt +++ b/libraries/stdlib/jvm/runtime/kotlin/jvm/internal/CollectionToArray.kt @@ -18,7 +18,7 @@ private const val MAX_SIZE = Int.MAX_VALUE - 2 // empirically maximal array size @Deprecated("This function will be made internal in a future release") @DeprecatedSinceKotlin(warningSince = "1.9") @JvmName("toArray") -fun collectionToArray(collection: Collection<*>): Array = +public fun collectionToArray(collection: Collection<*>): Array = toArrayImpl( collection, empty = { EMPTY }, @@ -31,7 +31,7 @@ fun collectionToArray(collection: Collection<*>): Array = @Deprecated("This function will be made internal in a future release") @DeprecatedSinceKotlin(warningSince = "1.9") @JvmName("toArray") -fun collectionToArray(collection: Collection<*>, a: Array?): Array { +public fun collectionToArray(collection: Collection<*>, a: Array?): Array { // Collection.toArray contract requires that NullPointerException is thrown when array is null if (a == null) throw JavaNPE() return toArrayImpl( diff --git a/libraries/stdlib/jvm/src/kotlin/concurrent/Timer.kt b/libraries/stdlib/jvm/src/kotlin/concurrent/Timer.kt index 36bcce1f782..505eaeb3854 100644 --- a/libraries/stdlib/jvm/src/kotlin/concurrent/Timer.kt +++ b/libraries/stdlib/jvm/src/kotlin/concurrent/Timer.kt @@ -79,7 +79,7 @@ public inline fun Timer.scheduleAtFixedRate(time: Date, period: Long, crossinlin // exposed as public @PublishedApi -internal fun timer(name: String?, daemon: Boolean) = if (name == null) Timer(daemon) else Timer(name, daemon) +internal fun timer(name: String?, daemon: Boolean): Timer = if (name == null) Timer(daemon) else Timer(name, daemon) /** * Creates a timer that executes the specified [action] periodically, starting after the specified [initialDelay] diff --git a/libraries/stdlib/jvm/src/kotlin/internal/PlatformImplementations.kt b/libraries/stdlib/jvm/src/kotlin/internal/PlatformImplementations.kt index 81bdd41e90c..b3ba3583a8c 100644 --- a/libraries/stdlib/jvm/src/kotlin/internal/PlatformImplementations.kt +++ b/libraries/stdlib/jvm/src/kotlin/internal/PlatformImplementations.kt @@ -74,5 +74,5 @@ private inline fun castToBaseType(instance: Any): T { */ @PublishedApi @SinceKotlin("1.2") -internal fun apiVersionIsAtLeast(major: Int, minor: Int, patch: Int) = +internal fun apiVersionIsAtLeast(major: Int, minor: Int, patch: Int): Boolean = KotlinVersion.CURRENT.isAtLeast(major, minor, patch) diff --git a/libraries/stdlib/jvm/src/kotlin/io/Closeable.kt b/libraries/stdlib/jvm/src/kotlin/io/Closeable.kt index 09ecff996e5..027c3bf1014 100644 --- a/libraries/stdlib/jvm/src/kotlin/io/Closeable.kt +++ b/libraries/stdlib/jvm/src/kotlin/io/Closeable.kt @@ -51,7 +51,7 @@ public inline fun T.use(block: (T) -> R): R { */ @SinceKotlin("1.1") @PublishedApi -internal fun Closeable?.closeFinally(cause: Throwable?) = when { +internal fun Closeable?.closeFinally(cause: Throwable?): Unit = when { this == null -> {} cause == null -> close() else -> diff --git a/libraries/stdlib/jvm/src/kotlin/io/Console.kt b/libraries/stdlib/jvm/src/kotlin/io/Console.kt index f8bd9d71dcd..b80a155848a 100644 --- a/libraries/stdlib/jvm/src/kotlin/io/Console.kt +++ b/libraries/stdlib/jvm/src/kotlin/io/Console.kt @@ -167,7 +167,7 @@ public actual fun readlnOrNull(): String? = readLine() * * @return the line read or `null` if the input stream is redirected to a file and the end of file has been reached. */ -fun readLine(): String? = LineReader.readLine(System.`in`, Charset.defaultCharset()) +public fun readLine(): String? = LineReader.readLine(System.`in`, Charset.defaultCharset()) // Singleton object lazy initializes on the first use, internal for tests internal object LineReader { diff --git a/libraries/stdlib/jvm/src/kotlin/jvm/JvmDefault.kt b/libraries/stdlib/jvm/src/kotlin/jvm/JvmDefault.kt index 902b0e76471..d0b6dc0d4b2 100644 --- a/libraries/stdlib/jvm/src/kotlin/jvm/JvmDefault.kt +++ b/libraries/stdlib/jvm/src/kotlin/jvm/JvmDefault.kt @@ -17,7 +17,7 @@ import kotlin.internal.RequireKotlinVersionKind @SinceKotlin("1.2") @Target(AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY) @Deprecated("Switch to new -Xjvm-default modes: `all` or `all-compatibility`", level = DeprecationLevel.ERROR) -annotation class JvmDefault +public annotation class JvmDefault /** * Prevents the compiler from generating compatibility accessors for the annotated class or interface, and suppresses @@ -32,7 +32,7 @@ annotation class JvmDefault @SinceKotlin("1.4") @Retention(AnnotationRetention.SOURCE) @Target(AnnotationTarget.CLASS) -annotation class JvmDefaultWithoutCompatibility +public annotation class JvmDefaultWithoutCompatibility /** * Forces the compiler to generate compatibility accessors for the annotated interface in the `DefaultImpls` class. @@ -45,4 +45,4 @@ annotation class JvmDefaultWithoutCompatibility @RequireKotlin("1.6", versionKind = RequireKotlinVersionKind.COMPILER_VERSION) @Retention(AnnotationRetention.SOURCE) @Target(AnnotationTarget.CLASS) -annotation class JvmDefaultWithCompatibility +public annotation class JvmDefaultWithCompatibility diff --git a/libraries/stdlib/jvm/src/kotlin/reflect/KVisibility.kt b/libraries/stdlib/jvm/src/kotlin/reflect/KVisibility.kt index 6ddd7e1769b..8a4074ad126 100644 --- a/libraries/stdlib/jvm/src/kotlin/reflect/KVisibility.kt +++ b/libraries/stdlib/jvm/src/kotlin/reflect/KVisibility.kt @@ -27,7 +27,7 @@ package kotlin.reflect * for more information. */ @SinceKotlin("1.1") -enum class KVisibility { +public enum class KVisibility { /** * Visibility of declarations marked with the `public` modifier, or with no modifier at all. */ diff --git a/libraries/stdlib/jvm/src/kotlin/text/CharCategoryJVM.kt b/libraries/stdlib/jvm/src/kotlin/text/CharCategoryJVM.kt index e0fc94907e4..01066c7b412 100644 --- a/libraries/stdlib/jvm/src/kotlin/text/CharCategoryJVM.kt +++ b/libraries/stdlib/jvm/src/kotlin/text/CharCategoryJVM.kt @@ -161,7 +161,7 @@ public actual enum class CharCategory(public val value: Int, public actual val c */ public actual operator fun contains(char: Char): Boolean = Character.getType(char) == this.value - companion object { + public companion object { /** * Returns the [CharCategory] corresponding to the specified [category] that represents a Java general category constant. * diff --git a/libraries/stdlib/jvm/src/kotlin/text/StringBuilderJVM.kt b/libraries/stdlib/jvm/src/kotlin/text/StringBuilderJVM.kt index bbc35ee5018..50f7b909fb5 100644 --- a/libraries/stdlib/jvm/src/kotlin/text/StringBuilderJVM.kt +++ b/libraries/stdlib/jvm/src/kotlin/text/StringBuilderJVM.kt @@ -78,7 +78,7 @@ public actual inline fun StringBuilder.deleteRange(startIndex: Int, endIndex: In @SinceKotlin("1.4") @kotlin.internal.InlineOnly @Suppress("ACTUAL_FUNCTION_WITH_DEFAULT_ARGUMENTS") -public actual inline fun StringBuilder.toCharArray(destination: CharArray, destinationOffset: Int = 0, startIndex: Int = 0, endIndex: Int = this.length) = +public actual inline fun StringBuilder.toCharArray(destination: CharArray, destinationOffset: Int = 0, startIndex: Int = 0, endIndex: Int = this.length): Unit = this.getChars(startIndex, endIndex, destination, destinationOffset) /** diff --git a/libraries/stdlib/jvm/src/kotlin/text/regex/Regex.kt b/libraries/stdlib/jvm/src/kotlin/text/regex/Regex.kt index bdc939036c6..d116ace96c4 100644 --- a/libraries/stdlib/jvm/src/kotlin/text/regex/Regex.kt +++ b/libraries/stdlib/jvm/src/kotlin/text/regex/Regex.kt @@ -313,7 +313,7 @@ internal constructor(private val nativePattern: Pattern) : Serializable { private fun readResolve(): Any = Regex(Pattern.compile(pattern, flags)) } - actual companion object { + public actual companion object { /** * Returns a regular expression that matches the specified [literal] string literally. * No characters of that string will have special meaning when searching for an occurrence of the regular expression.