From 0ed1ded6ceaf504397a6de277e64911b8fb7f1ef Mon Sep 17 00:00:00 2001
From: Mikhail Filippov <mikhail.filippov@jetbrains.com>
Date: Thu, 22 Aug 2024 17:25:58 +0400
Subject: [PATCH] IJPL-150165 fix compilation after Kotlin language update

GitOrigin-RevId: 0dc39e8c08d662e90cbd58bededd4947632c490b
---
 .../src/com/intellij/execution/console/LanguageConsoleImpl.kt   | 2 +-
 .../model/sourceSetModel/GradleSourceSetSerialisationService.kt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.kt b/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.kt
index 370d429b45ec..1fcf19925a9a 100644
--- a/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.kt
+++ b/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.kt
@@ -71,7 +71,7 @@ import kotlin.math.min
 open class LanguageConsoleImpl(private val myHelper: Helper) : ConsoleViewImpl(
   myHelper.project, GlobalSearchScope.allScope(myHelper.project), true, true), LanguageConsoleView {
   private val consoleExecutionEditor = ConsoleExecutionEditor(myHelper)
-  override val historyViewer: EditorEx
+  final override val historyViewer: EditorEx
   private val myPanel: JPanel = ConsoleEditorsPanel(this)
   private val myScrollBar: JScrollBar = JBScrollBar(Adjustable.HORIZONTAL)
   private val myMergedScrollBarModel: MergedHorizontalScrollBarModel
diff --git a/plugins/gradle/tooling-extension-impl/src/com/intellij/gradle/toolingExtension/impl/model/sourceSetModel/GradleSourceSetSerialisationService.kt b/plugins/gradle/tooling-extension-impl/src/com/intellij/gradle/toolingExtension/impl/model/sourceSetModel/GradleSourceSetSerialisationService.kt
index f97213a79e44..95a2146c59ee 100644
--- a/plugins/gradle/tooling-extension-impl/src/com/intellij/gradle/toolingExtension/impl/model/sourceSetModel/GradleSourceSetSerialisationService.kt
+++ b/plugins/gradle/tooling-extension-impl/src/com/intellij/gradle/toolingExtension/impl/model/sourceSetModel/GradleSourceSetSerialisationService.kt
@@ -127,7 +127,7 @@ class GradleSourceSetSerialisationService : SerializationService<GradleSourceSet
     }
 
     private fun writeSourceSets(writer: IonWriter, context: SourceSetModelWriteContext, sourceSetModel: GradleSourceSetModel) {
-      writeCollection(writer, SOURCE_SET_MODEL_SOURCE_SETS_FIELD, sourceSetModel.sourceSets.values) {
+      writeCollection(writer, SOURCE_SET_MODEL_SOURCE_SETS_FIELD, sourceSetModel.sourceSets.values as Collection<ExternalSourceSet>) {
         writeSourceSet(writer, context, it)
       }
     }