Merge pull request #570 from OpenSRP/android_x_support

Android x Migration

Author: ndegwamartin

.travis.yml

@@ -49,7 +49,7 @@ before_script:
   - chmod +x gradlew
 
 script:
-  - ./gradlew opensrp-app:clean opensrp-app:jacocoTestReport  --stacktrace
+  - ./gradlew opensrp-app:clean opensrp-app:jacocoTestReport --stacktrace
 
 after_success:
   - ./gradlew opensrp-app:coveralls --stacktrace

build.gradle

@@ -9,6 +9,7 @@ buildscript {
 
     dependencies {
         classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.11.0"
+        classpath 'com.android.tools.build:gradle:4.0.0'
         classpath 'gradle.plugin.org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.10.1'
         classpath 'org.smartregister:gradle-jarjar-plugin:1.0.0-SNAPSHOT'
     }

gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=2.2.7-SNAPSHOT
+VERSION_NAME=3.0.0-SNAPSHOT
 VERSION_CODE=1
 GROUP=org.smartregister
 POM_SETTING_DESCRIPTION=OpenSRP Client Core Application
@@ -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
 
 org.gradle.jvmargs=-Xmx2048m

gradle/wrapper/gradle-wrapper.properties

@@ -1,9 +1,10 @@
-#Tue May 15 18:45:24 EAT 2018
-org.gradle.daemon=true
-zipStorePath=wrapper/dists
-org.gradle.parallel=true
+#Wed Jun 24 12:56:07 EAT 2020
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+org.gradle.daemon=true
 distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
 org.gradle.configureondemand=true
-distributionPath=wrapper/dists
-distributionBase=GRADLE_USER_HOME
+org.gradle.parallel=true
+org.gradle.jvmargs=-Xmx2048m

opensrp-app/build.gradle

@@ -7,10 +7,9 @@ buildscript {
         maven { url 'https://maven.fabric.io/public' }
     }
     dependencies {
-
         classpath "com.android.tools.build:gradle:$androidToolsBuildGradle"
-        classpath 'org.apache.commons:commons-lang3:3.3.2'
-        classpath 'io.fabric.tools:gradle:1.30.0'
+        classpath 'org.apache.commons:commons-lang3:3.10'
+        classpath 'io.fabric.tools:gradle:1.31.2'
     }
 }
 
@@ -53,7 +52,6 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
         coreLibraryDesugaringEnabled true
