From 44d6807aba51e45e3f31d2a39928ad7a18e35e2e Mon Sep 17 00:00:00 2001 From: "Alexander.Likhachev" Date: Tue, 21 Nov 2023 09:20:11 +0100 Subject: [PATCH] [Daemon] Fix deprecation warning in KotlinCompilerClient.kt --- .../org/jetbrains/kotlin/daemon/client/KotlinCompilerClient.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinCompilerClient.kt b/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinCompilerClient.kt index 38676ba75c3..1fd0b7a0c30 100644 --- a/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinCompilerClient.kt +++ b/compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinCompilerClient.kt @@ -402,8 +402,7 @@ object KotlinCompilerClient { .thenBy(FileAgeComparator()) { it.runFile } val optsCopy = daemonJVMOptions.copy() // if required options fit into fattest running daemon - return the daemon and required options with memory params set to actual ones in the daemon - @Suppress("DEPRECATION") // TODO: replace with maxWithOrNull as soon as minimal version of Gradle that we support has Kotlin 1.4+. - return aliveWithMetadata.maxWith(comparator)?.takeIf { daemonJVMOptions memorywiseFitsInto it.jvmOptions }?.let { + return aliveWithMetadata.maxWithOrNull(comparator)?.takeIf { daemonJVMOptions memorywiseFitsInto it.jvmOptions }?.let { Pair(it.daemon, optsCopy.updateMemoryUpperBounds(it.jvmOptions)) } // else combine all options from running daemon to get fattest option for a new daemon to run