Merge pull request #49 from rpmoore/master

hansdude · hansdude · commit 5fab2f221d55 · 2014-10-15T12:37:47.000-06:00
Upgrading gradle to 2.1
diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,4 @@ atlassian-ide-plugin.xml
 *.class
 .*.swp
 /bin
+*.log
diff --git a/build.gradle b/build.gradle
@@ -19,8 +19,8 @@ allprojects {
 }
 
 subprojects {
-    apply plugin: 'java'
     apply plugin: 'maven'
+    apply plugin: 'java'
 
     sourceCompatibility = JavaVersion.VERSION_1_7
     repositories {
@@ -35,7 +35,7 @@ subprojects {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.0'
+    gradleVersion = '2.1'
 }
 
 project(':integration') {
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Jul 29 14:10:20 MDT 2014
+#Mon Oct 13 13:19:26 MDT 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-all.zip

-Original file line number
+Diff line change
 *.class
 .*.swp
 /bin
 +*.log
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@ allprojects {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`subprojects {`
`22`		`- apply plugin: 'java'`
`23`	`22`	`apply plugin: 'maven'`
	`23`	`+ apply plugin: 'java'`
`24`	`24`
`25`	`25`	`sourceCompatibility = JavaVersion.VERSION_1_7`
`26`	`26`	`repositories {`
`@@ -35,7 +35,7 @@ subprojects {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`task wrapper(type: Wrapper) {`
`38`		`- gradleVersion = '2.0'`
	`38`	`+ gradleVersion = '2.1'`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`project(':integration') {`