Bumped the Java version to 11, and the target version of IntelliJ to …

…2021.1 (build 211.1777). Also bumped the versions of Gradle plugins and library dependencies: * org.jetbrains.kotlin.jvm to 1.9.0 * org.jetbrains.intellij to 1.15.0 * org.jsoup:jsoup to 1.16.1 * net.pearx.kasechange:kasechange-jvm to 1.4.1 * io.mockk:mockk to 1.13.5
exigow · Jul 23, 2023 · 4de72aa · 4de72aa
1 parent 9f1cde5
commit 4de72aa
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,22 +1,22 @@
 plugins {
     java
-    id("org.jetbrains.kotlin.jvm") version "1.5.31"
-    id("org.jetbrains.intellij") version "1.1.2"
+    id("org.jetbrains.kotlin.jvm") version "1.9.0"
+    id("org.jetbrains.intellij") version "1.15.0"
 }
 
 dependencies {
     implementation(kotlin("stdlib-jdk8"))
-    implementation("org.jsoup:jsoup:1.14.3")
-    implementation("net.pearx.kasechange:kasechange-jvm:1.3.0")
-    testImplementation("io.mockk:mockk:1.12.0")
+    implementation("org.jsoup:jsoup:1.16.1")
+    implementation("net.pearx.kasechange:kasechange-jvm:1.4.1")
+    testImplementation("io.mockk:mockk:1.13.5")
 }
 
 repositories {
     mavenCentral()
 }
 
 intellij {
-    version.set("2019.3")
+    version.set("2021.1")
     updateSinceUntilBuild.set(false)
 }
 
@@ -33,10 +33,10 @@ tasks {
         channels.set(listOf("stable"))
     }
     compileJava {
-        sourceCompatibility = "1.8"
-        targetCompatibility = "1.8"
+        sourceCompatibility = "11"
+        targetCompatibility = "11"
     }
     compileKotlin {
-        kotlinOptions.jvmTarget = "1.8"
+        kotlinOptions.jvmTarget = "11"
     }
 }
diff --git a/src/main/kotlin/error/ErrorGithubSubmitter.kt b/src/main/kotlin/error/ErrorGithubSubmitter.kt
@@ -18,10 +18,10 @@ class ErrorGithubSubmitter : ErrorReportSubmitter() {
         "Open GitHub issue"
 
     override fun submit(
-        events: Array<IdeaLoggingEvent>,
+        events: Array<out IdeaLoggingEvent>,
         additionalInfo: String?,
         parentComponent: Component,
-        consumer: Consumer<SubmittedReportInfo>
+        consumer: Consumer<in SubmittedReportInfo>
     ): Boolean {
         try {
             if (events.isNotEmpty()) {

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -16,18 +16,15 @@
 		</ul>
 	]]>
 	</description>
-	<idea-version since-build="193.2252"/>
+	<idea-version since-build="211.1777"/>
 	<depends>com.intellij.modules.lang</depends>
 	<extensions defaultExtensionNs="com.intellij">
-		<!-- version -->
-		<applicationService serviceImplementation="version.VersionService"/>
 		<!-- gdscript -->
 		<annotator implementationClass="gdscript.annotation.ClassnameAnnotator" language="GDScript"/>
 		<annotator implementationClass="gdscript.annotation.ConstantAnnotator" language="GDScript"/>
 		<annotator implementationClass="gdscript.annotation.KeywordAnnotator" language="GDScript"/>
 		<annotator implementationClass="gdscript.annotation.MethodAnnotator" language="GDScript"/>
 		<annotator implementationClass="gdscript.annotation.ResourceAnnotator" language="GDScript"/>
-		<applicationService serviceImplementation="gdscript.documentation.ScriptGeneratedSourceFileService"/>
 		<colorSettingsPage implementation="gdscript.ScriptColorSettingsPage"/>
 		<completion.contributor implementationClass="gdscript.completion.ResourceCompletionContributor" language="GDScript"/>
 		<completion.contributor implementationClass="gdscript.completion.KeywordCompletionContributor" language="GDScript"/>