Merge branch 'v3' of github.com:algolia/algoliasearch-client-android into v3

Clément Le Provost · Clément Le Provost · commit cea0222303ae · 2016-04-12T16:02:47.000+02:00
diff --git a/algoliasearch/android-release-jar.gradle b/algoliasearch/android-release-jar.gradle
@@ -98,7 +98,7 @@ uploadArchives {
                 }
             }
         }
-        
+
         pom.withXml {
             asNode().dependencies.dependency.findAll { xmlDep ->
                 // mark optional dependencies
@@ -113,12 +113,12 @@ uploadArchives {
                 }
             }
         }
-        
+
         // Add other pom properties here if you want (developer details / licenses)
         repository(url: "file://${localReleaseDest}")
 
         repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
-            authentication(userName: project.hasProperty('ossrhUsername') ? project['ossrhUsername'] : 'FIXME', password: project.hasProperty('ossrhPassword') ? project['ossrhPassword'] : 'FIXME')
+            authentication(userName: project.hasProperty('nexusUsername') ? project['nexusUsername'] : 'FIXME', password: project.hasProperty('nexusPassword') ? project['nexusPassword'] : 'FIXME')
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ uploadArchives {`
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`	`}`
`101`		`-`
	`101`	`+`
`102`	`102`	`pom.withXml {`
`103`	`103`	`asNode().dependencies.dependency.findAll { xmlDep ->`
`104`	`104`	`// mark optional dependencies`
`@@ -113,12 +113,12 @@ uploadArchives {`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`	`}`
`116`		`-`
	`116`	`+`
`117`	`117`	`// Add other pom properties here if you want (developer details / licenses)`
`118`	`118`	`repository(url: "file://${localReleaseDest}")`
`119`	`119`
`120`	`120`	`repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {`
`121`		`- authentication(userName: project.hasProperty('ossrhUsername') ? project['ossrhUsername'] : 'FIXME', password: project.hasProperty('ossrhPassword') ? project['ossrhPassword'] : 'FIXME')`
	`121`	`+ authentication(userName: project.hasProperty('nexusUsername') ? project['nexusUsername'] : 'FIXME', password: project.hasProperty('nexusPassword') ? project['nexusPassword'] : 'FIXME')`
`122`	`122`	`}`
`123`	`123`	`}`
`124`	`124`	`}`