Compatibility with 2021.3 (#50)

* chore: update to latest versions of gradle wrapper and gradle

* chore: update build setup, update to 2021.3

* Fix unstable tests with 2021.3

* chore: update changelog and description

Author: jansorg

CHANGELOG.md

@@ -8,6 +8,10 @@
 ### Changed
 
 ### Fixed
+## [0.8.2]
+### Fixed
+- Compatibility with 2021.3
+
 ## [0.8.2]
 ### Fixed
 - Compatibility with 2021.2

README.md

@@ -4,7 +4,8 @@
 
 ## Usage
 
-The CUE plugin is compatible with **any JetBrains IDE 2020.3**. Only IntelliJ-based IDEs are supported, i.e. it's incompatible with ReSharper.
+The CUE plugin is compatible with **any JetBrains IDE 2020.3** or later. 
+Only IntelliJ-based IDEs are supported, i.e. it's incompatible with ReSharper.
 
 ### Features
 
@@ -42,7 +43,7 @@ Development is best in IntelliJ IDEA.
 
 The following plugins are required for development:
 
-- [GrammarKit 2021.1.1](https://plugins.jetbrains.com/plugin/6606-grammar-kit)
+- [GrammarKit 2021.1.2](https://plugins.jetbrains.com/plugin/6606-grammar-kit)
 - Gradle
 - Kotlin, for Gradle build file support
 

build.gradle.kts

@@ -6,12 +6,13 @@ plugins {
     id("java")
 
     // gradle-intellij-plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin
-    id("org.jetbrains.intellij") version "1.1.4"
+    id("org.jetbrains.intellij") version "1.3.0"
 
     // gradle-changelog-plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin
-    id("org.jetbrains.changelog") version "1.2.1"
+    id("org.jetbrains.changelog") version "1.3.1"
 
-    id("org.jetbrains.grammarkit") version "2021.1.3"
+    // gradle-grammarkit-plugin - read more: https://github.com/JetBrains/gradle-grammar-kit-plugin
+    id("org.jetbrains.grammarkit") version "2021.2.1"
 }
 
 // Import variables from gradle.properties file
@@ -102,11 +103,11 @@ tasks { // disable building searchable options to speed up build, we currently d
         // https://plugins.jetbrains.com/docs/intellij/deployment.html#specifying-a-release-channel
         channels.set(pluginVersion.split('-').getOrElse(1) { "default" }.split('.').take(1))
     }
-}
 
-tasks.register<org.jetbrains.grammarkit.tasks.GenerateLexer>("generateLexer") {
-    source = "src/grammar/cue.flex"
-    targetDir = "src/main/java-gen/dev/monogon/cue/lang/lexer"
-    targetClass = "_CueLexerGen"
-    purgeOldFiles = true
-}
+    generateLexer {
+        source.set("src/grammar/cue.flex")
+        targetDir.set("src/main/java-gen/dev/monogon/cue/lang/lexer")
+        targetClass.set("_CueLexerGen")
+        purgeOldFiles.set(true)
+    }
+}

gradle.properties

@@ -3,17 +3,18 @@
 
 pluginGroup = dev.monogon.cuelang
 pluginName_ = intellij-cue
-pluginVersion = 0.8.2
+pluginVersion = 0.8.3
 pluginSinceBuild = 203
-pluginUntilBuild = 212.*
+pluginUntilBuild = 213.*
 # Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
 # See https://jb.gg/intellij-platform-builds-list for available build versions
-pluginVerifierIdeVersions = 2020.3.2,2021.1.3,2021.2
+pluginVerifierIdeVersions = 2020.3.2,2021.1.3,2021.2,2021.3
 
 platformType = IC
 platformVersion = 2020.3.2
 #platformVersion = 2021.1.3
 #platformVersion = 2021.2
+#platformVersion = 2021.3
 platformDownloadSources = true
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 platformPlugins = org.intellij.intelliLang

gradle/wrapper/gradle-wrapper.jar

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