Support 2021.2 (#48)

* Update build setup

* Update README

Author: jansorg

CHANGELOG.md

@@ -3,11 +3,9 @@
 # IntelliJ CUE Language Support Changelog
 
 ## [Unreleased]
-### Added
-
-### Changed
-
 ### Fixed
+- Compatibility with 2021.2
+
 ## [0.8.1]
 
 ### Added

README.md

@@ -4,8 +4,7 @@
 
 ## 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**. Only IntelliJ-based IDEs are supported, i.e. it's incompatible with ReSharper.
 
 ### Features
 
@@ -43,7 +42,7 @@ Development is best in IntelliJ IDEA.
 
 The following plugins are required for development:
 
-- [GrammarKit 2020.3.1](https://plugins.jetbrains.com/plugin/6606-grammar-kit)
+- [GrammarKit 2021.1.1](https://plugins.jetbrains.com/plugin/6606-grammar-kit)
 - Gradle
 - Kotlin, for Gradle build file support
 

build.gradle.kts

@@ -1,12 +1,17 @@
-import org.jetbrains.changelog.closure
 import org.jetbrains.changelog.markdownToHTML
 
-plugins { // Java support
-    id("java") // gradle-intellij-plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin
-    id("org.jetbrains.intellij") version "0.7.2"
+plugins {
+
+    // Java support
+    id("java")
+
+    // gradle-intellij-plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin
+    id("org.jetbrains.intellij") version "1.1.4"
+
     // gradle-changelog-plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin
-    id("org.jetbrains.changelog") version "1.1.2"
-    id("org.jetbrains.grammarkit") version "2020.3.2"
+    id("org.jetbrains.changelog") version "1.2.1"
+
+    id("org.jetbrains.grammarkit") version "2021.1.3"
 }
 
 // Import variables from gradle.properties file
@@ -28,7 +33,6 @@ version = pluginVersion
 // Configure project's dependencies
 repositories {
     mavenCentral()
-    jcenter()
 }
 
 // setup additional source folders
@@ -39,21 +43,21 @@ sourceSets.main {
 // Configure gradle-intellij-plugin plugin.
 // Read more: https://github.com/JetBrains/gradle-intellij-plugin
 intellij {
-    pluginName = pluginName_
-    version = platformVersion
-    type = platformType
-    downloadSources = platformDownloadSources.toBoolean()
-    updateSinceUntilBuild = true
+    pluginName.set(pluginName_)
+    version.set(platformVersion)
+    type.set(platformType)
+    downloadSources.set(platformDownloadSources.toBoolean())
+    updateSinceUntilBuild.set(true)
 
     // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file.
-    setPlugins(*platformPlugins.split(',').map(String::trim).filter(String::isNotEmpty).toTypedArray())
+    plugins.set(platformPlugins.split(',').map(String::trim).filter(String::isNotEmpty).toList())
 }
 
 // Configure gradle-changelog-plugin plugin.
 // Read more: https://github.com/JetBrains/gradle-changelog-plugin
 changelog {
-    version = pluginVersion
-    groups = listOf("Added", "Changed", "Fixed")
+    version.set(pluginVersion)
+    groups.set(listOf("Added", "Changed", "Fixed"))
 }
 
 tasks { // disable building searchable options to speed up build, we currently don't settings UI
@@ -68,32 +72,35 @@ tasks { // disable building searchable options to speed up build, we currently d
     }
 
     patchPluginXml {
-        version(pluginVersion)
-        sinceBuild(pluginSinceBuild)
-        untilBuild(pluginUntilBuild)
+        version.set(pluginVersion)
+        sinceBuild.set(pluginSinceBuild)
+        untilBuild.set(pluginUntilBuild)
 
         // Extract the <!-- Plugin description --> section from README.md and provide for the plugin's manifest
-        pluginDescription(closure {
+        pluginDescription.set(provider {
             file("${project.rootDir}/plugin-description.md").readText().run { markdownToHTML(this) }
         })
 
         // Get the latest available change notes from the changelog file
-        changeNotes(closure {
+        changeNotes.set(provider {
             changelog.getLatest().toHTML()
         })
     }
 
     runPluginVerifier {
-        ideVersions(pluginVerifierIdeVersions)
+        ideVersions.set(provider {
+            pluginVerifierIdeVersions.split(',')
+        })
     }
 
     publishPlugin {
         dependsOn("patchChangelog")
-        token(System.getenv("PUBLISH_TOKEN"))
+        token.set(System.getenv("PUBLISH_TOKEN"))
+
         // pluginVersion is based on the SemVer (https://semver.org) and supports pre-release labels, like 2.1.7-alpha.3
         // Specify pre-release label to publish the plugin in a custom Release Channel automatically. Read more:
         // https://plugins.jetbrains.com/docs/intellij/deployment.html#specifying-a-release-channel
-        channels(pluginVersion.split('-').getOrElse(1) { "default" }.split('.').first())
+        channels.set(pluginVersion.split('-').getOrElse(1) { "default" }.split('.').take(1))
     }
 }
 

gradle.properties

@@ -3,16 +3,17 @@
 
 pluginGroup = dev.monogon.cuelang
 pluginName_ = intellij-cue
-pluginVersion = 0.8.1
+pluginVersion = 0.8.2
 pluginSinceBuild = 203
-pluginUntilBuild = 211.*
+pluginUntilBuild = 212.*
 # 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,IC-211.6432.7
+pluginVerifierIdeVersions = 2020.3.2,2021.1.3,2021.2
 
 platformType = IC
 platformVersion = 2020.3.2
-#platformVersion = 211.6432.7-EAP-SNAPSHOT
+#platformVersion = 2021.1.3
+#platformVersion = 2021.2
 platformDownloadSources = true
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 platformPlugins = org.intellij.intelliLang