Update gradle build

Author: meanmail

.idea/deployment.xml

@@ -1,60 +1,56 @@
-import org.jetbrains.intellij.tasks.PatchPluginXmlTask
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
-plugins {
-    java
-    kotlin("jvm") version "1.4.30"
-    id("org.jetbrains.intellij") version "0.7.2"
-}
-
-group = "ru.meanmail"
-version = "${project.properties["version"]}-${project.properties["postfix"]}"
+fun config(name: String) = project.findProperty(name).toString()
 
 repositories {
     mavenCentral()
 }
 
-dependencies {
-    implementation(kotlin("stdlib-jdk8"))
-    testImplementation("junit:junit:4.13.2")
-}
-
-configure<JavaPluginConvention> {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-}
-
-tasks.withType<KotlinCompile> {
-    kotlinOptions.jvmTarget = "11"
-}
-
-tasks.withType<Wrapper> {
-    distributionType = Wrapper.DistributionType.ALL
-    gradleVersion = project.properties["gradleVersion"].toString()
+plugins {
+    java
+    kotlin("jvm") version "1.5.10"
+    id("org.jetbrains.intellij") version "1.3.0"
 }
 
-tasks.test {
-    useJUnit()
+group = config("group")
+version = "${config("version")}-${config("platformVersion")}"
 
-    maxHeapSize = "1G"
+dependencies {
+    compileOnly("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.10")
+    testImplementation("junit:junit:4.13.2")
 }
 
 intellij {
-    pluginName = project.properties["pluginName"].toString()
-    version = if (project.properties["eap"].toString() == "true") {
-        "LATEST-EAP-SNAPSHOT"
-    } else {
-        project.properties["IdeVersion"].toString()
-    }
-    type = project.properties["ideType"].toString()
-    when (type) {
-        "PY" -> {
-            setPlugins("python")
+    pluginName.set(config("pluginName"))
+    version.set(
+        if (config("platformVersion") == "eap") {
+            "LATEST-EAP-SNAPSHOT"
+        } else {
+            config("platformVersion")
         }
-        "PC" -> {
-            setPlugins("PythonCore")
+    )
+    type.set(config("platformType"))
+
+    val usePlugins = config("usePlugins").split(',')
+    for (plugin in usePlugins) {
+        if (plugin.isEmpty()) {
+            continue
         }
-        else -> {
-            setPlugins(project.properties["pythonPluginVersion"].toString())
+        val (name, version) = plugin.split(':')
+        if (name == "python") {
+            when (type.get()) {
+                "PY" -> {
+                    plugins.add("python")
+                }
+                "PC" -> {
+                    plugins.add("PythonCore")
+                }
+                else -> {
+                    plugins.add("PythonCore:${version}")
+                }
+            }
+        } else {
+            plugins.add(plugin)
         }
     }
 }
@@ -88,11 +84,44 @@ fun readChangeNotes(pathname: String): String {
         it.joinToString("<br>")
     } +
             "See the full change notes on the <a href='" +
-            project.properties["repository"] +
-            "/blob/master/ChangeNotes.md'>github</a>"
+            config("repository") +
+            "/blob/master/CHANGES.md'>github</a>"
 }
 
-tasks.withType<PatchPluginXmlTask> {
-    setPluginDescription(file("Description.html").readText())
-    setChangeNotes(readChangeNotes("ChangeNotes.md"))
+tasks {
+    config("jvmVersion").let {
+        withType<JavaCompile> {
+            sourceCompatibility = it
+            targetCompatibility = it
+        }
+        withType<KotlinCompile> {
+            kotlinOptions.jvmTarget = it
+        }
+    }
+
+    wrapper {
+        distributionType = Wrapper.DistributionType.ALL
+        gradleVersion = config("gradleVersion")
+    }
+
+    test {
+        useJUnit()
+
+        maxHeapSize = "1G"
+    }
+
+    patchPluginXml {
+        version.set(project.version.toString())
+        pluginDescription.set(file("description.html").readText())
+        changeNotes.set(readChangeNotes("CHANGES.md"))
+    }
+
+    publishPlugin {
+        dependsOn("buildPlugin")
+        token.set(System.getenv("PUBLISH_TOKEN"))
+        channels.set(listOf(config("publishChannel")))
+    }
+    buildSearchableOptions {
+        enabled = false
+    }
 }

.idea/misc.xml

@@ -1,13 +1,20 @@
 # Gradle
-gradleVersion=6.8.2
+gradleVersion=7.3
 org.gradle.parallel=true
+jvmVersion=11
+#
 # Plugin
+group=dev.meanmail
 repository=https://github.com/meanmail/prettify-python-plugin
 pluginName=Prettify python
-version=2020.3
-postfix=212
-# IDE
-eap=false
-IdeVersion=2021.2
-ideType=PC
-pythonPluginVersion=PythonCore:212.4746.92
+version=2020.2
+# https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library
+kotlin.stdlib.default.dependency=false
+#
+# Platform
+platformVersion=213-EAP-SNAPSHOT
+platformType=PC
+usePlugins=python:213.4293.20
+#
+# Publish
+publishChannel=default

.idea/modules/prettify-python.test.iml

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