#70: Upgrading plugin to support IJ 2023

.github/workflows/build_plugin.yml

@@ -34,11 +34,13 @@ jobs:
         fi
         echo "SUCCESS: No java files detected in the committed source code"
 
-    # Setup Java 11 environment for the next steps
-    - name: Setup Java 11
-      uses: actions/setup-java@v1
+    # Setup Java 17 environment for the next steps
+    - name: Setup Java 17
+      uses: actions/setup-java@v3
       with:
-        java-version: 11
+        java-version: 17
+        distribution: temurin
+        cache: gradle
 
     # Cache Gradle dependencies
     - name: Setup Cache
@@ -56,23 +58,12 @@ jobs:
 
     # Run EditorConfig Linter
     - name: Run EditorConfig Linter
-      uses: editorconfig-checker/action-editorconfig-checker@v1.0.0
+      uses: editorconfig-checker/action-editorconfig-checker@main
 
     # Run ktlint
     - name: Run KtLinter
       run: ./gradlew ktlintCheck
 
-    # Run Qodana code inspections
-    - name: Run Qodana Code Inspection
-      uses: JetBrains/qodana-action@v3.2.1
-
-    # Collect Qodana Result
-    - name: Collect Qodana Result
-      uses: actions/upload-artifact@v2
-      with:
-        name: qodana-result
-        path: ${{ github.workspace }}/qodana
-
     # Run test Gradle task
     - name: Run Tests
       run: ./gradlew test
@@ -93,9 +84,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/setup-java@v1
+    - uses: actions/setup-java@v3
       with:
-        java-version: 11
+        java-version: 17
+        distribution: temurin
+        cache: gradle
 
     # Cache Gradle Dependencies
     - name: Setup Gradle Dependencies Cache
@@ -152,7 +145,6 @@ jobs:
         failure-levels: |
           COMPATIBILITY_WARNINGS
           COMPATIBILITY_PROBLEMS
-          DEPRECATED_API_USAGES
           INTERNAL_API_USAGES
           OVERRIDE_ONLY_API_USAGES
           NON_EXTENDABLE_API_USAGES

.github/workflows/ide_versions_to_verify.txt

@@ -1,4 +1,4 @@
-ideaIC:2022.1
-ideaIC:222-EAP-SNAPSHOT
-pycharmPC:2022.1
-pycharmPC:222-EAP-SNAPSHOT
+ideaIC:2023.1
+ideaIC:223-EAP-SNAPSHOT
+pycharmPC:2023.1
+pycharmPC:223-EAP-SNAPSHOT

.github/workflows/verify_pr.yml

@@ -44,4 +44,21 @@ jobs:
           history readable when performing searches. Please see CONTRIBUTING.md for more details.
         checkAllCommitMessages: true
         accessToken: ${{ secrets.GITHUB_TOKEN }}
+  qodana:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+
+    # Run Qodana code inspections
+    - name: Run Qodana Code Inspection
+      uses: JetBrains/qodana-action@v2023.1.0
+
+    # Collect Qodana Result
+    - name: Collect Qodana Result
+      uses: actions/upload-artifact@v2
+      with:
+        name: qodana-result
+        path: ${{ github.workspace }}/qodana
 

.gitignore

@@ -27,3 +27,7 @@ jflex-1.7.0-2.jar
 
 # NO java files should be committed. Only kotlin code will be accepted for PRs.
 *.java
+
+# Miscellaneous
+*.hprof
+*.log

CHANGELOG.md

@@ -5,7 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
-### Added
+#### (compatibility: 2023.1 - 2023.1.*)
+### Changed
+- Dependencies updated to support IntelliJ 2023.*
 
 ## [0.10.2] - 2022-08-07
 #### (compatibility: 2022.1 - 2022.3.*)

README.md

@@ -1,3 +1,4 @@
+
 <!-- PROJECT SHIELDS -->
 [![Contributors][contributors-shield]][contributors-url]
 [![Forks][forks-shield]][forks-url]
