diff --git a/gradle.properties b/gradle.properties index 16dad3523f..aba19e99fd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ # Kotlin version=1.9.0-SNAPSHOT group=org.jetbrains.kotlinx -kotlin_version=2.0.0 -kotlin_language_version=2.0 +kotlin_version=2.1.0 +kotlin_language_version=2.1 # DO NOT rename this property without adapting kotlinx.train build chain: atomicfu_version=0.26.1 @@ -43,7 +43,6 @@ kotlin.native.ignoreDisabledTargets=true # TODO: Remove once KT-37187 is fixed org.gradle.jvmargs=-Xmx3g -kotlin.mpp.stability.nowarn=true kotlinx.atomicfu.enableJvmIrTransformation=true # When the flag below is set to `true`, AtomicFU cannot process # usages of `moveForward` in `ConcurrentLinkedList.kt` correctly. diff --git a/integration-testing/build.gradle b/integration-testing/build.gradle index 32392f2b19..fddb736337 100644 --- a/integration-testing/build.gradle +++ b/integration-testing/build.gradle @@ -122,6 +122,7 @@ sourceSets { compileDebugAgentTestKotlin { kotlinOptions { freeCompilerArgs += ["-Xallow-kotlin-package"] + jvmTarget = "1.8" } } @@ -163,19 +164,26 @@ task coreAgentTest(type: Test) { } compileTestKotlin { - kotlinOptions.jvmTarget = "1.8" + kotlinOptions.jvmTarget = "17" } check { dependsOn([jvmCoreTest, debugDynamicAgentTest, mavenTest, debugAgentTest, coreAgentTest, ":jpmsTest:check", 'smokeTest:build', "java8Test:check"]) } + compileKotlin { kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "17" } } +kotlin.jvmToolchain(17) + // Drop this when node js version become stable tasks.withType(org.jetbrains.kotlin.gradle.targets.js.npm.tasks.KotlinNpmInstallTask.class).configureEach { it.args.add("--ignore-engines") } + +tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile.class).configureEach { + jvmTargetValidationMode = org.jetbrains.kotlin.gradle.dsl.jvm.JvmTargetValidationMode.WARNING +} diff --git a/integration-testing/gradle.properties b/integration-testing/gradle.properties index d13d7168d7..33c962e9f8 100644 --- a/integration-testing/gradle.properties +++ b/integration-testing/gradle.properties @@ -1,4 +1,4 @@ -kotlin_version=2.0.0 +kotlin_version=2.1.0 coroutines_version=1.9.0-SNAPSHOT asm_version=9.3 junit5_version=5.7.0 diff --git a/integration-testing/gradle/wrapper/gradle-wrapper.jar b/integration-testing/gradle/wrapper/gradle-wrapper.jar index 7454180f2a..a4b76b9530 100644 Binary files a/integration-testing/gradle/wrapper/gradle-wrapper.jar and b/integration-testing/gradle/wrapper/gradle-wrapper.jar differ diff --git a/integration-testing/gradle/wrapper/gradle-wrapper.properties b/integration-testing/gradle/wrapper/gradle-wrapper.properties index 92f06b50fd..e6aba2515d 100644 --- a/integration-testing/gradle/wrapper/gradle-wrapper.properties +++ b/integration-testing/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/integration-testing/gradlew b/integration-testing/gradlew index 1b6c787337..f5feea6d6b 100755 --- a/integration-testing/gradlew +++ b/integration-testing/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,13 +82,12 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,22 +134,29 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -193,11 +201,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ @@ -205,6 +217,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/integration-testing/gradlew.bat b/integration-testing/gradlew.bat index 107acd32c4..9d21a21834 100644 --- a/integration-testing/gradlew.bat +++ b/integration-testing/gradlew.bat @@ -13,8 +13,10 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +27,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -56,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -75,13 +78,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/integration-testing/src/debugAgentTest/kotlin/DebugAgentTest.kt b/integration-testing/src/debugAgentTest/kotlin/DebugAgentTest.kt index 111d4c73e1..64ed981e7e 100644 --- a/integration-testing/src/debugAgentTest/kotlin/DebugAgentTest.kt +++ b/integration-testing/src/debugAgentTest/kotlin/DebugAgentTest.kt @@ -1,3 +1,5 @@ +@file:OptIn(ExperimentalCoroutinesApi::class) + import org.junit.* import kotlinx.coroutines.* import kotlinx.coroutines.debug.* diff --git a/integration-testing/src/jvmCoreTest/kotlin/ListAllCoroutineThrowableSubclassesTest.kt b/integration-testing/src/jvmCoreTest/kotlin/ListAllCoroutineThrowableSubclassesTest.kt index 0cf592c636..65fec8c0b1 100644 --- a/integration-testing/src/jvmCoreTest/kotlin/ListAllCoroutineThrowableSubclassesTest.kt +++ b/integration-testing/src/jvmCoreTest/kotlin/ListAllCoroutineThrowableSubclassesTest.kt @@ -31,12 +31,16 @@ class ListAllCoroutineThrowableSubclassesTest { "kotlinx.coroutines.channels.ClosedReceiveChannelException", "kotlinx.coroutines.flow.internal.ChildCancelledException", "kotlinx.coroutines.flow.internal.AbortFlowException", + "kotlinx.coroutines.debug.junit5.CoroutinesTimeoutException", ) @Test fun testThrowableSubclassesAreSerializable() { val classes = ClassPath.from(this.javaClass.classLoader) - .getTopLevelClassesRecursive("kotlinx.coroutines"); + .getTopLevelClassesRecursive("kotlinx.coroutines") + // Not in the classpath: requires explicit dependency + .filter { it.name != "kotlinx.coroutines.debug.CoroutinesBlockHoundIntegration" + && it.name != "kotlinx.coroutines.debug.junit5.CoroutinesTimeoutExtension" }; val throwables = classes.filter { Throwable::class.java.isAssignableFrom(it.load()) }.map { it.toString() } for (throwable in throwables) { for (field in throwable.javaClass.declaredFields) { diff --git a/integration-testing/src/mavenTest/kotlin/MavenPublicationMetaInfValidator.kt b/integration-testing/src/mavenTest/kotlin/MavenPublicationMetaInfValidator.kt index 6033686458..acbc77376c 100644 --- a/integration-testing/src/mavenTest/kotlin/MavenPublicationMetaInfValidator.kt +++ b/integration-testing/src/mavenTest/kotlin/MavenPublicationMetaInfValidator.kt @@ -48,10 +48,10 @@ class MavenPublicationMetaInfValidator { private fun JarFile.checkMetaInfStructure(expected: Set) { val actual = HashSet() for (e in entries()) { - if (e.isDirectory() || !e.realName.contains("META-INF")) { + if (e.isDirectory() || !e.name.contains("META-INF")) { continue } - val partialName = e.realName.substringAfter("META-INF/") + val partialName = e.name.substringAfter("META-INF/") actual.add(partialName) } diff --git a/kotlinx-coroutines-core/common/src/Builders.common.kt b/kotlinx-coroutines-core/common/src/Builders.common.kt index 265d908aed..bf8a989188 100644 --- a/kotlinx-coroutines-core/common/src/Builders.common.kt +++ b/kotlinx-coroutines-core/common/src/Builders.common.kt @@ -153,6 +153,7 @@ public suspend fun withContext( // FAST PATH #1 -- new context is the same as the old one if (newContext === oldContext) { val coroutine = ScopeCoroutine(newContext, uCont) + @Suppress("LEAKED_IN_PLACE_LAMBDA") // Contract is preserved, invoked immediately or throws return@sc coroutine.startUndispatchedOrReturn(coroutine, block) } // FAST PATH #2 -- the new dispatcher is the same as the old one (something else changed) @@ -161,11 +162,13 @@ public suspend fun withContext( val coroutine = UndispatchedCoroutine(newContext, uCont) // There are changes in the context, so this thread needs to be updated withCoroutineContext(coroutine.context, null) { + @Suppress("LEAKED_IN_PLACE_LAMBDA") // Contract is preserved, invoked immediately or throws return@sc coroutine.startUndispatchedOrReturn(coroutine, block) } } // SLOW PATH -- use new dispatcher val coroutine = DispatchedCoroutine(newContext, uCont) + @Suppress("LEAKED_IN_PLACE_LAMBDA") // Contract is preserved, invoked immediately or throws block.startCoroutineCancellable(coroutine, coroutine) coroutine.getResult() } diff --git a/kotlinx-coroutines-core/common/src/CoroutineScope.kt b/kotlinx-coroutines-core/common/src/CoroutineScope.kt index 350c64d725..973429ca06 100644 --- a/kotlinx-coroutines-core/common/src/CoroutineScope.kt +++ b/kotlinx-coroutines-core/common/src/CoroutineScope.kt @@ -281,6 +281,7 @@ public suspend fun coroutineScope(block: suspend CoroutineScope.() -> R): R } return suspendCoroutineUninterceptedOrReturn { uCont -> val coroutine = ScopeCoroutine(uCont.context, uCont) + @Suppress("LEAKED_IN_PLACE_LAMBDA") // Contract is preserved, invoked immediately or throws coroutine.startUndispatchedOrReturn(coroutine, block) } } diff --git a/kotlinx-coroutines-core/common/src/Supervisor.kt b/kotlinx-coroutines-core/common/src/Supervisor.kt index 730050b5ab..c1d2145680 100644 --- a/kotlinx-coroutines-core/common/src/Supervisor.kt +++ b/kotlinx-coroutines-core/common/src/Supervisor.kt @@ -53,6 +53,7 @@ public suspend fun supervisorScope(block: suspend CoroutineScope.() -> R): R } return suspendCoroutineUninterceptedOrReturn { uCont -> val coroutine = SupervisorCoroutine(uCont.context, uCont) + @Suppress("LEAKED_IN_PLACE_LAMBDA") // Contract is preserved, invoked immediately or throws coroutine.startUndispatchedOrReturn(coroutine, block) } } diff --git a/kotlinx-coroutines-core/common/src/Timeout.kt b/kotlinx-coroutines-core/common/src/Timeout.kt index c63136575b..d2fcca5521 100644 --- a/kotlinx-coroutines-core/common/src/Timeout.kt +++ b/kotlinx-coroutines-core/common/src/Timeout.kt @@ -40,6 +40,7 @@ public suspend fun withTimeout(timeMillis: Long, block: suspend CoroutineSco } if (timeMillis <= 0L) throw TimeoutCancellationException("Timed out immediately") return suspendCoroutineUninterceptedOrReturn { uCont -> + @Suppress("LEAKED_IN_PLACE_LAMBDA") // Contract is preserved, invoked immediately or throws setupTimeout(TimeoutCoroutine(timeMillis, uCont), block) } } diff --git a/kotlinx-coroutines-core/common/src/internal/Synchronized.common.kt b/kotlinx-coroutines-core/common/src/internal/Synchronized.common.kt index 2c50f3c4aa..b92c51502a 100644 --- a/kotlinx-coroutines-core/common/src/internal/Synchronized.common.kt +++ b/kotlinx-coroutines-core/common/src/internal/Synchronized.common.kt @@ -24,5 +24,6 @@ public inline fun synchronized(lock: SynchronizedObject, block: () -> T): T contract { callsInPlace(block, InvocationKind.EXACTLY_ONCE) } + @Suppress("LEAKED_IN_PLACE_LAMBDA") // Contract is preserved, invoked immediately or throws return synchronizedImpl(lock, block) } diff --git a/kotlinx-coroutines-core/common/test/SupervisorTest.kt b/kotlinx-coroutines-core/common/test/SupervisorTest.kt index 1fb0ff9a06..f528059577 100644 --- a/kotlinx-coroutines-core/common/test/SupervisorTest.kt +++ b/kotlinx-coroutines-core/common/test/SupervisorTest.kt @@ -1,5 +1,3 @@ -@file:Suppress("NAMED_ARGUMENTS_NOT_ALLOWED") // KT-21913 - package kotlinx.coroutines import kotlinx.coroutines.testing.* diff --git a/kotlinx-coroutines-core/concurrent/src/internal/LockFreeLinkedList.kt b/kotlinx-coroutines-core/concurrent/src/internal/LockFreeLinkedList.kt index a172e66c8b..2e6ce5ae4a 100644 --- a/kotlinx-coroutines-core/concurrent/src/internal/LockFreeLinkedList.kt +++ b/kotlinx-coroutines-core/concurrent/src/internal/LockFreeLinkedList.kt @@ -1,5 +1,3 @@ -@file:Suppress("NO_EXPLICIT_VISIBILITY_IN_API_MODE") - package kotlinx.coroutines.internal import kotlinx.atomicfu.* diff --git a/kotlinx-coroutines-core/jvm/resources/DebugProbesKt.bin b/kotlinx-coroutines-core/jvm/resources/DebugProbesKt.bin index f8b6bcd87d..cac12595e5 100644 Binary files a/kotlinx-coroutines-core/jvm/resources/DebugProbesKt.bin and b/kotlinx-coroutines-core/jvm/resources/DebugProbesKt.bin differ diff --git a/kotlinx-coroutines-core/jvm/src/internal/Concurrent.kt b/kotlinx-coroutines-core/jvm/src/internal/Concurrent.kt index 0a931f5f5d..ee35a3a011 100644 --- a/kotlinx-coroutines-core/jvm/src/internal/Concurrent.kt +++ b/kotlinx-coroutines-core/jvm/src/internal/Concurrent.kt @@ -3,12 +3,10 @@ package kotlinx.coroutines.internal import java.util.* import kotlin.concurrent.withLock as withLockJvm -@Suppress("ACTUAL_WITHOUT_EXPECT") internal actual typealias ReentrantLock = java.util.concurrent.locks.ReentrantLock internal actual inline fun ReentrantLock.withLock(action: () -> T) = this.withLockJvm(action) -@Suppress("ACTUAL_WITHOUT_EXPECT") // Visibility internal actual typealias WorkaroundAtomicReference = java.util.concurrent.atomic.AtomicReference // BenignDataRace is OptionalExpectation and doesn't have to be here diff --git a/kotlinx-coroutines-core/jvm/src/internal/InternalAnnotations.kt b/kotlinx-coroutines-core/jvm/src/internal/InternalAnnotations.kt index 16b4a48776..01279f23ba 100644 --- a/kotlinx-coroutines-core/jvm/src/internal/InternalAnnotations.kt +++ b/kotlinx-coroutines-core/jvm/src/internal/InternalAnnotations.kt @@ -1,4 +1,3 @@ package kotlinx.coroutines.internal -@Suppress("ACTUAL_WITHOUT_EXPECT") // Not the same name to WA the bug in the compiler internal actual typealias IgnoreJreRequirement = org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement diff --git a/kotlinx-coroutines-core/jvm/src/internal/LocalAtomics.kt b/kotlinx-coroutines-core/jvm/src/internal/LocalAtomics.kt index febc5b90d9..19398ed543 100644 --- a/kotlinx-coroutines-core/jvm/src/internal/LocalAtomics.kt +++ b/kotlinx-coroutines-core/jvm/src/internal/LocalAtomics.kt @@ -1,4 +1,3 @@ package kotlinx.coroutines.internal -@Suppress("ACTUAL_WITHOUT_EXPECT") internal actual typealias LocalAtomicInt = java.util.concurrent.atomic.AtomicInteger diff --git a/kotlinx-coroutines-core/jvm/src/internal/StackTraceRecovery.kt b/kotlinx-coroutines-core/jvm/src/internal/StackTraceRecovery.kt index 619c61a1fa..acf07a553b 100644 --- a/kotlinx-coroutines-core/jvm/src/internal/StackTraceRecovery.kt +++ b/kotlinx-coroutines-core/jvm/src/internal/StackTraceRecovery.kt @@ -198,10 +198,8 @@ private fun StackTraceElement.elementWiseEquals(e: StackTraceElement): Boolean { && fileName == e.fileName && className == e.className } -@Suppress("ACTUAL_WITHOUT_EXPECT") internal actual typealias CoroutineStackFrame = kotlin.coroutines.jvm.internal.CoroutineStackFrame -@Suppress("ACTUAL_WITHOUT_EXPECT") internal actual typealias StackTraceElement = java.lang.StackTraceElement @Suppress("EXTENSION_SHADOWED_BY_MEMBER") diff --git a/kotlinx-coroutines-core/jvm/src/internal/ThreadLocal.kt b/kotlinx-coroutines-core/jvm/src/internal/ThreadLocal.kt index d5f715621f..209c3d5f32 100644 --- a/kotlinx-coroutines-core/jvm/src/internal/ThreadLocal.kt +++ b/kotlinx-coroutines-core/jvm/src/internal/ThreadLocal.kt @@ -2,7 +2,6 @@ package kotlinx.coroutines.internal import java.lang.ThreadLocal -@Suppress("ACTUAL_WITHOUT_EXPECT") // internal visibility internal actual typealias CommonThreadLocal = ThreadLocal internal actual fun commonThreadLocal(name: Symbol): CommonThreadLocal = ThreadLocal() diff --git a/kotlinx-coroutines-core/native/src/Builders.kt b/kotlinx-coroutines-core/native/src/Builders.kt index 9c77b2cd87..77b7cacebb 100644 --- a/kotlinx-coroutines-core/native/src/Builders.kt +++ b/kotlinx-coroutines-core/native/src/Builders.kt @@ -64,6 +64,7 @@ public actual fun runBlocking(context: CoroutineContext, block: suspend Coro var completed = false ThreadLocalKeepAlive.addCheck { !completed } try { + @Suppress("LEAKED_IN_PLACE_LAMBDA") // Contract is preserved, invoked immediately or throws coroutine.start(CoroutineStart.DEFAULT, coroutine, block) return coroutine.joinBlocking() } finally { diff --git a/kotlinx-coroutines-core/native/src/MultithreadedDispatchers.kt b/kotlinx-coroutines-core/native/src/MultithreadedDispatchers.kt index 7968ffdcef..8b217285a5 100644 --- a/kotlinx-coroutines-core/native/src/MultithreadedDispatchers.kt +++ b/kotlinx-coroutines-core/native/src/MultithreadedDispatchers.kt @@ -92,8 +92,11 @@ private class MultiWorkerDispatcher( */ private val tasksAndWorkersCounter = atomic(0L) + @Suppress("NOTHING_TO_INLINE") private inline fun Long.isClosed() = this and 1L == 1L + @Suppress("NOTHING_TO_INLINE") private inline fun Long.hasTasks() = this >= 2 + @Suppress("NOTHING_TO_INLINE") private inline fun Long.hasWorkers() = this < 0 private fun workerRunLoop() = runBlocking { diff --git a/kotlinx-coroutines-core/native/src/internal/Concurrent.kt b/kotlinx-coroutines-core/native/src/internal/Concurrent.kt index fcfe624d7c..4999361bf5 100644 --- a/kotlinx-coroutines-core/native/src/internal/Concurrent.kt +++ b/kotlinx-coroutines-core/native/src/internal/Concurrent.kt @@ -4,14 +4,12 @@ import kotlinx.atomicfu.* import kotlinx.cinterop.* import kotlinx.atomicfu.locks.withLock as withLock2 -@Suppress("ACTUAL_WITHOUT_EXPECT") internal actual typealias ReentrantLock = kotlinx.atomicfu.locks.SynchronizedObject internal actual inline fun ReentrantLock.withLock(action: () -> T): T = this.withLock2(action) internal actual fun identitySet(expectedSize: Int): MutableSet = HashSet() -@Suppress("ACTUAL_WITHOUT_EXPECT") // This suppress can be removed in 2.0: KT-59355 internal actual typealias BenignDataRace = kotlin.concurrent.Volatile internal actual class WorkaroundAtomicReference actual constructor(value: V) { diff --git a/kotlinx-coroutines-core/native/src/internal/StackTraceRecovery.kt b/kotlinx-coroutines-core/native/src/internal/StackTraceRecovery.kt index 9c6df6b604..20732e017f 100644 --- a/kotlinx-coroutines-core/native/src/internal/StackTraceRecovery.kt +++ b/kotlinx-coroutines-core/native/src/internal/StackTraceRecovery.kt @@ -15,7 +15,6 @@ internal actual interface CoroutineStackFrame { public actual fun getStackTraceElement(): StackTraceElement? } -@Suppress("ACTUAL_WITHOUT_EXPECT") internal actual typealias StackTraceElement = Any internal actual fun Throwable.initCause(cause: Throwable) { diff --git a/kotlinx-coroutines-test/common/src/TestBuilders.kt b/kotlinx-coroutines-test/common/src/TestBuilders.kt index fa0ad5e4bb..57ae3e1150 100644 --- a/kotlinx-coroutines-test/common/src/TestBuilders.kt +++ b/kotlinx-coroutines-test/common/src/TestBuilders.kt @@ -27,7 +27,6 @@ import kotlin.time.Duration.Companion.seconds * with a [TestResult] is to immediately `return` it from a test. * - Don't nest functions returning a [TestResult]. */ -@Suppress("NO_ACTUAL_FOR_EXPECT") public expect class TestResult /** @@ -409,7 +408,6 @@ public fun TestScope.runTest( /** * Runs [testProcedure], creating a [TestResult]. */ -@Suppress("NO_ACTUAL_FOR_EXPECT") // actually suppresses `TestResult` internal expect fun createTestResult(testProcedure: suspend CoroutineScope.() -> Unit): TestResult /** A coroutine context element indicating that the coroutine is running inside `runTest`. */ diff --git a/kotlinx-coroutines-test/common/src/TestScope.kt b/kotlinx-coroutines-test/common/src/TestScope.kt index 10a98a1f18..91936ce929 100644 --- a/kotlinx-coroutines-test/common/src/TestScope.kt +++ b/kotlinx-coroutines-test/common/src/TestScope.kt @@ -304,7 +304,6 @@ internal class TestScopeImpl(context: CoroutineContext) : } /** Use the knowledge that any [TestScope] that we receive is necessarily a [TestScopeImpl]. */ -@Suppress("NO_ELSE_IN_WHEN") // TODO: a problem with `sealed` in MPP not allowing total pattern-matching internal fun TestScope.asSpecificImplementation(): TestScopeImpl = when (this) { is TestScopeImpl -> this } diff --git a/kotlinx-coroutines-test/common/src/internal/ReportingSupervisorJob.kt b/kotlinx-coroutines-test/common/src/internal/ReportingSupervisorJob.kt index 3752f4e26d..782ef71f28 100644 --- a/kotlinx-coroutines-test/common/src/internal/ReportingSupervisorJob.kt +++ b/kotlinx-coroutines-test/common/src/internal/ReportingSupervisorJob.kt @@ -5,9 +5,11 @@ import kotlinx.coroutines.* /** * A variant of [SupervisorJob] that additionally notifies about child failures via a callback. */ -@Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE", "CANNOT_OVERRIDE_INVISIBLE_MEMBER") -internal class ReportingSupervisorJob(parent: Job? = null, val onChildCancellation: (Throwable) -> Unit) : - JobImpl(parent) { +@Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") +internal class ReportingSupervisorJob( + parent: Job? = null, + val onChildCancellation: (Throwable) -> Unit +) : JobImpl(parent) { override fun childCancelled(cause: Throwable): Boolean = try { onChildCancellation(cause) diff --git a/kotlinx-coroutines-test/native/src/TestBuilders.kt b/kotlinx-coroutines-test/native/src/TestBuilders.kt index b1d838703a..b7432c21ea 100644 --- a/kotlinx-coroutines-test/native/src/TestBuilders.kt +++ b/kotlinx-coroutines-test/native/src/TestBuilders.kt @@ -1,7 +1,6 @@ package kotlinx.coroutines.test import kotlinx.coroutines.* -@Suppress("ACTUAL_WITHOUT_EXPECT") public actual typealias TestResult = Unit internal actual fun createTestResult(testProcedure: suspend CoroutineScope.() -> Unit) {