From 79b4b18e25a4a10b9244e110112b4e9babd27c99 Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Tue, 9 Feb 2021 22:02:16 +0100
Subject: [PATCH] [minor] fix warnings in the script compiler and tests

---
 plugins/scripting/scripting-compiler/build.gradle.kts           | 2 --
 .../kotlin/scripting/compiler/plugin/repl/ReplFromTerminal.kt   | 1 +
 .../kotlin/scripting/compiler/test/CompileTimeFibonacciTest.kt  | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugins/scripting/scripting-compiler/build.gradle.kts b/plugins/scripting/scripting-compiler/build.gradle.kts
index 128a2797476..ba2e9705874 100644
--- a/plugins/scripting/scripting-compiler/build.gradle.kts
+++ b/plugins/scripting/scripting-compiler/build.gradle.kts
@@ -45,8 +45,6 @@ sourceSets {
 
 tasks.withType<org.jetbrains.kotlin.gradle.dsl.KotlinCompile<*>> {
     kotlinOptions {
-        languageVersion = "1.3"
-        apiVersion = "1.3"
         freeCompilerArgs = freeCompilerArgs - "-progressive" + "-Xskip-metadata-version-check"
     }
 }
diff --git a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/repl/ReplFromTerminal.kt b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/repl/ReplFromTerminal.kt
index 65aa5d0ffc6..cf5f9faaf15 100644
--- a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/repl/ReplFromTerminal.kt
+++ b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/repl/ReplFromTerminal.kt
@@ -111,6 +111,7 @@ class ReplFromTerminal(
             is ReplEvalResult.Error.Runtime -> writer.outputRuntimeError(evalResult.message)
             is ReplEvalResult.Error.CompileTime -> writer.outputRuntimeError(evalResult.message)
             is ReplEvalResult.Incomplete -> writer.notifyIncomplete()
+            is ReplEvalResult.HistoryMismatch -> {} // assuming handled elsewhere
         }
         return evalResult
     }
diff --git a/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/test/CompileTimeFibonacciTest.kt b/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/test/CompileTimeFibonacciTest.kt
index e1e91cac27e..570dbd99f54 100644
--- a/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/test/CompileTimeFibonacciTest.kt
+++ b/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/test/CompileTimeFibonacciTest.kt
@@ -157,7 +157,7 @@ object CompileTimeFibonacciConfiguration : ScriptCompilationConfiguration(
                             )
                     }
                     ?.valueOr { return@onAnnotations it }
-                    ?.max() ?: return@onAnnotations context.compilationConfiguration.asSuccess()
+                    ?.maxOrNull() ?: return@onAnnotations context.compilationConfiguration.asSuccess()
 
                 val sourceCode = fibUntil(maxFibonacciNumber)
                     .mapIndexed { index, number -> "val FIB_${index + 1} = $number" }