2017.1 (IDEA versioning scheme)

Author: gregsh

README.md

@@ -228,18 +228,19 @@ java -jar expression-console-sample.jar
 
 Change log
 ==========
-1.5.3-snapshot
+2017.1
 
-* BNF and JFlex PSI: merge PSI and AST trees (memory/performance)
+* Plugin: switch to IntelliJ IDEA versioning scheme
+* BNF and JFlex PSI: merge AST and PSI trees (memory/performance)
 * Generator: support dash-separated and angle-quoted rules
-* Generator: freeze on generation several grammars at once
+* Generator: "psi-factory" support for merged AST and PSI trees
 * Generator: honor explicitly set rule name
-* Generator: fix custom consume-type not being used after a predicate
+* Generator: fix freeze on generation several grammars at once
 
 1.5.2
 
 * Generator: disable first-check in presence of external predicates
-* Generator: support mixed AST-PSI trees (psi.impl.source.tree.CompositePsiElement inheritors)
+* Generator: support merged AST and PSI trees (psi.impl.source.tree.CompositePsiElement inheritors)
 * Generator: add generate=[psi-classes-map="yes"] option
 * Generator: alert of missing psi implementation methods #155
 * Generator: merge multiple list-valued attributes, e.g. "implements", "methods"

gradle.properties

@@ -18,11 +18,11 @@
 # https://www.jetbrains.com/intellij-repository/releases
 # https://www.jetbrains.com/intellij-repository/snapshots
 
-version = 1.5.3-SNAPSHOT
+version=2017.1
 
-ideaVersion = 2017.2
-javaVersion = 1.8
+ideaVersion=2017.2
+javaVersion=1.8
 
-artifactsPath = build/artifacts
+artifactsPath=build/artifacts
 
 org.gradle.jvmargs=-Xmx256m -Dfile.encoding=utf-8

resources/META-INF/plugin.xml

@@ -1,6 +1,6 @@
 <idea-plugin url="https://github.com/JetBrains/Grammar-Kit">
   <id>org.jetbrains.idea.grammar</id>
-  <version>1.5.3-SNAPSHOT</version>
+  <version>2017.1</version>
   <vendor email="[email protected]">Greg Shrago</vendor>
   <idea-version since-build="171" until-build="173.*"/>
 
@@ -14,10 +14,12 @@
   <change-notes>
     <![CDATA[
     <ul>
-      <li>BNF and JFlex PSI: merge PSI and AST trees (memory/performance)</li>
+      <li>Plugin: switch to IntelliJ IDEA versioning scheme</li>
+      <li>BNF and JFlex PSI: merge AST and PSI trees (memory/performance)</li>
       <li>Generator: support dash-separated and angle-quoted rules</li>
-      <li>Generator: freeze on generation several grammars at once</li>
+      <li>Generator: "psi-factory" support for merged AST and PSI trees</li>
       <li>Generator: honor explicitly set rule name</li>
+      <li>Generator: fix freeze on generation several grammars at once</li>
       <li>Generator: fix custom consume-type not being used after a predicate</li>
     </ul>
     <a href="https://github.com/JetBrains/Grammar-Kit#change-log">Full change log...</a>