Merge TO Ona Upgrades From NACP branch

.github/workflows/ci.yml

@@ -5,9 +5,9 @@ name: Android CI with Gradle
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master , master-v1 ]
   pull_request:
-    branches: [ master ]
+    branches: [ master , master-v1 ]
 
 jobs:
   unit_tests:

.gitignore

@@ -19,3 +19,4 @@ project.properties
 .settings
 build/
 jacoco.exec
+github.properties

build.gradle

@@ -4,15 +4,14 @@ buildscript {
 
     repositories {
         google()
-        jcenter()
         mavenCentral()
         maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
         maven { url 'https://jitpack.io' }
         maven { url "https://repo.maven.apache.org/maven2" }
         maven { url "http://cloudant.github.io/cloudant-sync-eap/repository" }
-        maven { url "http://dl.bintray.com/ona/kujaku" }
         maven{  url "https://plugins.gradle.org/m2/" }
         mavenLocal()
+        jcenter()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.0.0'
@@ -42,7 +41,6 @@ allprojects {
 
     repositories {
         google()
-        jcenter()
         mavenLocal()
         mavenCentral()
         maven { url 'https://maven.google.com' }
@@ -54,10 +52,8 @@ allprojects {
         maven { url 'https://maven.fabric.io/public' }
         maven { url "https://s3.amazonaws.com/repo.commonsware.com" }
         maven { url "https://s3.amazonaws.com/repo.commonsware.com" }
-        maven { url "https://dl.bintray.com/ona/rdt-capture" }
-        maven { url "http://dl.bintray.com/ona/kujaku" }
-        maven { url 'https://dl.bintray.com/ibm-watson-health/ibm-fhir-server-releases'}
         maven{  url "https://plugins.gradle.org/m2/" }
+        jcenter()
     }
 }
 

gradle.properties

@@ -1,5 +1,5 @@
-VERSION_NAME=1.5.21-SNAPSHOT
-VERSION_CODE=1
+VERSION_NAME=1.5.36.14-NACP-SNAPSHOT
+VERSION_CODE=54
 GROUP=org.smartregister
 POM_SETTING_DESCRIPTION=OpenSRP Client Chw Core Library
 POM_SETTING_URL=https://github.com/OpenSRP/opensrp-client-chw-core