From 7b1cd6e7659c91c746af3881aacf594a39b0faf6 Mon Sep 17 00:00:00 2001
From: "hansong.xhs" <hansong.xhs@gmail.com>
Date: Sun, 17 Nov 2019 07:48:47 -0800
Subject: [PATCH] upgrade to version 1.4

---
 README.md                              | 11 +++++++----
 build.gradle                           |  7 ++++---
 src/main/resources/META-INF/plugin.xml | 18 +++++++++++++-----
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 10cddc3..277bf54 100644
--- a/README.md
+++ b/README.md
@@ -3,20 +3,23 @@ A idea-plugin for Java/Scala to generate code, support custom code template.
 
 ![demonstration](https://blog.xiaohansong.com/media/15473672636863/15473884273212.gif)
 
-This plugin generates code from right click 'Generate...' menu while focused on a Java/Scala class. The output class can be customized using a provided velocity template to format the code based on the origin class and optional selected classes.</p>
+This plugin generates code from right click 'Generate...' menu while focused on a Java/Scala class. The output class can be customized using a provided velocity template to format the code based on the origin class and optional selected classes. There are many features are contributed by [Dmitry Karlinsky](https://github.com/dkarlinsky) and I appreciate that.
 
 The following features are available: 
 
+- Support add custom template to generate more code.(Velocity templates and groovy templates)
 - Generate the model class for the persistent class.
 - Generate the converter class for the model class and the persistent class.
-- Support add custom template to generate more code.
 - Generate `@see` doc for override method.
 - Support Scala.
 - Generate api table from code 
 
 # Install
-1. Search 'CodeMaker' in Idea plugins
-2. Download [Releases](https://github.com/x-hansong/CodeMaker/releases)
+## Option 1
+- Search 'CodeMaker' in Idea plugins repository.
+
+## Option 2
+Download [Releases](https://github.com/x-hansong/CodeMaker/releases)
 
 To install a plugin from the disk in idea
 
diff --git a/build.gradle b/build.gradle
index a05e650..d2e6daf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,10 +16,11 @@ repositories {
 }
 
 dependencies {
-    compile group: 'org.projectlombok', name: 'lombok', version: '1.16.14'
+    compileOnly 'org.projectlombok:lombok:1.18.8'
+    annotationProcessor 'org.projectlombok:lombok:1.18.8'
     compile group: 'commons-io', name: 'commons-io', version: '2.5'
     testCompile("io.kotlintest:kotlintest-runner-junit5:3.3.2")
-    testCompile "io.mockk:mockk:v1.9.3"
+    testCompile "io.mockk:mockk:1.9.3"
 }
 
 apply plugin: 'java'
@@ -34,5 +35,5 @@ intellij {
 }
 
 group 'com.xiaohansong'
-version '1.6'
+version '1.4'
 
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index 06c9231..0c87d52 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -1,18 +1,19 @@
 <idea-plugin>
     <id>com.xiaohansong.codemaker</id>
     <name>CodeMaker</name>
-    <version>1.3</version>
+    <version>1.4</version>
     <vendor email="hansong.xhs@gmail.com" url="https://github.com/x-hansong/CodeMaker">Personal</vendor>
 
     <description><![CDATA[
     <p>This plugin generates code from right click 'Generate...' menu while focused
     on a java/scala class. The output class can be customized using a provided velocity template to format
-    the code based on the origin class and optional selected classes.</p>
+    the code based on the origin class and optional selected classes. There are many features are contribute
+    by Dmitry Karlinsky and I appreciate that.</p>
     <p>The following features are available: </p>
     <ul>
+      <li>Support add custom template to generate codes.(Velocity templates and groovy templates)</li>
       <li>Generate the model class for the persistent class.</li>
       <li>Generate the converter class for the model class and the persistent class.</li>
-      <li>Support add custom template to generate more code.</li>
       <li>Generate @see doc for override method</li>
       <li>Generate Api table to clipboard (html or markdown format)</li>
       <li>Generate the class field from api table in clipboard</li>
@@ -31,10 +32,17 @@
         Support selecting destination source root for the generated class. Thanks to @dkarlinsky<br>
         Support custom the generate file encoding<br>
       </li>
-        <li>version 1.3<br>
+      <li>version 1.3<br>
         Support generate api table for the class fields and paste it to the clipboard (html or markdown format)
         Support generate the class fields from the api table in clipboard
       </li>
+      <li>version 1.4 (New features are contributed by Dmitry Karlinsky.)<br>
+        Support for groovy templates (similar to GSP, based on GStringTemplateEngine)<br>
+        Templates editor screen reworked.<br>
+        Added target language selector, per template.<br>
+        Added "test template" functionality based on selectable test inputs, currently Java class and Scala case class.<br>
+        Added Kotlin support to the build and refactored out some logic and UI to Kotlin classes<br>
+      </li>
     </ul>
     ]]>
     </change-notes>
@@ -48,7 +56,7 @@
     <depends>com.intellij.modules.lang</depends>
     -->
     <depends>com.intellij.modules.java</depends>
-    <depends optional="true">org.intellij.scala</depends>
+    <depends optional="true" config-file="">org.intellij.scala</depends>
 
     <extensions defaultExtensionNs="com.intellij">
         <!-- Add your extensions here -->