Merge branch 'dev'

Conflicts: README.md
jguerinet · May 20, 2015 · 825b576 · 825b576
2 parents 429a550 + a1d0cf5
commit 825b576
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ To use this:
 * Keys must be unique, not have spaces, and not be null (the parser will inform of any of these errors when you run it) 
 * Run the jar
 
-[1]:https://github.com/jguerinet/mobile-string-parser/releases/download/v2.5/mobile-string-parser-2.5.jar
+[1]:https://github.com/jguerinet/mobile-string-parser/releases/download/v2.6/mobile-string-parser-2.6.jar
 [2]:https://raw.githubusercontent.com/jguerinet/mobile-string-parser/master/sample-config.txt
 
 ## Branches

diff --git a/build.gradle b/build.gradle
@@ -19,7 +19,7 @@ apply plugin: 'java'
 apply plugin:'application'
 
 sourceCompatibility = 1.7
-version = '2.5'
+version = '2.6'
 
 repositories {
     mavenCentral()
@@ -35,6 +35,9 @@ jar {
     manifest {
         attributes 'Main-Class': 'com.guerinet.stringparser.StringParser'
     }
+    from {
+        configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
+    }
 }
 
 dependencies {