Update credential format for resolving conflicting between travis and…

… local build
w3-engineers · Feb 14, 2019 · 0c9351b · 0c9351b
1 parent f471023
commit 0c9351b
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -190,13 +190,24 @@ repositories {
     maven {
         url "http://artifactory.rightmesh.io/artifactory/maven"
         credentials {
-            username rightmesh_build_username
+
+            if (!hasRightMeshUsername)
+                username System.getenv('rightmesh_build_username')
+            else
+                username rightmesh_build_username
+
+            if (!hasRightMeshPassword)
+                password System.getenv('rightmesh_build_password')
+            else
+                password rightmesh_build_password
+
+            /*username rightmesh_build_username
             if (username == null)
                 username System.getenv('rightmesh_build_username')
 
             password rightmesh_build_password
             if (password == null)
-                password System.getenv('rightmesh_build_password')
+                password System.getenv('rightmesh_build_password')*/
         }
     }
     maven{

diff --git a/settings.gradle b/settings.gradle
@@ -1,18 +1,35 @@
 include ':app', ':viper'
+
+def hasRightMeshUsername = hasProperty('rightmesh_build_username') &&
+        getProperty('rightmesh_build_username').toBoolean()
+def hasRightMeshPassword = hasProperty('rightmesh_build_password') &&
+        getProperty('rightmesh_build_password').toBoolean()
+
 pluginManagement.repositories {
     jcenter()
     google()
     mavenCentral()
     maven {
         url 'https://artifactory.rightmesh.io/artifactory/maven'
         credentials {
-            username System.getenv('rightmesh_build_username')
+
+            if (!hasRightMeshUsername)
+                username System.getenv('rightmesh_build_username')
+            else
+                username rightmesh_build_username
+
+            if (!hasRightMeshPassword)
+                password System.getenv('rightmesh_build_password')
+            else
+                password rightmesh_build_password
+
+            /*username System.getenv('rightmesh_build_username')
             if (username == null)
                 username rightmesh_build_username
 
             password System.getenv('rightmesh_build_password')
             if (password == null)
-                password rightmesh_build_password
+                password rightmesh_build_password*/
         }
     }
 }

diff --git a/viper/build.gradle b/viper/build.gradle
@@ -10,6 +10,11 @@ def isDebugDatabaseEnabled = !project.hasProperty('org.w3.debugdb') ||//If not s
 def isToastyEnabled = !project.hasProperty('org.w3.toasty') ||//If not specified then assume true
         project.getProperty('org.w3.toasty').toBoolean()
 
+def hasRightMeshUsername = hasProperty('rightmesh_build_username') &&
+        getProperty('rightmesh_build_username').toBoolean()
+def hasRightMeshPassword = hasProperty('rightmesh_build_password') &&
+        getProperty('rightmesh_build_password').toBoolean()
+
 if(isCrashLyticsEnabled) {
     apply plugin: 'io.fabric'
 }
@@ -22,13 +27,24 @@ repositories {
     maven {
         url "http://artifactory.rightmesh.io/artifactory/maven"
         credentials {
-            username rightmesh_build_username
+
+            if (!hasRightMeshUsername)
+                username System.getenv('rightmesh_build_username')
+            else
+                username rightmesh_build_username
+
+            if (!hasRightMeshPassword)
+                password System.getenv('rightmesh_build_password')
+            else
+                password rightmesh_build_password
+
+            /*username rightmesh_build_username
             if (username == null)
                 username System.getenv('rightmesh_build_username')
 
             password rightmesh_build_password
             if (password == null)
-                password System.getenv('rightmesh_build_password')
+                password System.getenv('rightmesh_build_password')*/
         }
     }
     maven{