IDEA 2.3

EmmyLua · Dec 5, 2020 · dcb8c6f · dcb8c6f
1 parent 2dba6e9
commit dcb8c6f
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 38 deletions.
diff --git a/.idea/IntelliJ-EmmyLua.iml b/.idea/IntelliJ-EmmyLua.iml
diff --git a/build.gradle b/build.gradle
@@ -15,8 +15,8 @@
  */
 
 plugins {
-    id 'org.jetbrains.intellij' version "0.3.11"
-    id "org.jetbrains.kotlin.jvm" version "1.2.31"
+    id 'org.jetbrains.intellij' version "0.6.5"
+    id "org.jetbrains.kotlin.jvm" version "1.4.20"
 }
 
 def versions = [:]
@@ -91,6 +91,6 @@ intellij {
     type 'IU'
     updateSinceUntilBuild false
     downloadSources false
-    version = "IC-202.6397.94"
-    localPath System.env["IDEA_HOME_202"]
+    version = "IU-203.5981.155"
+    localPath System.env["IDEA_HOME_203"]
 }
diff --git a/build_plugin.gradle b/build_plugin.gradle
@@ -16,8 +16,8 @@
 import org.apache.tools.ant.taskdefs.condition.Os
 
 plugins {
-    id 'org.jetbrains.intellij' version "0.3.11"
-    id "org.jetbrains.kotlin.jvm" version "1.2.31"
+    id 'org.jetbrains.intellij' version "0.6.5"
+    id "org.jetbrains.kotlin.jvm" version "1.4.20"
     id "de.undercouch.download" version "3.4.3"
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -16,6 +16,6 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/com/tang/intellij/lua/errorreporting/error-report.kt b/src/main/java/com/tang/intellij/lua/errorreporting/error-report.kt
@@ -154,19 +154,19 @@ private fun encrypt(value: String): String {
 class GitHubErrorReporter : ErrorReportSubmitter() {
 	override fun getReportActionText() = ErrorReportBundle.message("report.error.to.plugin.vendor")
 	override fun submit(
-			events: Array<IdeaLoggingEvent>,
-			info: String?,
-			parent: Component,
-			consumer: Consumer<SubmittedReportInfo>): Boolean {
+			events: Array<out IdeaLoggingEvent>?,
+			additionalInfo: String?,
+			parentComponent: Component,
+			consumer: Consumer<in SubmittedReportInfo>): Boolean {
 		// TODO improve
-		val event = events.firstOrNull { it.throwable != null } ?: return false
-		return doSubmit(event, parent, consumer, info)
+		val event = events?.firstOrNull { it.throwable != null } ?: return false
+		return doSubmit(event, parentComponent, consumer, additionalInfo)
 	}
 
 	private fun doSubmit(
 			event: IdeaLoggingEvent,
 			parent: Component,
-			callback: Consumer<SubmittedReportInfo>,
+			callback: Consumer<in SubmittedReportInfo>,
 			description: String?): Boolean {
 		val dataContext = DataManager.getInstance().getDataContext(parent)
 		val bean = GitHubErrorBean(
@@ -198,7 +198,7 @@ class GitHubErrorReporter : ErrorReportSubmitter() {
 	}
 
 	internal class CallbackWithNotification(
-		private val consumer: Consumer<SubmittedReportInfo>,
+		private val consumer: Consumer<in SubmittedReportInfo>,
 		private val project: Project?) : Consumer<SubmittedReportInfo> {
 		override fun consume(reportInfo: SubmittedReportInfo) {
 			consumer.consume(reportInfo)

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -92,7 +92,7 @@
     </ul>
     ]]>
     </change-notes>
-    <idea-version since-build="172" until-build="202.*"/>
+    <idea-version since-build="172" until-build="203.*"/>
     <xi:include href="emmylua-core.xml" xpointer="xpointer(/idea-plugin/*)"/>
     <depends optional="true" config-file="emmylua-project.xml">com.intellij.java</depends>
 </idea-plugin>