Merge pull request #98 from OpenSRP/migrate-to-android-x

Migrate to AndroidX & GitHub Actions

Author: allan-on

.github/workflows/ci.yml

@@ -0,0 +1,32 @@
+# This workflow will build a Java project with Gradle
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
+
+name: Android CI with Gradle
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  unit_tests:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Run unit tests with Gradle
+        run: ./gradlew :opensrp-reporting:clean :opensrp-reporting:jacocoTestReport --stacktrace
+      - name: Generate Javadoc with Gradle
+        run: ./gradlew javadoc
+      - name: Upload coverage to Coveralls with Gradle
+        run: ./gradlew opensrp-reporting:coveralls --stacktrace
+        env:
+          COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_TOKEN }}

.travis.yml

@@ -2,12 +2,12 @@
 
 OpenSRP Client Reporting Library
 
-[![Build Status](https://travis-ci.org/OpenSRP/opensrp-client-reporting.svg?branch=master)](https://travis-ci.org/OpenSRP/opensrp-client-reporting) [![Coverage Status](https://coveralls.io/repos/github/OpenSRP/opensrp-client-reporting/badge.svg?branch=master)](https://coveralls.io/github/OpenSRP/opensrp-client-reporting?branch=master) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/642391cacc03450b894b662eac7f30a3)](https://www.codacy.com/app/OpenSRP/opensrp-client-reporting?utm_source=github.com&utm_medium=referral&utm_content=OpenSRP/opensrp-client-reporting&utm_campaign=Badge_Grade)
+![Build status](https://github.com/OpenSRP/opensrp-client-reporting/.github/workflows/Android%20CI%20with%20Gradle/badge.svg) (https://travis-ci.org/OpenSRP/opensrp-client-reporting) [![Coverage Status](https://coveralls.io/repos/github/OpenSRP/opensrp-client-reporting/badge.svg?branch=master)](https://coveralls.io/github/OpenSRP/opensrp-client-reporting?branch=master) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/642391cacc03450b894b662eac7f30a3)](https://www.codacy.com/app/OpenSRP/opensrp-client-reporting?utm_source=github.com&utm_medium=referral&utm_content=OpenSRP/opensrp-client-reporting&utm_campaign=Badge_Grade)
 
 ## Introduction
 
 The Reporting library allows creating of visualizations for display in an application for instance on a dashboard.  
-The library provides a custom numeric value display to show a lable and a numeric value and extends [HelloCharts Android library](https://github.com/lecho/hellocharts-android)
+The library provides a custom numeric value display to show a label and a numeric value and extends [HelloCharts Android library](https://github.com/lecho/hellocharts-android)
 to show Charts e.g. PieCharts
 
 ## Supported visualizations

README.md

@@ -3,23 +3,35 @@ buildscript {
     repositories {
         google()
         mavenCentral()
+        mavenLocal()
+        maven { url "https://plugins.gradle.org/m2/" }
+        maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
+        maven { url "https://s3.amazonaws.com/repo.commonsware.com" }
     }
 
     dependencies {
         classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.11.0"
+        classpath 'gradle.plugin.org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.10.2'
+        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5"
     }
 }
 
+apply plugin: 'java'
+apply plugin: 'build-dashboard'
+apply plugin: 'io.codearte.nexus-staging'
+
 configure(allprojects) { project ->
 
     version = VERSION_NAME
     group = GROUP
+
     buildscript {
         repositories {
             google()
             jcenter()
             mavenCentral()
             maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
+            maven { url "https://s3.amazonaws.com/repo.commonsware.com" }
             mavenLocal()
         }
     }
@@ -31,11 +43,11 @@ subprojects {
 
     group = 'org.smartregister'
 
-    ext.androidToolsBuildGradle     = '28.0.0'
-    ext.androidBuildToolsVersion    = '28.0.0'
+    ext.androidToolsBuildGradle     = '4.0.0'
+    ext.androidBuildToolsVersion    = '29.0.3'
     ext.androidMinSdkVersion        = 18
-    ext.androidCompileSdkVersion    = 28
-    ext.androidTargetSdkVersion     = 28
+    ext.androidCompileSdkVersion    = 29
+    ext.androidTargetSdkVersion     = 29
 
     ext.androidAnnotationsVersion = '3.0.1';
     ext.androidAnnotationsAPIVersion = '3.0.1';
@@ -48,6 +60,9 @@ subprojects {
         maven { url "http://acra.googlecode.com/svn/repository/releases" }
         maven { url "https://repo.maven.apache.org/maven2" }
         maven { url "http://cloudant.github.io/cloudant-sync-eap/repository" }
+        maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
+        maven { url "https://s3.amazonaws.com/repo.commonsware.com" }
+        maven { url 'https://dl.bintray.com/ibm-watson-health/ibm-fhir-server-releases'}
         mavenLocal()
     }
 
@@ -62,10 +77,6 @@ subprojects {
     }
 }
 
-apply plugin : 'java'
-apply plugin : 'build-dashboard'
-apply plugin: 'io.codearte.nexus-staging'
-
 buildDashboard {
     reports.html.setDestination(file("build/"))
 }

build.gradle

@@ -1,4 +1,4 @@
-VERSION_NAME=0.0.22-SNAPSHOT
+VERSION_NAME=0.1.0-SNAPSHOT
 VERSION_CODE=1
 GROUP=org.smartregister
 POM_SETTING_DESCRIPTION=OpenSRP Client Reporting Library
@@ -11,5 +11,8 @@ POM_SETTING_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
 POM_SETTING_LICENCE_DIST=repo
 POM_SETTING_DEVELOPER_ID=opensrp
 POM_SETTING_DEVELOPER_NAME=OpenSRP Onadev
+android.useAndroidX=true
+android.enableJetifier=true
+org.gradle.jvmargs=-Xmx2048M
 
 

gradle.properties

@@ -1,6 +1,6 @@
-#Tue Mar 26 17:38:02 EAT 2019
+#Sun Jul 05 22:13:24 EAT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -6,8 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:3.1.2"
-        classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.2'
+        classpath "com.android.tools.build:gradle:${androidToolsBuildGradle}"
     }
 }
 
@@ -23,13 +22,20 @@ android {
     compileSdkVersion androidCompileSdkVersion
     buildToolsVersion androidBuildToolsVersion
 
+    defaultPublishConfig !isReleaseBuild() ? "debug" : "release"
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
     defaultConfig {
         minSdkVersion androidMinSdkVersion
         targetSdkVersion androidTargetSdkVersion
         versionCode Integer.parseInt(project.VERSION_CODE)
         versionName project.VERSION_NAME
         multiDexEnabled true
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -38,9 +44,11 @@ android {
             buildConfigField "int", "REPORT_INDICATOR_GENERATION_MINUTES", '15'
         }
         debug {
+            testCoverageEnabled = true
             buildConfigField "int", "REPORT_INDICATOR_GENERATION_MINUTES", '15'
         }
     }
+
     dexOptions {
         javaMaxHeapSize "4g"
     }
@@ -58,6 +66,8 @@ android {
         exclude 'META-INF/NOTICE.txt'
         exclude 'META-INF/notice.txt'
         exclude 'META-INF/ASL2.0'
+        exclude 'META-INF/LICENSE.md'
+        exclude 'META-INF/NOTICE.md'
     }
 
     testOptions {
@@ -73,28 +83,25 @@ tasks.withType(Test) {
     jacoco.includeNoLocationClasses = true
 }
 
-allprojects {
-    repositories {
-        maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
-        maven { url "https://s3.amazonaws.com/repo.commonsware.com" }
-        mavenLocal()
-    }
-}
-
 dependencies {
-    implementation('org.smartregister:opensrp-client-core:1.9.3-SNAPSHOT@aar') {
+    implementation('org.smartregister:opensrp-client-core:1.15.4-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'com.github.bmelnychuk', module: 'atv'
         exclude group: 'com.google.guava', module: 'guava'
         exclude group: 'com.android.support', module: 'appcompat-v7'
+        exclude group: 'com.android.support', module: 'design'
+        exclude group: 'com.android.support', module: 'recyclerview-v7'
         exclude group: 'org.apache.httpcomponents', module: 'httpmime'
+        exclude group: 'com.ibm.fhir', module: 'fhir-model'
     }
 
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:support-v4:28.0.0'
-    implementation 'com.android.support:recyclerview-v7:28.0.0'
-    implementation 'com.android.support:design:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    compileOnly 'com.ibm.fhir:fhir-model:4.2.3'
+
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'com.github.lecho:hellocharts-library:1.5.8@aar'
 
     implementation 'com.google.guava:guava:20.0'
@@ -113,13 +120,17 @@ dependencies {
     testImplementation "org.powermock:powermock-api-mockito2:$powerMockVersion"
     testImplementation "org.powermock:powermock-classloading-xstream:$powerMockVersion"
     testImplementation 'org.skyscreamer:jsonassert:1.5.0'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
 
     implementation group: 'org.yaml', name: 'snakeyaml', version: '1.23'
 
 }
 
+tasks.coveralls {
+    dependsOn 'jacocoTestReport'
+}
+
 task jacocoTestReport(type: JacocoReport, dependsOn: ['testDebugUnitTest']) {
 
     reports {
@@ -131,18 +142,19 @@ task jacocoTestReport(type: JacocoReport, dependsOn: ['testDebugUnitTest']) {
     getReports().getHtml().setDestination(file("${buildDir}/reports/jacoco/jacocoRootReport/html"))
 
     def fileFilter = ['**/R.class', '**/R$*.class', '**/BuildConfig.*', '**/Manifest*.*', '**/*Test*.*', 'android/**/*.*', '**/*$ViewBinder*.*']
-    def debugTree = fileTree(dir: "$project.buildDir/intermediates/classes/debug", excludes: fileFilter)
+    def debugTree = fileTree(dir: "$project.buildDir/intermediates/javac/debug/classes", excludes: fileFilter)
     def mainSrc = "$project.projectDir/src/main/java"
 
-    sourceDirectories = files([mainSrc])
-    classDirectories = files([debugTree])
-    executionData = fileTree(dir: project.buildDir, includes: [
+    sourceDirectories.setFrom(files([mainSrc]))
+    classDirectories.setFrom(files([debugTree]))
+    executionData.setFrom(fileTree(dir: project.buildDir, includes: [
             'jacoco/testDebugUnitTest.exec', 'outputs/code-coverage/connected/*coverage.ec'
-    ])
+    ]))
 }
 
 coveralls {
     jacocoReportPath = "${buildDir}/reports/jacoco/jacocoRootReport/merged.xml"
+    sourceDirs = ["$project.projectDir/src/main/java"]
 }
 
 apply from: '../maven.gradle'

opensrp-reporting/build.gradle

@@ -7,7 +7,7 @@
         android:label="@string/app_name"
         android:supportsRtl="true">
         <service
-            android:name=".service.IndicatorGeneratorIntentService"
+            android:name="org.smartregister.reporting.service.IndicatorGeneratorIntentService"
             android:exported="false"></service>
     </application>
 

opensrp-reporting/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 package org.smartregister.reporting;
 
-import android.support.annotation.NonNull;
-import android.util.Log;
+import androidx.annotation.NonNull;
 
 import net.sqlcipher.database.SQLiteDatabase;
 

opensrp-reporting/src/main/java/org/smartregister/reporting/ReportingLibrary.java

@@ -3,14 +3,15 @@
 import android.content.Context;
 import android.graphics.drawable.GradientDrawable;
 import android.graphics.drawable.LayerDrawable;
-import android.support.v4.widget.TextViewCompat;
-import android.support.v7.widget.RecyclerView;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import androidx.core.widget.TextViewCompat;
+import androidx.recyclerview.widget.RecyclerView;
+
 import org.smartregister.reporting.R;
 import org.smartregister.reporting.view.TableView;