Android X migration

.circleci/config.yml

@@ -7,7 +7,7 @@ jobs:
   Lint:
     executor: 
       name: android/default
-      api-version: "27"
+      api-version: "28"
     steps:
       - checkout
       - android/restore-gradle-cache:
@@ -26,7 +26,7 @@ jobs:
   Unit Tests:
     executor: 
       name: android/default
-      api-version: "27"
+      api-version: "28"
     steps:
       - checkout
       - android/restore-gradle-cache:
@@ -40,7 +40,7 @@ jobs:
   Connected Tests:
     executor: 
       name: android/default
-      api-version: "27"
+      api-version: "28"
     steps:
       - checkout
       - android/restore-gradle-cache:
@@ -58,7 +58,7 @@ jobs:
           test-apk-path: app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk
           device: model=Nexus5X,version=26,locale=en,orientation=portrait
           project: api-project-108380595987
-          timeout: 10m
+          timeout: 18m
       - android/save-gradle-cache:
           cache-prefix: connected-tests
 

CHANGELOG.md

@@ -1,4 +1,8 @@
 # Changelog
+## [1.3.28](https://github.com/wordpress-mobile/AztecEditor-Android/releases/tag/v1.3.28)
+### Added
+- Added support for AndroidX
+
 ## [v1.3.27](https://github.com/wordpress-mobile/AztecEditor-Android/releases/tag/v1.3.27)
 ### Fixed
 - Gutenberg fixes:

README.md

