Merge remote-tracking branch 't-rufang/rufan/eap211' into hanxiao/eap

Author: Flanker32

PluginsAndFeatures/azure-toolkit-for-intellij/build.gradle

@@ -1,6 +1,6 @@
 plugins {
-    id "org.jetbrains.intellij" version "0.5.0"
-    id "org.jetbrains.kotlin.jvm" version "1.3.72"
+    id "org.jetbrains.intellij" version "0.7.2"
+    id "org.jetbrains.kotlin.jvm" version "1.4.20"
     id "de.undercouch.download" version "4.0.4"
     id "com.github.ben-manes.versions" version "0.28.0"
     id 'org.openjfx.javafxplugin' version '0.0.9'
@@ -140,7 +140,7 @@ dependencies {
     compile group: 'jaxen', name: 'jaxen', version: '1.2.0'
     compile group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.4'
 
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.20")
 
     // https://mvnrepository.com/artifact/org.projectlombok/lombok
     compileOnly 'org.projectlombok:lombok:1.18.8'

PluginsAndFeatures/azure-toolkit-for-intellij/gradle.properties

@@ -2,7 +2,7 @@ javaVersion=11
 org.gradle.jvmargs='-Duser.language=en'
 sources=false
 intellij_version=IC-LATEST-EAP-SNAPSHOT
-dep_plugins=org.intellij.scala:2020.3.8
+dep_plugins=org.intellij.scala:2021.1.10
 applicationinsights.key=57cc111a-36a8-44b3-b044-25d293b8b77c
 updateVersionRange=true
-patchPluginXmlSinceBuild=203.5419.21
+patchPluginXmlSinceBuild=211.6085.26

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/common/CosmosSparkSubmitModel.kt

@@ -44,7 +44,7 @@ open class CosmosSparkSubmitModel : SparkSubmitModel {
     constructor(project: Project, submissionParameter: SparkSubmissionParameter): super(project, submissionParameter)
 
     override fun getDefaultParameters(): Stream<Pair<String, out Any>> {
-        return listOf(
+        return listOf<Pair<String, out Any>>(
                 Pair(SparkSubmissionParameter.DriverMemory, SparkSubmissionParameter.DriverMemoryDefaultValue),
                 Pair(SparkSubmissionParameter.DriverCores, SparkSubmissionParameter.DriverCoresDefaultValue),
                 Pair(SparkSubmissionParameter.ExecutorMemory, SparkSubmissionParameter.ExecutorMemoryDefaultValue),

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/console/SparkExecuteInConsoleActionPromoter.kt

@@ -30,7 +30,7 @@ import com.microsoft.azure.hdinsight.common.logger.ILogger
 class SparkExecuteInConsoleActionPromoter : ActionPromoter, ILogger {
     private fun shouldPromote(anAction: AnAction): Boolean = anAction is SparkConsoleExecuteAction
 
-    override fun promote(actions: MutableList<AnAction>, context: DataContext): MutableList<AnAction> =
+    override fun promote(actions: MutableList<out AnAction>, context: DataContext): MutableList<AnAction> =
             actions.firstOrNull { shouldPromote(it) }
                     ?.let { mutableListOf(it) }
                     ?: mutableListOf()

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/run/configuration/CosmosServerlessSparkSubmitModel.kt

@@ -42,7 +42,7 @@ class CosmosServerlessSparkSubmitModel(project: Project) : SparkSubmitModel(proj
     }
 
     override fun getDefaultParameters(): Stream<Pair<String, out Any>> {
-        return listOf(
+        return listOf<Pair<String, out Any>>(
                 Pair(CreateSparkBatchJobParameters.DriverMemory, CreateSparkBatchJobParameters.DriverMemoryDefaultValue),
                 Pair(CreateSparkBatchJobParameters.DriverCores, CreateSparkBatchJobParameters.DriverCoresDefaultValue),
                 Pair(CreateSparkBatchJobParameters.ExecutorMemory, CreateSparkBatchJobParameters.ExecutorMemoryDefaultValue),

gradle.properties

@@ -1,9 +1,9 @@
 ARTIFACTS_DIR=artifacts
 INJECT_INTELLIJ_VERSION=true
-IJ_VERSION_MAJOR_BUILD=203.5419.21
-IJ_VERSION_MAJOR=2020.3
+IJ_VERSION_MAJOR_BUILD=211.6085.26
+IJ_VERSION_MAJOR=LATEST-EAP-SNAPSHOT
 IJ_VERSION_MINOR=
-IJ_SCALA_VERSION_LATEST=2020.3.8
+IJ_SCALA_VERSION_LATEST=2021.1.10
 skipCheckstyle=true
 skipTest=false
 forceClean=false