feature/migrate-to-AndroidX

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:4.0.2'
 
         classpath 'me.tatarka:gradle-retrolambda:3.7.0'
         // NOTE: Do not place your application dependencies here; they belong

gradle.properties

@@ -17,9 +17,11 @@ org.gradle.jvmargs=-Xmx1536m
 # org.gradle.parallel=true
 org.gradle.daemon=true
 org.gradle.parallel=true
-COMPILE_SDK_VERSION=28
-BUILD_TOOLS_VERSION=28.0.3
+COMPILE_SDK_VERSION=29
+BUILD_TOOLS_VERSION=29.0.1
 MIN_SDK_VERSION=18
-TARGET_SDK_VERSION=28
+TARGET_SDK_VERSION=29
 VERSION_CODE=93
-VERSION_NAME=0.2.4
+VERSION_NAME=0.2.4
+android.useAndroidX=true
+android.enableJetifier=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Jan 25 09:36:23 BRT 2019
+#Tue Jun 01 20:31:52 BRT 2021
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+zipStoreBase=GRADLE_USER_HOME

sample/build.gradle

@@ -16,7 +16,7 @@ android {
         targetSdkVersion global_targetSdkVersion
         versionCode global_versionCode
         versionName global_versionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         vectorDrawables.useSupportLibrary = true
     }
 
@@ -39,19 +39,19 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
 
     implementation project(":ui-library")
     implementation 'us.feras.mdv:markdownview:1.1.0'
 
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:design:28.0.0'
-    implementation 'com.android.support:support-v4:28.0.0'
-    implementation 'com.android.support:cardview-v7:28.0.0'
-    implementation 'com.android.support:recyclerview-v7:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 //    implementation 'com.github.stantmob:stant-ui-android-library:v0.0.5'
 
     // Support for java 8 features
@@ -73,13 +73,13 @@ dependencies {
     testImplementation 'org.powermock:powermock-api-mockito:1.6.5'
 
     // Espresso UI Testing
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
         exclude group: 'com.google.guava'
         exclude module: 'espresso-idling-resource'
     })
 
