Merge pull request #21 from SeeSharpSoft/master

Release 1.6.0

Author: SeeSharpSoft

.travis.yml

@@ -1,14 +1,20 @@
 language: java
 jdk:
   - oraclejdk8
-  
+
 env:
   - IDEA_VERSION=IC-2016.3.2 GRAMMAR_KIT_VERSION=1.4.3
   - IDEA_VERSION=IC-2017.3.2 GRAMMAR_KIT_VERSION=2017.1.2
-  - IDEA_VERSION=LATEST-EAP-SNAPSHOT GRAMMAR_KIT_VERSION=2017.1.2
 
-script:
-  - gradle check verifyPlugin
-  
 after_success:
   - gradle jacocoTestReport coveralls
+
+jobs:
+  include:
+    - if: (branch = master AND type = push) OR (type = pull_request)
+      env: IDEA_VERSION=LATEST-EAP-SNAPSHOT GRAMMAR_KIT_VERSION=2017.1.2
+      script: gradle check verifyPlugin
+    - stage: deploy
+      if: branch IN (Testing, Staging, Stable) AND type = push
+      env: IDEA_VERSION=IC-2017.3.2 GRAMMAR_KIT_VERSION=2017.1.2 JI_CHANNELS=$TRAVIS_BRANCH
+      script: gradle publishPlugin

build.gradle

@@ -68,12 +68,17 @@ idea {
 apply plugin: 'org.jetbrains.intellij'
 intellij {
     // IDE version - https://www.jetbrains.com/intellij-repository/releases
-    version = System.getenv().getOrDefault('IDEA_VERSION', 'IC-2017.3.5')
+    version = System.getenv().getOrDefault('IDEA_VERSION', 'IC-2018.1')
     pluginName = 'CSV Plugin'
     instrumentCode = true
     updateSinceUntilBuild = false
     downloadSources = false
 }
+publishPlugin {
+    username = System.getenv().getOrDefault('JI_USER', '')
+    password = System.getenv().getOrDefault('JI_PASSWORD', '')
+    channels = [System.getenv().getOrDefault('JI_CHANNELS', 'Testing')]
+}
 
 test {
     jacoco {
@@ -99,7 +104,7 @@ import org.jetbrains.grammarkit.tasks.GenerateParser
 
 task generateCsvParser(type: GenerateParser) {
     source = 'src/main/java/net/seesharpsoft/intellij/plugins/csv/Csv.bnf'
-    targetRoot 'gen'
+    targetRoot = 'gen'
     pathToParser = '/net/seesharpsoft/intellij/plugins/csv/parser/CsvParser.java'
     pathToPsiRoot = '/net/seesharpsoft/intellij/plugins/csv/psi'
     purgeOldFiles = true

gradle.properties

@@ -3,7 +3,7 @@
 # https://www.jetbrains.com/intellij-repository/snapshots
 
 name='CSV Plugin'
-pluginVersion=1.6.1
+pluginVersion=1.6.0
 javaVersion=1.8
 javaTargetVersion=1.8
 downloadIntellijSources=false

intellij-csv-validator.iml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="intellij-csv-validator" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="net.seesharpsoft.intellij.plugins" external.system.module.version="1.6.1" relativePaths="true" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="intellij-csv-validator" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="net.seesharpsoft.intellij.plugins" external.system.module.version="1.6.0" relativePaths="true" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">