Merge branch 'release/0.6.7'

Author: OpherV

.gitignore

@@ -1,7 +1,104 @@
+# Created by .ignore support plugin (hsz.mobi)
+
+### Gradle template
+.gradle
+/build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Cache of project
+.gradletasknamecache
+
+# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
+# gradle/wrapper/gradle-wrapper.properties
+
+### Java template
+# Compiled class file
 *.class
-/.project
-.idea
-*.zip
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
 *.jar
-out
-*.iml
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+### JetBrains template
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/dictionaries
+.idea/**/shelf
+.idea/**/hotswap_agent.xml
+.idea/**/misc.xml
+.idea/**/checkstyle-idea.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+.idea/**/gradle.xml
+.idea/**/libraries
+.idea/**/modules.xml
+**/*.iml
+.idea/libraries/**/*.xml
+
+# CMake
+cmake-build-debug/
+cmake-build-release/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# GitEye project file
+/.project

.idea/vcs.xml

@@ -0,0 +1,42 @@
+plugins {
+    id 'java'
+    id 'org.jetbrains.intellij' version '0.3.12'
+}
+
+group 'gitflow4idea'
+version '0.6.7'
+
+sourceCompatibility = 1.6
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    testCompile group: 'junit', name: 'junit', version: '4.12'
+}
+
+intellij {
+    version '2018.3'
+    plugins 'git4idea', 'tasks'
+}
+
+patchPluginXml {
+    pluginId "Gitflow"
+    pluginDescription 'Git Flow Integration'
+    version '0.6.7'
+    sinceBuild '182.0'
+    untilBuild '183.*'
+    changeNotes """
+      <H2>Changelog for 0.6.7</H2>         
+      <ul>
+        <li>Support for Idea build 183 #210 (@opherv)</li>
+        <li>Feature: Bugfix support #122 (@straurob)</li>     
+        <li>Feature: pushOnFinish to feature options (@bmwsedee)</li>     
+        <li>Bugfix UI freeze on custom gitflow init #198 (@bmwsedee)</li>
+        <li>Implementation: plugin is now built with gradle (@straurob)</li>
+      </ul>
+    
+    <p>Note - if you see 'no gitflow' in the status bar you will need to re-init using <code>git flow init -f</code></p>
+      """
+}

META-INF/plugin.xml

@@ -1,26 +1,56 @@
-# Project setup help
+# Setup Guide
+This document shall assist you in setting up the development project in IntelliJ IDEA. There are two ways of setting up the project:
+1. Gradle Setup
+2. "Classic" Setup
+
+## Gradle Setup
+
+### Prerequisites
+- The environment variable `JAVA_HOME` is set to a valid Java environment.
+- The *Gradle* plugin is enable in IntelliJ IDEA.
+
+### Setup Steps
+1. Fork the original repository and checkout the fork.
+2. Import the project into IntelliJ IDEA.
+3. Choose *"Import from external model" > Gradle*.
+4. Set the following options in the import dialog:
+    - *Use Auto Import*
+    - *Create directories for empty content roots automatically*
+    - *Use default gradle wrapper (recommended)*
+ 
+![Import project dialog](./img/import_project.png?raw=true "Import Project Dialog")  
+![Import options dialog](./img/import_options.png?raw=true "Import Options Dialog")  
+    
+### Run Configuration
+Add a new run configuration of type *Gradle* with the following settings:
+- Set the current project as *Gradle project*
+- In *Tasks* enter `runIde`.
+
+This should give you a basic run configuration which will start a new IntelliJ instance with the plugin deployed.
 
-This is a quick overview how to setup the project for development.
+![Run configuration dialog](./img/run_configuration.png?raw=true "Run Configuration")
 
-## 1. Make sure the plugin development plugin is enabled  
+## "Classic" Setup
+
+### 1. Make sure the plugin development plugin is enabled  
 
 Start IDEA, go to *Settings -> Plugins* and make sure that `Plugin DevKit` is installed and enabled.
 If it's not, install it now.
 
-## 2. Clone the project from GitHub
+### 2. Clone the project from GitHub
 
 Typically you check out your fork of the project on GitHub here.
 
-## 3. Import the project into IDEA 
+### 3. Import the project into IDEA 
 
 Select the *Import Project* option (e.g. by pressing shift twice and entering "import project") 
 and navigate to the cloned repository directory when prompted. 
 
-### Model
+#### Model
 
 Chose "From existing sources" when prompted for a model.
 
-### SDK Setup 
+#### SDK Setup 
 
 If you dont have a plugin SDK yet, click `+` to add an SDK and select *IntelliJ Platform Plugin SDK*
 
@@ -29,11 +59,11 @@ If you dont have a plugin SDK yet, click `+` to add an SDK and select *IntelliJ
 
 Select your plugin SDK as the one to use.
 
-### Other
+#### Other
 
 The remaining options can be left at default
 
-## 4. Change the project type
+### 4. Change the project type
 
 Open the projects iml file (it should be named `gitflow4idea.iml` by default) and replace its contents with this:
 
@@ -53,24 +83,23 @@ Open the projects iml file (it should be named `gitflow4idea.iml` by default) an
 
 Then close and reopen the project to apply the changes.
 
-## 5. Add git4idea dependency
+### 5. Add git4idea dependency
 
 1. Open the module settings and navigate to *Modules -> gitflow4idea (or your project name here)* and select the *Dependencies* tab. 
 2. Click add -> "JARs or directories" and add `git4idea.jar`.
     This can be found in your IDEA installation directory under `plugins/git4idea/lib`.
 3. Change the scope of the added JAR to **provided**.
 
-## 6. Create a run configuration
+### 6. Create a run configuration
 
 Go to Run/Debug configurations and create a new configuration of the type `Plugin`. Under "Use classpath of module" select the project (`gitflow4idea` by default).
 Click run. A new IDEA instance should start with the plugin running. 
 
 And that's it. You can now make changes to the source and run them.
 
-## Notes & hints
+### Notes & hints
 
-### Language level
+#### Language level
 
 This project is written to target Java 6, so make sure to set the project language level appropriately
- to avoid accidentally using newer features. You can do so in the module settings under "modules -> gitflow4idea -> sources -> Language level".
-
+ to avoid accidentally using newer features. You can do so in the module settings under "modules -> gitflow4idea -> sources -> Language level".

build.gradle

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