-
     }
 
     buildTypes {
@@ -159,21 +157,26 @@ configurations.all {
 
 dependencies {
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.5'
-    implementation 'net.zetetic:android-database-sqlcipher:4.1.3'
-    implementation 'com.android.support:multidex:1.0.3'
+    implementation 'net.zetetic:android-database-sqlcipher:4.2.0'
+    implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'org.codehaus.jackson:jackson-core-asl:1.9.13'
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:support-v4:28.0.0'
-    implementation "org.apache.httpcomponents:httpmime:4.2.3"
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation "org.apache.httpcomponents:httpmime:4.5.6"
     implementation group: 'commons-codec', name: 'commons-codec', version: '1.10'
-    implementation group: 'com.google.guava', name: 'guava', version: '20.0'
+    implementation group: 'com.google.guava', name: 'guava', version: '24.1-jre'
     implementation group: 'commons-io', name: 'commons-io', version: '2.4'
-    implementation 'org.apache.commons:commons-lang3:3.2'
+    implementation 'org.apache.commons:commons-lang3:3.9'
     implementation 'org.mozilla:rhino:1.7R4'
     implementation 'com.ocpsoft:ocpsoft-pretty-time:1.0.7'
-    api 'joda-time:joda-time:2.10.3'
-    implementation 'com.github.bmelnychuk:atv:1.2.9'
-    implementation 'com.github.johnkil.print:print:1.2.3'
+    api 'joda-time:joda-time:2.10.5'
+    implementation ('com.github.bmelnychuk:atv:1.2.9'){
+        exclude group: 'com.google.android', module: 'android'
+    }
+
+    implementation ('com.github.johnkil.print:print:1.3.1'){
+        exclude group: 'com.google.android', module: 'android'
+    }
 
     implementation('com.crashlytics.sdk.android:crashlytics:2.10.1@aar') {
         transitive = true
@@ -183,29 +186,35 @@ dependencies {
         exclude group: 'org.json', module: 'json'
     }
 
-    implementation 'com.github.ybq:Android-SpinKit:1.2.0'
+    implementation 'com.github.ybq:Android-SpinKit:1.4.0'
     implementation 'com.mcxiaoke.volley:library:1.0.19'
 
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     annotationProcessor fileTree(include: ['butterknife*.jar'], dir: 'libs')
 
     implementation 'com.cloudant:cloudant-http:2.7.0'
-    implementation 'com.android.support:recyclerview-v7:28.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
 
-    implementation('com.android.support:design:28.0.0') {
+    implementation('com.google.android.material:material:1.1.0') {
         exclude group: 'com.android.support', module: 'recyclerview-v7'
     }
 
-    implementation 'com.evernote:android-job:1.2.6'
+    implementation ('com.evernote:android-job:1.2.6'){
+        exclude group: 'com.google.android', module: 'android'
+    }
+
     implementation group: 'commons-validator', name: 'commons-validator', version: '1.6'
-    implementation 'de.hdodenhof:circleimageview:2.2.0'
+    implementation ('de.hdodenhof:circleimageview:3.1.0'){
+        exclude group: 'com.google.android', module: 'android'
+    }
 
     implementation('org.smartregister:android-p2p-sync:0.3.7-SNAPSHOT') {
         exclude group: 'com.android.support', module: 'support-v4'
         exclude group: 'com.android.support', module: 'appcompat-v7'
         exclude group: 'android.arch.core', module: 'runtime'
     }
 
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     compileOnly 'org.projectlombok:lombok:1.18.12'
     annotationProcessor 'org.projectlombok:lombok:1.18.12'
 
@@ -239,25 +248,24 @@ dependencies {
 
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 
-    androidTestImplementation 'junit:junit:4.12'
+    androidTestImplementation 'junit:junit:4.13'
 
-    testImplementation group: 'com.google.android', name: 'android-test', version: '4.1.1.4'
     testImplementation 'org.apache.maven:maven-ant-tasks:2.1.3'
-    testImplementation 'org.mockito:mockito-core:1.9.5'
+    testImplementation 'org.mockito:mockito-core:3.1.0'
     testAnnotationProcessor fileTree(include: ['butterknife*.jar'], dir: 'libs')
 
-    testImplementation('org.robolectric:robolectric:4.0') {
+    testImplementation('org.robolectric:robolectric:4.3.1') {
         exclude group: 'com.google.guava', module: 'guava'
         exclude group: 'org.apache.maven', module: 'maven-model'
         exclude group: 'com.android.support'
         exclude group: 'androidx.test'
         exclude group: 'com.thoughtworks.xstream', module: 'xstream'
     }
-    testImplementation('org.robolectric:shadows-multidex:4.0') {
+
+    testImplementation('org.robolectric:shadows-multidex:4.3.1') {
         exclude group: 'com.google.guava', module: 'guava'
     }
 
-    testImplementation "org.robolectric:shadows-support-v4:3.3.2"
     // PowerMock
     def powerMockVersion = '2.0.4'
     testImplementation "org.powermock:powermock-module-junit4:$powerMockVersion"
@@ -266,6 +274,8 @@ dependencies {
     testImplementation "org.powermock:powermock-api-mockito2:$powerMockVersion"
     testImplementation("org.powermock:powermock-classloading-xstream:$powerMockVersion")
 
+    def fragmentVersion = "1.2.5"
+    testImplementation "androidx.fragment:fragment-testing:$fragmentVersion"
 }
 
 task clearJar(type: Delete) {

opensrp-app/gradle.properties

@@ -1,3 +1,7 @@
 POM_SETTING_NAME=OpenSRP Client Core
 POM_SETTING_ARTIFACT_ID=opensrp-client-core
-POM_SETTING_PACKAGING=aar
+POM_SETTING_PACKAGING=aar
+
+android.useAndroidX=true
+android.enableJetifier=true
+android.jetifier.blacklist=shadows

opensrp-app/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

opensrp-app/res/layout/activity_base_profile.xml

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".view.activity.BaseProfileActivity">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/collapsing_toolbar_appbarlayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/customAppThemeBlue">
 
-        <android.support.design.widget.CollapsingToolbarLayout
+        <com.google.android.material.appbar.CollapsingToolbarLayout
             android:id="@+id/collapsing_toolbar_layout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -122,16 +122,16 @@
                     tools:text="Registration info" />
             </LinearLayout>
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/collapsing_toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
                 app:layout_collapseMode="pin" />
 
-        </android.support.design.widget.CollapsingToolbarLayout>
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
 
 
-        <android.support.design.widget.TabLayout
+        <com.google.android.material.tabs.TabLayout
             android:id="@+id/tabs"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
@@ -143,8 +143,8 @@
             app:tabSelectedTextColor="@color/white"
             app:tabTextAppearance="@style/CustomFontTextViewStyle.tabIndicator.sub.white" />
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <include layout="@layout/content_base_profile" />
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

opensrp-app/res/layout/activity_base_register.xml

@@ -11,7 +11,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
-    <android.support.design.widget.BottomNavigationView
+    <com.google.android.material.bottomnavigation.BottomNavigationView
             android:id="@+id/bottom_navigation"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

opensrp-app/res/layout/content_base_profile.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -8,11 +8,11 @@
     tools:context=".view.activity.BaseProfileActivity"
     tools:showIn="@layout/activity_base_register">
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/viewpager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:textAlignment="center"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

opensrp-app/res/layout/dialog_reset_progress.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:tools="http://schemas.android.com/tools"
@@ -16,4 +16,4 @@
         android:textSize="16sp"
         android:layout_height="wrap_content"/>
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

opensrp-app/res/layout/fragment_base_register.xml

@@ -33,7 +33,7 @@
         android:layout_weight="1"
         android:background="@drawable/listview_background_rounded">
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recycler_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"

opensrp-app/res/layout/smart_register_rv_activity.xml

@@ -49,7 +49,7 @@
         android:layout_weight="1"
         android:background="@drawable/listview_background_rounded">
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recycler_view"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"

opensrp-app/res/layout/toolbar_barcode_scan.xml

@@ -6,12 +6,12 @@
     android:layout_height="wrap_content"
     android:orientation="horizontal">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/AppTheme.AppBarOverlay">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/barcode_toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
@@ -38,8 +38,8 @@
 
             </RelativeLayout>
 
-        </android.support.v7.widget.Toolbar>
+        </androidx.appcompat.widget.Toolbar>
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
 </LinearLayout>

opensrp-app/res/layout/toolbar_base_register.xml

@@ -6,13 +6,13 @@
     android:layout_height="wrap_content"
     android:orientation="horizontal">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:popupTheme="@style/AppTheme.PopupOverlay"
         android:theme="@style/AppTheme.AppBarOverlay">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/register_toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
@@ -23,8 +23,8 @@
             app:popupTheme="@style/AppTheme.PopupOverlay">
 
             <include layout="@layout/top_base_register_bar" />
-        </android.support.v7.widget.Toolbar>
+        </androidx.appcompat.widget.Toolbar>
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
 </LinearLayout>

opensrp-app/src/main/java/atv/holder/SelectableItemHolder.java

@@ -56,7 +56,7 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
         view.findViewById(R.id.bot_line).setVisibility(View.INVISIBLE);
         if (node.isLeaf()) {
             ((PrintView) view.findViewById(R.id.arrowview))
-                    .setIconText(R.string.ic_check_circle_blank);
+                    .setIconText(view.getContext().getString(R.string.ic_check_circle_blank));
         }
 //        if(node.isFirstChild()){
 //            view.findViewById(R.id.top_line).setVisibility(View.INVISIBLE);