Merge remote-tracking branch 'upstream/master'

Author: ricardojlrufino

build.gradle

@@ -103,8 +103,18 @@ repositories {
 uploadArchives {
 	repositories {
 		mavenDeployer {
-			repository(url: 'file:///' + projectDir + '/../localMavenRepo')
 			beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+			if (project.hasProperty('upload') && Boolean.parseBoolean(upload)) { // gradlew -Pupload=true
+				repository(url: 'https://oss.sonatype.org/service/local/staging/deploy/maven2/') {
+					authentication(userName: ossrhUsername, password: ossrhPassword)
+				}
+				snapshotRepository(url: 'https://oss.sonatype.org/content/repositories/snapshots/') {
+					authentication(userName: ossrhUsername, password: ossrhPassword)
+				}
+			}
+			else {
+				repository(url: 'file:///' + projectDir + '/../localMavenRepo')
+			}
 			pom {
 				groupId = 'com.fifesoft'
 				name = 'autocomplete'
@@ -143,7 +153,9 @@ uploadArchives {
 						url 'https://github.com/bobbylight/AutoComplete'
 						connection 'scm:git:git://github.com/bobbylight/AutoComplete'
 						developerConnection 'scm:git:[email protected]:bobbylight/AutoComplete'
-						tag '2.5.4'
+						if (!project.version.endsWith('-SNAPSHOT')) {
+							tag project.version
+						}
 					}
 
 					developers {

gradle.properties

@@ -1,3 +1,3 @@
 # Note that Maven- and signing-related properties are in <gradle-user-home>/gradle.properties
 javaVersion=1.5
-version=2.5.4
+version=2.6.0-SNAPSHOT