@@ -105,7 +105,7 @@ repositories {
 ```
 ```gradle
 dependencies {
-    api ('com.github.wordpress-mobile.WordPress-Aztec-Android:aztec:v1.3.27')
+    api ('com.github.wordpress-mobile.WordPress-Aztec-Android:aztec:v1.3.28')
 }
 ```
 

app/build.gradle

@@ -2,16 +2,16 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
     buildToolsVersion '28.0.3'
 
     defaultConfig {
         applicationId "org.wordpress.aztec"
         minSdkVersion 16
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
 
     buildTypes {
@@ -40,13 +40,13 @@ dependencies {
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
 
-    implementation "com.android.support:appcompat-v7:$supportLibVersion"
+    implementation 'androidx.appcompat:appcompat:1.0.0'
     implementation "org.wordpress:utils:$wordpressUtilsVersion"
 
-    androidTestImplementation "com.android.support.test.espresso:espresso-core:$espressoVersion", {
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     }
-    androidTestImplementation "com.android.support.test.espresso:espresso-intents:$espressoVersion", {
+    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     }
     androidTestImplementation('com.xamarin.testcloud:espresso-support:1.3')

app/src/androidTest/java/org/wordpress/aztec/demo/BetterClickAction.java

@@ -1,20 +1,20 @@
 package org.wordpress.aztec.demo;
 
-import android.support.test.espresso.PerformException;
-import android.support.test.espresso.UiController;
-import android.support.test.espresso.ViewAction;
-import android.support.test.espresso.action.CoordinatesProvider;
-import android.support.test.espresso.action.PrecisionDescriber;
-import android.support.test.espresso.action.Tap;
-import android.support.test.espresso.action.Tapper;
-import android.support.test.espresso.util.HumanReadables;
+import androidx.test.espresso.PerformException;
+import androidx.test.espresso.UiController;
+import androidx.test.espresso.ViewAction;
+import androidx.test.espresso.action.CoordinatesProvider;
+import androidx.test.espresso.action.PrecisionDescriber;
+import androidx.test.espresso.action.Tap;
+import androidx.test.espresso.action.Tapper;
+import androidx.test.espresso.util.HumanReadables;
 import android.view.View;
 import android.view.ViewConfiguration;
 import android.webkit.WebView;
 
 import org.hamcrest.Matcher;
 
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayingAtLeast;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayingAtLeast;
 import static org.hamcrest.Matchers.allOf;
 
 /**

app/src/androidTest/java/org/wordpress/aztec/demo/BetterScrollToAction.java

@@ -1,17 +1,17 @@
 package org.wordpress.aztec.demo;
 
-import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom;
-import static android.support.test.espresso.matcher.ViewMatchers.isDescendantOfA;
-import static android.support.test.espresso.matcher.ViewMatchers.isDisplayingAtLeast;
-import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
+import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom;
+import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayingAtLeast;
+import static androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.anyOf;
 
-import android.support.test.espresso.PerformException;
-import android.support.test.espresso.UiController;
-import android.support.test.espresso.ViewAction;
-import android.support.test.espresso.matcher.ViewMatchers.Visibility;
-import android.support.test.espresso.util.HumanReadables;
+import androidx.test.espresso.PerformException;
+import androidx.test.espresso.UiController;
+import androidx.test.espresso.ViewAction;
+import androidx.test.espresso.matcher.ViewMatchers.Visibility;
+import androidx.test.espresso.util.HumanReadables;
 
 import android.graphics.Rect;
 import android.util.Log;

app/src/androidTest/kotlin/org/wordpress/aztec/demo/Actions.kt

@@ -1,15 +1,15 @@
 package org.wordpress.aztec.demo
 
 import android.graphics.Rect
-import android.support.test.espresso.UiController
-import android.support.test.espresso.ViewAction
-import android.support.test.espresso.action.CoordinatesProvider
-import android.support.test.espresso.action.GeneralClickAction
-import android.support.test.espresso.action.Press
-import android.support.test.espresso.action.Tap
-import android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom
-import android.support.test.espresso.matcher.ViewMatchers.isClickable
-import android.support.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.UiController
+import androidx.test.espresso.ViewAction
+import androidx.test.espresso.action.CoordinatesProvider
+import androidx.test.espresso.action.GeneralClickAction
+import androidx.test.espresso.action.Press
+import androidx.test.espresso.action.Tap
+import androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom
+import androidx.test.espresso.matcher.ViewMatchers.isClickable
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import android.view.View
 import android.widget.EditText
 import org.hamcrest.Matcher

app/src/androidTest/kotlin/org/wordpress/aztec/demo/BaseHistoryTest.kt

@@ -1,6 +1,6 @@
 package org.wordpress.aztec.demo
 
-import android.support.test.rule.ActivityTestRule
+import androidx.test.rule.ActivityTestRule
 import org.junit.Before
 import org.junit.Rule
 import org.wordpress.aztec.AztecText
@@ -24,4 +24,4 @@ abstract class BaseHistoryTest : BaseTest() {
         val aztecText = mActivityTestRule.activity.findViewById<AztecText>(R.id.aztec)
         aztecText.history.historyThrottleTime = throttleTime
     }
-}
+}

app/src/androidTest/kotlin/org/wordpress/aztec/demo/BasePage.kt

@@ -1,13 +1,13 @@
 package org.wordpress.aztec.demo
 
-import android.support.test.espresso.ViewAction
-import android.support.test.espresso.ViewInteraction
-import android.support.test.espresso.action.GeneralLocation
-import android.support.test.espresso.action.Press
-import android.support.test.espresso.action.Tap
-import android.support.test.espresso.action.ViewActions
-import android.support.test.espresso.assertion.ViewAssertions.matches
-import android.support.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.ViewAction
+import androidx.test.espresso.ViewInteraction
+import androidx.test.espresso.action.GeneralLocation
+import androidx.test.espresso.action.Press
+import androidx.test.espresso.action.Tap
+import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 
 abstract class BasePage {
 

app/src/androidTest/kotlin/org/wordpress/aztec/demo/BaseTest.kt

@@ -1,7 +1,7 @@
 package org.wordpress.aztec.demo
 
-import android.support.test.rule.GrantPermissionRule
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.rule.GrantPermissionRule
+import androidx.test.runner.AndroidJUnit4
 import com.xamarin.testcloud.espresso.Factory
 import com.xamarin.testcloud.espresso.ReportHelper
 import org.junit.Before

app/src/androidTest/kotlin/org/wordpress/aztec/demo/pages/EditLinkPage.kt

@@ -1,13 +1,13 @@
 package org.wordpress.aztec.demo.pages
 
-import android.support.test.espresso.Espresso.onView
-import android.support.test.espresso.ViewInteraction
-import android.support.test.espresso.action.ViewActions
-import android.support.test.espresso.action.ViewActions.click
-import android.support.test.espresso.action.ViewActions.replaceText
-import android.support.test.espresso.assertion.ViewAssertions
-import android.support.test.espresso.matcher.ViewMatchers.withId
-import android.support.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.ViewInteraction
+import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.replaceText
+import androidx.test.espresso.assertion.ViewAssertions
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
 import org.wordpress.aztec.demo.BasePage
 import org.wordpress.aztec.demo.R
 

app/src/androidTest/kotlin/org/wordpress/aztec/demo/pages/EditorPage.kt

@@ -1,17 +1,17 @@
 package org.wordpress.aztec.demo.pages
 
-import android.support.test.espresso.DataInteraction
-import android.support.test.espresso.Espresso.onData
-import android.support.test.espresso.Espresso.onView
-import android.support.test.espresso.ViewInteraction
-import android.support.test.espresso.action.ViewActions
-import android.support.test.espresso.action.ViewActions.click
-import android.support.test.espresso.action.ViewActions.pressKey
-import android.support.test.espresso.action.ViewActions.typeText
-import android.support.test.espresso.action.ViewActions.typeTextIntoFocusedView
-import android.support.test.espresso.assertion.ViewAssertions.matches
-import android.support.test.espresso.matcher.ViewMatchers.withId
-import android.support.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.espresso.DataInteraction
+import androidx.test.espresso.Espresso.onData
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.ViewInteraction
+import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.pressKey
+import androidx.test.espresso.action.ViewActions.typeText
+import androidx.test.espresso.action.ViewActions.typeTextIntoFocusedView
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
 import android.view.KeyEvent
 import android.view.View
 import org.hamcrest.Matcher

app/src/androidTest/kotlin/org/wordpress/aztec/demo/tests/BasicTextEditingTests.kt

@@ -1,6 +1,6 @@
 package org.wordpress.aztec.demo.tests
 
-import android.support.test.rule.ActivityTestRule
+import androidx.test.rule.ActivityTestRule
 import org.junit.Rule
 import org.junit.Test
 import org.wordpress.aztec.demo.BaseTest

app/src/androidTest/kotlin/org/wordpress/aztec/demo/tests/CssUnderlineFormattingTests.kt

@@ -1,6 +1,6 @@
 package org.wordpress.aztec.demo.tests
 
-import android.support.test.rule.ActivityTestRule
+import androidx.test.rule.ActivityTestRule
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test

app/src/androidTest/kotlin/org/wordpress/aztec/demo/tests/GutenbergCompatTests.kt

@@ -6,9 +6,9 @@ import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.net.Uri
-import android.support.test.espresso.intent.Intents
-import android.support.test.espresso.intent.matcher.IntentMatchers
-import android.support.test.espresso.intent.rule.IntentsTestRule
+import androidx.test.espresso.intent.Intents
+import androidx.test.espresso.intent.matcher.IntentMatchers
+import androidx.test.espresso.intent.rule.IntentsTestRule
 import org.junit.Before
 import org.junit.Ignore
 import org.junit.Rule

app/src/androidTest/kotlin/org/wordpress/aztec/demo/tests/HtmlAttributeStyleColorTests.kt

@@ -1,6 +1,6 @@
 package org.wordpress.aztec.demo.tests
 
-import android.support.test.espresso.intent.rule.IntentsTestRule
+import androidx.test.espresso.intent.rule.IntentsTestRule
 import org.junit.Rule
 import org.junit.Test
 import org.wordpress.aztec.demo.BaseTest
@@ -75,4 +75,4 @@ class HtmlAttributeStyleColorTests : BaseTest() {
                 .toggleHtml()
                 .verifyHTML(htmlEnd)
     }
-}
+}

app/src/androidTest/kotlin/org/wordpress/aztec/demo/tests/ImageHistoryTests.kt

@@ -6,9 +6,9 @@ import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.net.Uri
-import android.support.test.espresso.intent.Intents
-import android.support.test.espresso.intent.matcher.IntentMatchers
-import android.support.test.espresso.intent.rule.IntentsTestRule
+import androidx.test.espresso.intent.Intents
+import androidx.test.espresso.intent.matcher.IntentMatchers
+import androidx.test.espresso.intent.rule.IntentsTestRule
 import org.junit.Rule
 import org.junit.Test
 import org.wordpress.aztec.demo.BaseTest
@@ -229,4 +229,4 @@ class ImageHistoryTests : BaseTest() {
         Intents.intending(IntentMatchers.hasAction(Intent.ACTION_OPEN_DOCUMENT))
                 .respondWith(Instrumentation.ActivityResult(Activity.RESULT_OK, intent))
     }
-}
+}

app/src/androidTest/kotlin/org/wordpress/aztec/demo/tests/ImageTests.kt

@@ -6,9 +6,9 @@ import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.net.Uri
-import android.support.test.espresso.intent.Intents
-import android.support.test.espresso.intent.matcher.IntentMatchers
-import android.support.test.espresso.intent.rule.IntentsTestRule
+import androidx.test.espresso.intent.Intents
+import androidx.test.espresso.intent.matcher.IntentMatchers
+import androidx.test.espresso.intent.rule.IntentsTestRule
 import org.junit.Rule
 import org.junit.Test
 import org.wordpress.aztec.demo.BaseTest

app/src/androidTest/kotlin/org/wordpress/aztec/demo/tests/LinkTests.kt

@@ -1,6 +1,6 @@
 package org.wordpress.aztec.demo.tests
 
-import android.support.test.espresso.intent.rule.IntentsTestRule
+import androidx.test.espresso.intent.rule.IntentsTestRule
 import org.junit.Rule
 import org.junit.Test
 import org.wordpress.aztec.demo.BaseTest

app/src/androidTest/kotlin/org/wordpress/aztec/demo/tests/MixedTextFormattingTests.kt

@@ -1,6 +1,6 @@
 package org.wordpress.aztec.demo.tests
 
-import android.support.test.rule.ActivityTestRule
+import androidx.test.rule.ActivityTestRule
 import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test

app/src/androidTest/kotlin/org/wordpress/aztec/demo/tests/ParagraphFormattingTests.kt

@@ -1,6 +1,6 @@
 package org.wordpress.aztec.demo.tests
 
-import android.support.test.rule.ActivityTestRule
+import androidx.test.rule.ActivityTestRule
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -38,4 +38,4 @@ class ParagraphFormattingTests : BaseTest() {
                 .toggleHtml()
                 .verifyHTML(html)
     }
-}
+}

app/src/androidTest/kotlin/org/wordpress/aztec/demo/tests/SimpleTextFormattingTests.kt

@@ -1,6 +1,6 @@
 package org.wordpress.aztec.demo.tests
 
-import android.support.test.rule.ActivityTestRule
+import androidx.test.rule.ActivityTestRule
 import org.junit.Rule
 import org.junit.Test
 import org.wordpress.aztec.demo.BaseTest

app/src/androidTest/kotlin/org/wordpress/aztec/demo/tests/ToolbarHighlightingTests.kt

@@ -1,8 +1,8 @@
 package org.wordpress.aztec.demo.tests
 
-import android.support.test.espresso.matcher.ViewMatchers.isChecked
-import android.support.test.espresso.matcher.ViewMatchers.isNotChecked
-import android.support.test.rule.ActivityTestRule
+import androidx.test.espresso.matcher.ViewMatchers.isChecked
+import androidx.test.espresso.matcher.ViewMatchers.isNotChecked
+import androidx.test.rule.ActivityTestRule
 import org.junit.Rule
 import org.junit.Test
 import org.wordpress.aztec.demo.BaseTest