Update idea plugin (#454)

* Update plugin dependencies, gradle version and remove old targets

* Remove obsolete source set

* Update gradle version for tests project as well

* Remove detekt because it throws way too many issues for what its worth it

* Set target version to java 17 and document this requirement

* Remove module check extraction

* Update import to non deprecated one

* Replace all usages of deprecated `type` extension function with our own

* Replace all usages of deprecated `resolve` extension function with our own

* Suppress unnecessary warning

* Replace `toLowerCase` with `lowercase`

* Convert project manager listener to startup activity

* Update to ide plugin ui dsl version 2

* Suppress needless warning

* Update import

* Update notification

* Remove unused labels

* Add plugin description section again

* Make extra source dir optional

* Remove remaining useless additional source set

* Update imports

* Replace deprecated string manipulation functions

* Update workflows

* Indent ui

* Make gradle wrapper executable

Author: chippmann

.github/workflows/check-pr-intellij-plugin.yaml

@@ -8,17 +8,17 @@ jobs:
   build-intellij-plugin:
     strategy:
       matrix:
-        ij_sdk: [ IJ213, IJ221, IJ222 ]
+        ij_sdk: [ IJ223 ]
     runs-on: ubuntu-latest
     steps:
       - name: Clone Godot JVM module.
         uses: actions/checkout@v2
         with:
           submodules: recursive
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       - name: Build intellij plugin
         uses: eskatos/gradle-command-action@v1
         with:

.github/workflows/deploy-intellij-plugin.yaml

@@ -10,17 +10,17 @@ jobs:
   deploy_godot_intellij_plugin:
     strategy:
       matrix:
-        ij_sdk: [ IJ213, IJ221, IJ222 ]
+        ij_sdk: [ IJ223 ]
     runs-on: ubuntu-latest
     steps:
       - name: Clone Godot JVM module.
         uses: actions/checkout@v2
         with:
           submodules: recursive
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       - uses: eskatos/gradle-command-action@v1
         with:
           wrapper-directory: kt/

harness/tests/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

kt/buildSrc/src/main/kotlin/plugins/intellij/BuildConfig.kt

@@ -3,8 +3,8 @@ package plugins.intellij
 data class BuildConfig(
     val sdk: String,
     val prefix: String,
-    val extraSource: String,
     val version: VersionRange,
     val ideVersionsForVerifierTask: List<String>,
-    val deps: List<String> = emptyList()
+    val deps: List<String> = emptyList(),
+    val extraSource: String? = null,
 )

kt/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

kt/plugins/godot-intellij-plugin/README.md

@@ -1,46 +1,38 @@
 # godot-kotlin-idea-plugin
 
-![Build](https://github.com/chippmann/godot-kotlin-idea-plugin/workflows/Build/badge.svg)
 [![Version](https://img.shields.io/jetbrains/plugin/v/com.utopia-rise.godotjvmideaplugin.svg)](https://plugins.jetbrains.com/plugin/com.utopia-rise.godotjvmideaplugin)
 [![Downloads](https://img.shields.io/jetbrains/plugin/d/com.utopia-rise.godotjvmideaplugin.svg)](https://plugins.jetbrains.com/plugin/com.utopia-rise.godotjvmideaplugin)
 
-## Template ToDo list
-- [x] Create a new [IntelliJ Platform Plugin Template][template] project.
-- [x] Verify the [pluginGroup](/gradle.properties), [plugin ID](/src/main/resources/META-INF/plugin.xml) and [sources package](/src/main/kotlin).
-- [ ] Review the [Legal Agreements](https://plugins.jetbrains.com/docs/marketplace/legal-agreements.html).
-- [ ] [Publish a plugin manually](https://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/publishing_plugin.html) for the first time.
-- [x] Set the Plugin ID in the above README badges.
-- [x] Set the [Deployment Token](https://plugins.jetbrains.com/docs/marketplace/plugin-upload.html).
-- [ ] Click the <kbd>Watch</kbd> button on the top of the [IntelliJ Platform Plugin Template][template] to be notified about releases containing new features and fixes.
+
+## Development
+To develop for the IDE plugin you have to use and compile the plugin with Java 17!
+
 
 ## Description
 [comment]: <> (To keep everything working, do not remove `<!-- ... -->` sections. These are added to the plugin description through gradle during build)
 <!-- Plugin description -->
-Adds additional source code checks specific to Godot-Kotlin-Jvm.  
+Adds additional source code checks specific to Godot-Kotlin-Jvm.
 
 Features:
-  - Adds code insight checks for registering classes, properties, functions and signals
-  - Adds quick fixes for common registration problems
-  - Adds code insight checks for basic `rpc` and `call` usage
-  - Adds gutter icons and dialogs for in editor connected signals throughout the whole project (not only the currently opened scene)
-  - Adds refactor support for scene files (when classes are moved/renamed)
-  - Adds project wizard to create new godot kotlin jvm projects
+- Adds code insight checks for registering classes, properties, functions and signals
+- Adds quick fixes for common registration problems
+- Adds code insight checks for basic `rpc` and `call` usage
+- Adds gutter icons and dialogs for in editor connected signals throughout the whole project (not only the currently opened scene)
+- Adds refactor support for scene files (when classes are moved/renamed)
+- Adds project wizard to create new godot kotlin jvm projects
 <!-- Plugin description end -->
 
 ## Installation
 
 - Using IDE built-in plugin system:
-  
+
   <kbd>Preferences</kbd> > <kbd>Plugins</kbd> > <kbd>Marketplace</kbd> > <kbd>Search for "godot-kotlin-idea-plugin"</kbd> >
   <kbd>Install Plugin</kbd>
-  
+
 - Manually:
 
   Download the [latest release](https://github.com/chippmann/godot-kotlin-idea-plugin/releases/latest) and install it manually using
   <kbd>Preferences</kbd> > <kbd>Plugins</kbd> > <kbd>⚙️</kbd> > <kbd>Install plugin from disk...</kbd>
 
 
 ---
-Plugin based on the [IntelliJ Platform Plugin Template][template].
-
-[template]: https://github.com/JetBrains/intellij-platform-plugin-template

kt/plugins/godot-intellij-plugin/build.gradle.kts

@@ -8,38 +8,19 @@ plugins {
     // Kotlin support
     id("org.jetbrains.kotlin.jvm")
     // gradle-intellij-plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin
-    id("org.jetbrains.intellij") version "1.7.0"
+    id("org.jetbrains.intellij") version "1.13.2"
     // gradle-changelog-plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin
-    id("org.jetbrains.changelog") version "1.3.1"
-    // detekt linter - read more: https://detekt.github.io/detekt/gradle.html
-    id("io.gitlab.arturbosch.detekt") version "1.20.0"
+    id("org.jetbrains.changelog") version "2.0.0"
 }
 
 //sdk version: https://github.com/JetBrains/intellij-community/tags
 //kotlin plugin version: https://plugins.jetbrains.com/plugin/6954-kotlin/versions
 val buildMatrix: Map<String, BuildConfig> = mapOf(
-    "IJ213" to BuildConfig(
-        sdk = "213.6777.52",
-        prefix = "IJ2021.3",
-        extraSource = "IJ213",
-        version = VersionRange("213.2", "213.*"),
-        ideVersionsForVerifierTask = listOf("2021.3"),
-        deps = listOf("java", "org.jetbrains.kotlin:213-1.6.21-release-334-IJ6777.52", "gradle")
-    ),
-    "IJ221" to BuildConfig(
-        sdk = "221.5591.52",
-        prefix = "IJ2022.1",
-        extraSource = "IJ221",
-        version = VersionRange("221.3", "999.*"),
-        ideVersionsForVerifierTask = listOf("2022.1"),
-        deps = listOf("java", "org.jetbrains.kotlin:221-1.7.10-release-333-IJ5591.52", "gradle")
-    ),
-    "IJ222" to BuildConfig(
-        sdk = "222.3345.118",
-        prefix = "IJ2022.2",
-        extraSource = "IJ221", // hasn't changed. Thus no need to update
-        version = VersionRange("222.2", "999.*"),
-        ideVersionsForVerifierTask = listOf("2022.2"),
+    "IJ223" to BuildConfig(
+        sdk = "223.8836.41",
+        prefix = "IJ2022.3",
+        version = VersionRange("222.3", "999.*"),
+        ideVersionsForVerifierTask = listOf("2022.3"),
         deps = listOf("java", "org.jetbrains.kotlin", "gradle") // kotlin plugin version no longer needed as it's now bundled with the IDE
     )
 )
@@ -77,7 +58,7 @@ version = if (!releaseMode) {
 
 group = "com.utopia-rise"
 
-val sdkVersion = project.properties["godot.plugins.intellij.version"] ?: "IJ222"
+val sdkVersion = project.properties["godot.plugins.intellij.version"] ?: "IJ223"
 val settings = checkNotNull(buildMatrix[sdkVersion])
 
 // Configure gradle-intellij-plugin plugin.
@@ -95,30 +76,16 @@ intellij {
 kotlin {
     sourceSets {
         main {
-            kotlin.srcDirs("src/${settings.extraSource}/kotlin")
+            settings.extraSource?.let { extraSourceDir -> kotlin.srcDirs("src/$extraSourceDir/kotlin") }
         }
     }
 }
 
 dependencies {
-    detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.20.0")
     implementation("com.utopia-rise:jvm-godot-resource-serialization:0.1.0")
     implementation(project(":godot-build-props"))
 }
 
-// Configure detekt plugin.
-// Read more: https://detekt.github.io/detekt/kotlindsl.html
-detekt {
-    config = files("$projectDir/detekt-config.yml")
-    buildUponDefaultConfig = true
-
-    reports {
-        html.enabled = false
-        xml.enabled = false
-        txt.enabled = false
-    }
-}
-
 tasks {
     patchPluginXml {
         if (isSnapshot) {
@@ -166,7 +133,7 @@ tasks {
     }
 
     withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-        kotlinOptions.jvmTarget = "11"
+        kotlinOptions.jvmTarget = "17"
         kotlinOptions {
             freeCompilerArgs += "-Xjvm-default=all"
         }