-    androidTestImplementation('com.android.support.test.espresso:espresso-contrib:2.2') {
+    androidTestImplementation('androidx.test.espresso:espresso-contrib:3.1.0') {
         exclude group: 'com.android.support', module: 'appcompat'
         exclude module: 'support-annotations'
         exclude module: 'support-v4'
@@ -89,26 +89,26 @@ dependencies {
     }
 
 
-    androidTestImplementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.3'
+    androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
 
-    androidTestImplementation "com.android.support.test.espresso:espresso-core:3.0.2"
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-intents:3.0.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.1.0'
 
-    androidTestImplementation("com.android.support.test.espresso:espresso-contrib:3.0.2") {
+    androidTestImplementation('androidx.test.espresso:espresso-contrib:3.1.0') {
         exclude group: 'com.android.support', module: 'appcompat'
         exclude group: 'com.android.support', module: 'support-v4'
         exclude group: 'com.android.support', module: 'support-v7'
         exclude module: 'recyclerview-v7'
     }
 
     // Resolve conflicts between main and test APK:
-    androidTestImplementation "com.android.support:support-annotations:28.0.0"
-    androidTestImplementation 'com.android.support:appcompat-v7:28.0.0'
-    androidTestImplementation 'com.android.support:design:28.0.0'
-    androidTestImplementation 'com.android.support:support-v4:28.0.0'
-    androidTestImplementation 'com.android.support:recyclerview-v7:28.0.0'
+    androidTestImplementation 'androidx.annotation:annotation:1.0.0'
+    androidTestImplementation 'androidx.appcompat:appcompat:1.0.0'
+    androidTestImplementation 'com.google.android.material:material:1.0.0'
+    androidTestImplementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    androidTestImplementation 'androidx.recyclerview:recyclerview:1.0.0'
 
-    androidTestImplementation 'com.android.support.test:rules:1.0.2'
+    androidTestImplementation 'androidx.test:rules:1.1.1'
 
 }

sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/ExampleInstrumentedTest.java

@@ -1,8 +1,8 @@
 package br.com.stant.libraries.stantuiandroid;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/ActionButtonViewActivityTest.java

@@ -1,9 +1,9 @@
 package br.com.stant.libraries.stantuiandroid.componentsactivities;
 
 import android.content.Intent;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.espresso.matcher.ViewMatchers;
-import android.support.test.rule.ActivityTestRule;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.espresso.matcher.ViewMatchers;
+import androidx.test.rule.ActivityTestRule;
 import android.test.suitebuilder.annotation.LargeTest;
 
 import org.junit.Before;
@@ -17,15 +17,15 @@
 import br.com.stant.libraries.stantuiandroid.componentsactivities.actionbuttonview.ActionButtonViewActivity;
 import br.com.stant.libraries.stantuiandroid.testutils.IntentFactory;
 
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.RootMatchers.withDecorView;
-import static android.support.test.espresso.matcher.ViewMatchers.isDescendantOfA;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.RootMatchers.withDecorView;
+import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static br.com.stant.libraries.stantuiandroid.testutils.TestUtils.waitEspresso;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.core.AllOf.allOf;

sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/BasicToolbarViewActivityTest.java

@@ -1,8 +1,8 @@
 package br.com.stant.libraries.stantuiandroid.componentsactivities;
 
 import android.content.Intent;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.rule.ActivityTestRule;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.rule.ActivityTestRule;
 import android.test.suitebuilder.annotation.LargeTest;
 
 import org.junit.Before;
@@ -16,11 +16,11 @@
 import br.com.stant.libraries.stantuiandroid.componentsactivities.basictoolbarview.BasicToolbarViewActivity;
 import br.com.stant.libraries.stantuiandroid.testutils.IntentFactory;
 
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.isDescendantOfA;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static br.com.stant.libraries.stantuiandroid.testutils.TestUtils.waitEspresso;
 import static org.hamcrest.core.AllOf.allOf;
 

sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/ButtonComponentViewActivityTest.java

@@ -2,34 +2,31 @@
 
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.espresso.matcher.ViewMatchers;
-import android.support.test.rule.ActivityTestRule;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.espresso.matcher.ViewMatchers;
+import androidx.test.rule.ActivityTestRule;
 import android.test.suitebuilder.annotation.LargeTest;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.runners.Enclosed;
 import org.junit.runner.RunWith;
 
 import br.com.stant.libraries.stantuiandroid.R;
 import br.com.stant.libraries.stantuiandroid.TestBase;
-import br.com.stant.libraries.stantuiandroid.componentsactivities.actionbuttonview.ActionButtonViewActivity;
 import br.com.stant.libraries.stantuiandroid.componentsactivities.buttoncomponentview.ButtonComponentViewActivity;
 import br.com.stant.libraries.stantuiandroid.testutils.IntentFactory;
 
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.RootMatchers.withDecorView;
-import static android.support.test.espresso.matcher.ViewMatchers.isDescendantOfA;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-import static br.com.stant.libraries.stantuiandroid.testutils.ColorUtils.withBackgroundColor;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.RootMatchers.withDecorView;
+import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static br.com.stant.libraries.stantuiandroid.testutils.TestUtils.waitEspresso;
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.core.AllOf.allOf;

sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/ExecutedPercentBarViewActivityTest.java

@@ -1,8 +1,8 @@
 package br.com.stant.libraries.stantuiandroid.componentsactivities;
 
 import android.content.Intent;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.rule.ActivityTestRule;
+
+import androidx.test.rule.ActivityTestRule;
 import android.test.suitebuilder.annotation.LargeTest;
 
 import org.junit.Before;
@@ -13,15 +13,14 @@
 
 import br.com.stant.libraries.stantuiandroid.R;
 import br.com.stant.libraries.stantuiandroid.TestBase;
-import br.com.stant.libraries.stantuiandroid.componentsactivities.buttoncomponentview.ButtonComponentViewActivity;
 import br.com.stant.libraries.stantuiandroid.componentsactivities.executedpercentbarview.ExecutedPercentBarViewActivity;
 import br.com.stant.libraries.stantuiandroid.testutils.IntentFactory;
 
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.isDescendantOfA;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static br.com.stant.libraries.stantuiandroid.testutils.TestUtils.waitEspresso;
 import static org.hamcrest.core.AllOf.allOf;
 

sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/ExpandableTextViewActivityTest.java

@@ -1,8 +1,8 @@
 package br.com.stant.libraries.stantuiandroid.componentsactivities;
 
 import android.content.Intent;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.rule.ActivityTestRule;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.rule.ActivityTestRule;
 import android.test.suitebuilder.annotation.LargeTest;
 
 import org.junit.Before;
@@ -13,17 +13,16 @@
 
 import br.com.stant.libraries.stantuiandroid.R;
 import br.com.stant.libraries.stantuiandroid.TestBase;
-import br.com.stant.libraries.stantuiandroid.componentsactivities.executedpercentbarview.ExecutedPercentBarViewActivity;
 import br.com.stant.libraries.stantuiandroid.componentsactivities.expandabletextview.ExpandableTextViewActivity;
 import br.com.stant.libraries.stantuiandroid.testutils.IntentFactory;
 
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.isDescendantOfA;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withSpinnerText;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withSpinnerText;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static br.com.stant.libraries.stantuiandroid.testutils.TestUtils.waitEspresso;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.core.AllOf.allOf;

sample/src/androidTest/java/br/com/stant/libraries/stantuiandroid/componentsactivities/HeaderEntityCardViewActivityTest.java

@@ -5,8 +5,8 @@
  */
 
 import android.content.Intent;
-import android.support.test.espresso.matcher.ViewMatchers;
-import android.support.test.rule.ActivityTestRule;
+import androidx.test.espresso.matcher.ViewMatchers;
+import androidx.test.rule.ActivityTestRule;
 import android.test.suitebuilder.annotation.LargeTest;
 
 import org.junit.Before;
@@ -18,15 +18,14 @@
 import br.com.stant.libraries.stantuiandroid.R;
 import br.com.stant.libraries.stantuiandroid.TestBase;
 import br.com.stant.libraries.stantuiandroid.componentsactivities.headerentitycardview.HeaderEntityCardViewActivity;
-import br.com.stant.libraries.stantuiandroid.componentsactivities.informationcardview.InformationCardViewActivity;
 import br.com.stant.libraries.stantuiandroid.testutils.IntentFactory;
 
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.assertion.ViewAssertions.matches;
-import static android.support.test.espresso.matcher.ViewMatchers.isDescendantOfA;
-import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
-import static android.support.test.espresso.matcher.ViewMatchers.withId;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA;
+import static androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static br.com.stant.libraries.stantuiandroid.testutils.TestUtils.waitEspresso;
 import static org.hamcrest.Matchers.allOf;