Rewrite Gradle script to us Kotlin DSL, code cleanup

build.gradle

@@ -1,36 +0,0 @@
-plugins {
-    id 'java'
-    id 'org.jetbrains.intellij' version '0.4.18'
-}
-
-group pluginGroup
-version pluginVersion
-
-sourceCompatibility = 1.8
-
-repositories {
-    mavenCentral()
-}
-
-
-// https://github.com/JetBrains/gradle-intellij-plugin
-
-intellij {
-    pluginName pluginName
-    version ideaVersion
-    type ideaType
-    plugins = ['java']
-//    updateSinceUntilBuild = false
-    downloadSources Boolean.valueOf(sources)
-
-}
-
-patchPluginXml {
-    version project.version
-//    sinceBuild sinceBuild
-}
-
-publishPlugin {
-    token 'ssdfhasdfASDaq23jhnasdkjh'
-    channels 'nightly'
-}

build.gradle.kts

@@ -0,0 +1,59 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+plugins {
+    id("java")
+    id("org.jetbrains.kotlin.jvm") version "1.3.72"
+    id("org.jetbrains.intellij") version "0.4.18"
+}
+
+val pluginGroup: String by project
+val pluginName: String by project
+val pluginVersion: String by project
+val ideaVersion: String by project
+val ideaType: String by project
+val sources: String by project
+
+group = pluginGroup
+version = pluginVersion
+
+tasks.withType<JavaCompile> {
+    sourceCompatibility = "1.8"
+    targetCompatibility = "1.8"
+}
+listOf("compileKotlin", "compileTestKotlin").forEach {
+    tasks.getByName<KotlinCompile>(it) {
+        kotlinOptions.jvmTarget = "1.8"
+    }
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation(kotlin("stdlib-jdk8"))
+}
+
+// https://github.com/JetBrains/gradle-intellij-plugin
+
+intellij {
+    pluginName = pluginName
+    version = ideaVersion
+    type = ideaType
+    updateSinceUntilBuild = false
+    downloadSources = sources.toBoolean()
+    setPlugins("java")
+}
+
+tasks {
+    patchPluginXml {
+        version(pluginVersion)
+//        changeNotes("")
+//    sinceBuild sinceBuild
+    }
+
+//    publishPlugin {
+//        token("ssdfhasdfASDaq23jhnasdkjh")
+//        channels("nightly")
+//    }
+}

src/main/kotlin/org/jetbrains/plugins/template/TemplateBundle.kt

@@ -8,9 +8,11 @@ import org.jetbrains.annotations.PropertyKey
 private const val BUNDLE = "messages.TemplateBundle"
 
 object TemplateBundle : DynamicBundle(BUNDLE) {
+
     @JvmStatic
     fun message(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params)
 
     @JvmStatic
     fun messagePointer(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): () -> String = { message(key, *params) }
+
 }

src/main/kotlin/org/jetbrains/plugins/template/listeners/MyDynamicPluginListener.kt

@@ -6,18 +6,17 @@ import com.intellij.openapi.components.ServiceManager
 import org.jetbrains.plugins.template.services.MyApplicationService
 
 internal class MyDynamicPluginListener : DynamicPluginListener {
+
     override fun beforePluginLoaded(pluginDescriptor: IdeaPluginDescriptor) {
         ServiceManager.getService(MyApplicationService::class.java)
     }
 
-    override fun pluginLoaded(pluginDescriptor: IdeaPluginDescriptor) {
-        println("xx")
-    }
+    override fun pluginLoaded(pluginDescriptor: IdeaPluginDescriptor) {}
 
     override fun beforePluginUnload(pluginDescriptor: IdeaPluginDescriptor, isUpdate: Boolean) {}
 
-    override fun checkUnloadPlugin(pluginDescriptor: IdeaPluginDescriptor) {
-    }
+    override fun checkUnloadPlugin(pluginDescriptor: IdeaPluginDescriptor) {}
 
     override fun pluginUnloaded(pluginDescriptor: IdeaPluginDescriptor, isUpdate: Boolean) {}
+
 }

src/main/kotlin/org/jetbrains/plugins/template/listeners/MyProjectManagerListener.kt

@@ -5,7 +5,9 @@ import com.intellij.openapi.project.ProjectManagerListener
 import org.jetbrains.plugins.template.services.MyProjectService
 
 internal class MyProjectManagerListener : ProjectManagerListener {
+
     override fun projectOpened(project: Project) {
         project.getService(MyProjectService::class.java)
     }
+
 }

src/main/kotlin/org/jetbrains/plugins/template/services/MyApplicationService.kt

@@ -1,7 +1,11 @@
 package org.jetbrains.plugins.template.services
 
+import org.jetbrains.plugins.template.TemplateBundle
+
 class MyApplicationService {
+
     init {
-        println("MyApplicationService")
+        println(TemplateBundle.message("applicationService"))
     }
+
 }

src/main/kotlin/org/jetbrains/plugins/template/services/MyProjectService.kt

@@ -4,7 +4,9 @@ import com.intellij.openapi.project.Project
 import org.jetbrains.plugins.template.TemplateBundle
 
 class MyProjectService(project: Project) {
+
     init {
         println(TemplateBundle.message("projectService", project.name))
     }
+
 }

src/main/resources/messages/TemplateBundle.properties

@@ -1,2 +1,3 @@
 name=Template Plugin
+applicationService=Application service
 projectService=Project service: {0}