small fixes

gturedi · Mar 1, 2017 · ede23c0 · ede23c0
1 parent 61b8fd5
commit ede23c0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
-GROUP=com.github.gturedi
-VERSION_NAME=1.1.0
-
+POM_GROUP=com.github.gturedi
 POM_ARTIFACT_ID=stateful-layout
+POM_VERSION=1.2.0
+
 POM_NAME=StatefulLayout
 POM_PACKAGING=aar
 POM_DESCRIPTION=Android layout to show template for loading, empty, error etc. states

diff --git a/gradle/mvnPush.gradle b/gradle/mvnPush.gradle
@@ -18,15 +18,15 @@ apply plugin: 'maven'
 apply plugin: 'signing'
 
 def isReleaseBuild() {
-    return VERSION_NAME.contains("SNAPSHOT") == false
+    return POM_VERSION.contains("SNAPSHOT") == false
 }
 
 def getRepositoryUsername() {
-    return hasProperty('SONATYPE_NEXUS_USERNAME') ? SONATYPE_NEXUS_USERNAME : ""
+    return NEXUS_USERNAME
 }
 
 def getRepositoryPassword() {
-    return hasProperty('SONATYPE_NEXUS_PASSWORD') ? SONATYPE_NEXUS_PASSWORD : ""
+    return NEXUS_PASSWORD
 }
 
 afterEvaluate { project ->
@@ -35,9 +35,9 @@ afterEvaluate { project ->
             mavenDeployer {
                 beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
 
-                pom.groupId = GROUP
+                pom.groupId = POM_GROUP
                 pom.artifactId = POM_ARTIFACT_ID
-                pom.version = VERSION_NAME
+                pom.version = POM_VERSION
 
                 repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
                     authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())