Rewrite classes in kotlin

.travis.yml

@@ -14,12 +14,15 @@ cache:
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
 
+before_install:
+  - echo yes | sdkmanager "build-tools;28.0.3"
+
 android:
   components:
     # tools required
     - tools
     # The BuildTools version used by your project
-    - build-tools-28.0.0
+    - build-tools-28.0.3
     # The SDK version used to compile your projects
     - android-22
     - android-28

build.gradle

@@ -1,27 +1,27 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
+    ext.kotlin_version = '1.3.72'
     repositories {
         google()
         mavenCentral()
+        jcenter()
     }
 
     dependencies {
         classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.11.0"
+        classpath "com.android.tools.build:gradle:3.6.4"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
-configure(allprojects) { project ->
-
-    version = VERSION_NAME
-    group = GROUP
-    buildscript {
-        repositories {
-            google()
-            jcenter()
-            mavenCentral()
-            maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
-            mavenLocal()
-        }
+allprojects {
+    repositories {
+        google()
+        jcenter()
+        mavenCentral()
+        maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
+        maven { url "https://s3.amazonaws.com/repo.commonsware.com" }
+        mavenLocal()
     }
 }
 
@@ -31,8 +31,9 @@ subprojects {
 
     group = 'org.smartregister'
 
-    ext.androidToolsBuildGradle     = '28.0.0'
-    ext.androidBuildToolsVersion    = '28.0.0'
+    ext.androidToolsBuildGradleVersion  = '3.6.4'
+    ext.androidBuildToolsVersion        = '28.0.3'
+    ext.coverallsGradlePluginVersion    = '2.8.3'
     ext.androidMinSdkVersion        = 18
     ext.androidCompileSdkVersion    = 28
     ext.androidTargetSdkVersion     = 28

gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.0.21-SNAPSHOT
+VERSION_NAME=0.1.0-SNAPSHOT
 VERSION_CODE=1
 GROUP=org.smartregister
 POM_SETTING_DESCRIPTION=OpenSRP Client Reporting Library
@@ -11,5 +11,7 @@ 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
 
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Mar 26 17:38:02 EAT 2019
+#Tue Jul 21 00:53:45 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-5.6.4-all.zip

opensrp-reporting/build.gradle

@@ -6,20 +6,28 @@ 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:${androidToolsBuildGradleVersion}"
+        classpath "org.kt3k.gradle.plugin:coveralls-gradle-plugin:${coverallsGradlePluginVersion}"
     }
 }
 
+apply plugin: 'com.android.library'
 apply plugin: 'jacoco'
 apply plugin: 'com.github.kt3k.coveralls'
-apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 
 jacoco {
     toolVersion = "0.8.0"
 }
 
 android {
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
     compileSdkVersion androidCompileSdkVersion
     buildToolsVersion androidBuildToolsVersion
 
@@ -29,7 +37,7 @@ android {
         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 {
@@ -73,28 +81,20 @@ 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.10.5-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: 'org.apache.httpcomponents', module: 'httpmime'
     }
 
-    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'
+    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,10 +113,12 @@ 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'
+    implementation "androidx.core:core-ktx:+"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
 }
 
@@ -146,3 +148,6 @@ coveralls {
 }
 
 apply from: '../maven.gradle'
+repositories {
+    mavenCentral()
+}

opensrp-reporting/src/main/AndroidManifest.xml

@@ -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/java/org/smartregister/reporting/ReportingLibrary.java

@@ -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/adapter/TableViewWidgetAdapter.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;
 

opensrp-reporting/src/main/java/org/smartregister/reporting/dao/ReportIndicatorDaoImpl.java

@@ -1,10 +1,11 @@
 package org.smartregister.reporting.dao;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+
 import com.google.gson.Gson;
 
 import net.sqlcipher.Cursor;

opensrp-reporting/src/main/java/org/smartregister/reporting/domain/CompositeIndicatorTally.java

@@ -1,7 +1,7 @@
 package org.smartregister.reporting.domain;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.util.Date;
 import java.util.List;

opensrp-reporting/src/main/java/org/smartregister/reporting/domain/IndicatorQuery.java

@@ -1,6 +1,6 @@
 package org.smartregister.reporting.domain;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.util.List;
 

opensrp-reporting/src/main/java/org/smartregister/reporting/domain/IndicatorsYamlConfig.kt

@@ -0,0 +1,6 @@
+package org.smartregister.reporting.domain
+
+class IndicatorsYamlConfig {
+    var indicators: List<IndicatorYamlConfigItem>? = null
+
+}

opensrp-reporting/src/main/java/org/smartregister/reporting/event/IndicatorTallyEvent.java

@@ -1,6 +1,6 @@
 package org.smartregister.reporting.event;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.smartregister.reporting.domain.TallyStatus;
 

opensrp-reporting/src/main/java/org/smartregister/reporting/exception/MultiResultProcessorException.java

@@ -1,6 +1,6 @@
 package org.smartregister.reporting.exception;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.smartregister.reporting.domain.CompositeIndicatorTally;
 

opensrp-reporting/src/main/java/org/smartregister/reporting/job/IndicatorGeneratorJobCreator.java

@@ -1,9 +1,10 @@
 package org.smartregister.reporting.job;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.evernote.android.job.Job;
 import com.evernote.android.job.JobCreator;
 

opensrp-reporting/src/main/java/org/smartregister/reporting/job/RecurringIndicatorGeneratingJob.java

@@ -1,9 +1,10 @@
 package org.smartregister.reporting.job;
 
 import android.content.Intent;
-import android.support.annotation.NonNull;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+
 import org.smartregister.AllConstants;
 import org.smartregister.job.BaseJob;
 import org.smartregister.reporting.service.IndicatorGeneratorIntentService;

opensrp-reporting/src/main/java/org/smartregister/reporting/processor/DefaultMultiResultProcessor.java

@@ -1,6 +1,6 @@
 package org.smartregister.reporting.processor;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;

opensrp-reporting/src/main/java/org/smartregister/reporting/processor/MultiResultProcessor.java

@@ -1,6 +1,6 @@
 package org.smartregister.reporting.processor;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.smartregister.reporting.domain.CompositeIndicatorTally;
 import org.smartregister.reporting.domain.IndicatorTally;

opensrp-reporting/src/main/java/org/smartregister/reporting/repository/DailyIndicatorCountRepository.java

@@ -2,9 +2,10 @@
 
 import android.content.ContentValues;
 import android.database.SQLException;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;

opensrp-reporting/src/main/java/org/smartregister/reporting/repository/IndicatorQueryRepository.java

@@ -1,10 +1,12 @@
 package org.smartregister.reporting.repository;
 
 import android.content.ContentValues;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;