KVP_PrEP new changes

.github/workflows/ci.yml

@@ -5,9 +5,9 @@ name: Android CI with Gradle
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, tanzania-ministry-of-health-nacp ]
   pull_request:
-    branches: [ master ]
+    branches: [ master, tanzania-ministry-of-health-nacp ]
 
 jobs:
   unit_tests:
@@ -16,16 +16,16 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
+      - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 1.8
-      - name: Install NDK
-        run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.0.6113669" --sdk_root=${ANDROID_SDK_ROOT}
+          java-version: 11
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Run unit tests with Gradle
         run: ./gradlew :opensrp-chw-hf:clean :opensrp-chw-hf:jacocoTestReport  --stacktrace
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
       - name: Upload coverage to Coveralls with Gradle
         run: ./gradlew coveralls --stacktrace
         env:

.gitignore

@@ -19,3 +19,9 @@ project.properties
 .settings
 build/
 jacoco.exec
+opensrp-chw-hf/nacp/
+caches
+daemon
+native
+wrapper
+github.properties

build.gradle

@@ -4,12 +4,12 @@ buildscript {
 
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         mavenLocal()
         maven{  url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath 'gradle.plugin.org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.10.2'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -20,7 +20,7 @@ apply plugin: 'com.github.kt3k.coveralls'
 apply plugin: 'jacoco'
 
 jacoco {
-    toolVersion = "0.8.0"
+    toolVersion = "0.7.9"
 }
 
 
@@ -34,7 +34,7 @@ allprojects {
 
     repositories {
         google()
-        jcenter()
+        mavenCentral()
         mavenLocal()
         mavenCentral()
         maven { url 'https://maven.google.com' }

gradle.properties

@@ -9,8 +9,10 @@
 android.enableJetifier=true
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
-android.jetifier.blacklist=shadows
+#org.gradle.jvmargs=-Xmx4608m
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+android.useNewApkCreator=false
+MAPBOX_DOWNLOADS_TOKEN=sk.eyJ1IjoiY296ZWo0IiwiYSI6ImNtM2JwZzJiMzFqcnkybHNmcWxoeWZzbGkifQ.OdniWr3ohT6807hFnzDesg

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Tue Aug 18 16:21:12 EAT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip