Merge pull request #1790 from opensrp/fix-togo-crash-after-login

Fix TOGO crash after login
opensrp · May 28, 2021 · aeba797 · aeba797
2 parents 7866048 + 63d7a75
commit aeba797
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,6 +15,7 @@ local.properties
 classes/
 tmp/
 project.properties
+github.properties
 .DS_Store
 .settings
 build/

diff --git a/build.gradle b/build.gradle
@@ -12,7 +12,6 @@ buildscript {
         jcenter()
         mavenLocal()
         maven { url 'https://maven.fabric.io/public' }
-        maven { url "http://dl.bintray.com/ona/kujaku" }
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
@@ -55,7 +54,6 @@ allprojects {
         maven { url 'https://maven.fabric.io/public' }
         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://dl.bintray.com/ona/kujaku" }
     }

diff --git a/opensrp-chw/build.gradle b/opensrp-chw/build.gradle
@@ -16,7 +16,24 @@ allprojects {
     repositories {
         maven { url 'https://maven.google.com' }
         maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
-        maven { url "http://dl.bintray.com/ona/kujaku" }
+        maven {
+            def githubProperties = new Properties()
+            if (rootProject.file("github.properties").exists()) {
+                githubProperties.load(new FileInputStream(rootProject.file("github.properties")))
+            }
+
+            name = "GitHubPackages"
+            /*  Configure path to the library hosted on GitHub Package Registry
+             *  Replace UserID with package owner userID and REPOSITORY with the repository name
+             *  e.g. ""https://maven.pkg.github.com/opensrp/opensrp-client-reporting""
+             */
+            url = uri("https://maven.pkg.github.com/onaio/kujaku")
+            credentials {
+                username = githubProperties['gpr.usr'] ?: System.getenv("GPR_USER")
+                password = githubProperties['gpr.key'] ?: System.getenv("GPR_API_KEY")
+            }
+
+        }
         maven { url 'https://maven.fabric.io/public' }
         mavenLocal()
     }
@@ -176,6 +193,7 @@ android {
         exclude 'LICENSE.txt'
         exclude 'META-INF/LICENSE.md'
         exclude 'META-INF/NOTICE.md'
+        exclude 'META-INF/INDEX.LIST'
     }
 
     testOptions {
@@ -269,8 +287,8 @@ android {
         togo {
             dimension = 'baseDimension'
             applicationIdSuffix ".togo"
-            versionCode 21
-            versionName "1.2.3"
+            versionCode 22
+            versionName "1.2.4"
             buildConfigField "int", "OPENMRS_UNIQUE_ID_INITIAL_BATCH_SIZE", '1000'
             buildConfigField "int", "OPENMRS_UNIQUE_ID_BATCH_SIZE", '500'
             buildConfigField "String", 'opensrp_url', '"https://wcaro-tg.smartregister.org/opensrp/"'
@@ -320,7 +338,7 @@ android {
 }
 
 dependencies {
-    implementation('org.smartregister:opensrp-client-chw-core:2.0.30-SNAPSHOT@aar') {
+    implementation('org.smartregister:opensrp-client-chw-core:2.0.32-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'com.android.support', module: 'appcompat-v7'
         exclude group: 'androidx.legacy', module: 'legacy-support-v4'
@@ -411,4 +429,4 @@ tasks.coveralls {
 coveralls {
     jacocoReportPath = "${buildDir}/reports/jacoco/jacocoRootReport/merged.xml"
     sourceDirs = ["$project.projectDir/src/main/java"]
-}
+}