diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/lambdaInTryFalsePositive.txt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/lambdaInTryFalsePositive.txt index 3209ba53a74..7b40c195d06 100644 --- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/lambdaInTryFalsePositive.txt +++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/lambdaInTryFalsePositive.txt @@ -1,4 +1,4 @@ package public fun foo(): kotlin.Int? -public inline fun T.use(/*0*/ block: (T) -> R): R +public inline fun T.use(/*0*/ block: (T) -> R): R diff --git a/libraries/stdlib/build.gradle.kts b/libraries/stdlib/build.gradle.kts index c5db18bd56d..4cea2ed75f2 100644 --- a/libraries/stdlib/build.gradle.kts +++ b/libraries/stdlib/build.gradle.kts @@ -150,6 +150,7 @@ kotlin { freeCompilerArgs.set( listOfNotNull( "-Xallow-kotlin-package", + "-Xexpect-actual-classes", "-Xmultifile-parts-inherit", "-Xno-new-java-annotation-targets", "-Xexplicit-api=strict", diff --git a/libraries/stdlib/jdk7/src/kotlin/AutoCloseableJVM.kt b/libraries/stdlib/jdk7/src/kotlin/AutoCloseableJVM.kt index 96376949f32..1d16b27a76b 100644 --- a/libraries/stdlib/jdk7/src/kotlin/AutoCloseableJVM.kt +++ b/libraries/stdlib/jdk7/src/kotlin/AutoCloseableJVM.kt @@ -12,12 +12,9 @@ package kotlin import kotlin.contracts.InvocationKind import kotlin.contracts.contract -// TODO: Introduce this typealias when Common AutoCloseable is stabilized. -// This typealias shadows existing java.lang.AutoCloseable, and the experimental status would require -// opt-in in exiting usages (that are w/o package prefix). Hence it would break previously compilable code. -//@Suppress("ACTUAL_WITHOUT_EXPECT") -//@SinceKotlin("1.8") -//public actual typealias AutoCloseable = java.lang.AutoCloseable +@Suppress("ACTUAL_WITHOUT_EXPECT") +@SinceKotlin("2.0") +public actual typealias AutoCloseable = java.lang.AutoCloseable @Suppress("ACTUAL_WITHOUT_EXPECT") @SinceKotlin("1.2")