@@ -103,13 +104,13 @@ Install the plugin from the [JetBrains Marketplace][jetbrains-marketplace-plugin
 To get a local copy up and running, follow these simple steps:
 
 ### Prerequisites
-* IntelliJ IDEA 2020.* or newer (Community Edition is fine)  
+* IntelliJ IDEA 2023.* or newer (Community Edition is fine)  
   Required plugins (for development only):
   - [Grammar-Kit](https://plugins.jetbrains.com/plugin/6606-grammar-kit)
   - [PsiViewer](https://plugins.jetbrains.com/plugin/227-psiviewer)
   - [Kotest](https://plugins.jetbrains.com/plugin/14080-kotest)
   - [Ktlint](https://plugins.jetbrains.com/plugin/15057-ktlint-unofficial-)
-* Java 11
+* Java 17
 
 ### Setting up a Development Environment
 1. Clone the repo

build.gradle.kts

@@ -5,22 +5,22 @@ import org.jetbrains.grammarkit.tasks.GenerateParserTask
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 // Imports a property from gradle.properties file
-fun properties(key: String) = project.findProperty(key).toString()
+fun properties(key: String) = providers.gradleProperty(key)
 
 plugins {
     idea
-    id("org.jetbrains.intellij") version "1.8.+"
-    id("org.jetbrains.grammarkit") version "2021.2.+"
-    kotlin("jvm") version "1.7.+"
+    alias(libs.plugins.gradleIntelliJPlugin)
+    alias(libs.plugins.grammarKit)
+    alias(libs.plugins.kotlin)
     jacoco
-    id("org.jlleitschuh.gradle.ktlint") version "10.+"
-    id("org.barfuin.gradle.jacocolog") version "1.+" // show coverage in console
-    id("org.jetbrains.changelog") version "1.3.+"
-    id("org.jetbrains.qodana") version "0.1.+"
+    alias(libs.plugins.ktlint)
+    alias(libs.plugins.jacocolog) // show coverage in console
+    alias(libs.plugins.changelog)
+    alias(libs.plugins.qodana)
 }
 
-group = properties("pluginGroup")
-version = properties("pluginVersion")
+group = properties("pluginGroup").get()
+version = properties("pluginVersion").get()
 
 // Include the generated files in the source set
 sourceSets.main.get().java.srcDirs("src/main/gen")
@@ -29,12 +29,14 @@ repositories {
     mavenCentral()
 }
 
+kotlin {
+    jvmToolchain(17)
+}
+
 dependencies {
-    testImplementation("io.kotest:kotest-runner-junit5:5.+")
-    testImplementation("io.kotest:kotest-assertions-core:5.+")
-    testImplementation("io.kotest:kotest-framework-datatest:5.+")
-    testImplementation("io.mockk:mockk:1.12.4")
-    testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.+") {
+    testImplementation(libs.bundles.kotest)
+    testImplementation(libs.mockk)
+    testRuntimeOnly(libs.junit.engine) {
         because(
             "this is needed to run parsing/lexing tests which extend " +
                 "intellij base classes that use junit4",
@@ -44,14 +46,14 @@ dependencies {
 
 // See https://github.com/JetBrains/gradle-intellij-plugin/
 intellij {
-    version.set("2022.1")
+    version.set("2023.1")
     type.set("PC")
-    plugins.set(properties("pluginDependencies").split(',').map(String::trim).filter(String::isNotEmpty))
+    plugins.set(properties("pluginDependencies").get().split(',').map(String::trim).filter(String::isNotEmpty))
 }
 
 ktlint {
+    version.set("0.48.2")
     enableExperimentalRules.set(true)
-    disabledRules.set(setOf("experimental:package-name"))
 }
 
 changelog {
@@ -68,35 +70,33 @@ qodana {
 }
 
 val generateAhkLexer = task<GenerateLexerTask>("generateAhkLexer") {
-    source.set("src/main/kotlin/de/nordgedanken/auto_hotkey/lang/lexer/AutoHotkey.flex")
-    targetDir.set("src/main/gen/de/nordgedanken/auto_hotkey/")
+    sourceFile.set(file("src/main/kotlin/com/autohotkey/lang/lexer/AutoHotkey.flex"))
+    targetDir.set("src/main/gen/com/autohotkey/")
     targetClass.set("AhkLexer")
     purgeOldFiles.set(true)
 }
 
 val generateAhkParser = task<GenerateParserTask>("generateAhkParser") {
-    source.set("src/main/kotlin/de/nordgedanken/auto_hotkey/lang/parser/AutoHotkey.bnf")
+    sourceFile.set(file("src/main/kotlin/com/autohotkey/lang/parser/AutoHotkey.bnf"))
     targetRoot.set("src/main/gen")
-    pathToParser.set("de/nordgedanken/auto_hotkey/lang/parser/AhkParser.java")
-    pathToPsiRoot.set("de/nordgedanken/auto_hotkey/lang/psi")
+    pathToParser.set("com/autohotkey/lang/parser/AhkParser.java")
+    pathToPsiRoot.set("com/autohotkey/lang/psi")
     purgeOldFiles.set(false)
 }
 
 tasks {
-    withType<JavaCompile> {
-        sourceCompatibility = "11"
-        targetCompatibility = "11"
+    wrapper {
+        gradleVersion = properties("gradleVersion").get()
     }
 
     withType<KotlinCompile> {
-        kotlinOptions.jvmTarget = "11"
         dependsOn(generateAhkLexer, generateAhkParser)
     }
 
     patchPluginXml {
         version.set(changelog.version)
-        sinceBuild.set(properties("pluginSinceBuild"))
-        untilBuild.set(properties("pluginUntilBuild"))
+        sinceBuild.set(properties("pluginSinceBuild").get())
+        untilBuild.set(properties("pluginUntilBuild").get())
         changeNotes.set(
             provider {
                 val newChangeNotes = changelog.get(changelog.version.get()).withHeader(true).toHTML() +
@@ -132,6 +132,10 @@ tasks {
     // testing-related stuff below
     test {
         useJUnitPlatform()
+        configure<JacocoTaskExtension> {
+            isIncludeNoLocationClasses = true
+            excludes = listOf("jdk.internal.*")
+        }
     }
 
     jacocoTestReport {
@@ -151,14 +155,16 @@ tasks {
                 }
                 limit {
                     counter = "BRANCH"
-                    minimum = "0.67".toBigDecimal()
+                    minimum = "0.66".toBigDecimal()
                 }
             }
         }
     }
 
     runPluginVerifier {
-        ideVersions.set(properties("pluginVerifierIdeVersions").split(',').map(String::trim).filter(String::isNotEmpty))
+        ideVersions.set(
+            properties("pluginVerifierIdeVersions").get().split(',').map(String::trim).filter(String::isNotEmpty),
+        )
     }
 }
 

gradle.properties

@@ -1,11 +1,16 @@
 pluginGroup = com.autohotkey
 
 pluginVersion = 0.10.2
-pluginSinceBuild = 221
-pluginUntilBuild = 223.*
+pluginSinceBuild = 231
+pluginUntilBuild = 233.*
 
-pluginVerifierIdeVersions = 2022.1,2022.2
+pluginVerifierIdeVersions = 2023.1
 
 pluginDependencies = com.github.b3er.idea.plugins.arc.browser:0.32
 
-kotlin.stdlib.default.dependency = false
+kotlin.stdlib.default.dependency = false
+
+# Gradle settings
+gradleVersion = 7.6.1
+# increase memory limits for gradle build
+org.gradle.jvmargs=-Xmx4096m

gradle/libs.versions.toml

@@ -0,0 +1,33 @@
+[versions]
+# libraries
+junit = "5.+"
+kotest = "5.+"
+mockk = "1.13.+"
+
+# plugins
+changelog = "1.3.+"
+gradleIntelliJPlugin = "1.12.+"
+grammarKit = "2022.3.+"
+kotlin = "1.8.+"
+ktlint = "11.+"
+jacocolog = "3.+"
+qodana = "0.1.+"
+
+[libraries]
+junit-engine = { group = "org.junit.vintage", name = "junit-vintage-engine", version.ref = "junit" }
+kotest-runner = { group = "io.kotest", name = "kotest-runner-junit5", version.ref = "kotest" }
+kotest-assertions = { group = "io.kotest", name = "kotest-assertions-core", version.ref = "kotest" }
+kotest-datatest = { group = "io.kotest", name = "kotest-framework-datatest", version.ref = "kotest" }
+mockk = { group = "io.mockk", name = "mockk", version.ref = "mockk" }
+
+[bundles]
+kotest = ["kotest-runner", "kotest-assertions", "kotest-datatest"]
+
+[plugins]
+changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" }
+gradleIntelliJPlugin = { id = "org.jetbrains.intellij", version.ref = "gradleIntelliJPlugin" }
+grammarKit = { id = "org.jetbrains.grammarkit", version.ref = "grammarKit" }
+kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
+ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" }
+jacocolog = { id = "org.barfuin.gradle.jacocolog", version.ref = "jacocolog" }
+qodana = { id = "org.jetbrains.qodana", version.ref = "qodana" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists