Skip to content

Commit ad68cc9

Browse files
marecar3marecar3
authored
Android X migration (#825)
1 parent fe6f51a commit ad68cc9

File tree

61 files changed

+210
-182
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+210
-182
lines changed

‎.circleci/config.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
Lint:
88
executor:
99
name: android/default
10-
api-version: "27"
10+
api-version: "28"
1111
steps:
1212
- checkout
1313
- android/restore-gradle-cache:
@@ -26,7 +26,7 @@ jobs:
2626
Unit Tests:
2727
executor:
2828
name: android/default
29-
api-version: "27"
29+
api-version: "28"
3030
steps:
3131
- checkout
3232
- android/restore-gradle-cache:
@@ -40,7 +40,7 @@ jobs:
4040
Connected Tests:
4141
executor:
4242
name: android/default
43-
api-version: "27"
43+
api-version: "28"
4444
steps:
4545
- checkout
4646
- android/restore-gradle-cache:
@@ -58,7 +58,7 @@ jobs:
5858
test-apk-path: app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk
5959
device: model=Nexus5X,version=26,locale=en,orientation=portrait
6060
project: api-project-108380595987
61-
timeout: 10m
61+
timeout: 18m
6262
- android/save-gradle-cache:
6363
cache-prefix: connected-tests
6464

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
# Changelog
2+
## [1.3.28](https://github.com/wordpress-mobile/AztecEditor-Android/releases/tag/v1.3.28)
3+
### Added
4+
- Added support for AndroidX
5+
26
## [v1.3.27](https://github.com/wordpress-mobile/AztecEditor-Android/releases/tag/v1.3.27)
37
### Fixed
48
- Gutenberg fixes:

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ repositories {
105105
```
106106
```gradle
107107
dependencies {
108-
api ('com.github.wordpress-mobile.WordPress-Aztec-Android:aztec:v1.3.27')
108+
api ('com.github.wordpress-mobile.WordPress-Aztec-Android:aztec:v1.3.28')
109109
}
110110
```
111111

‎app/build.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@ apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
33

44
android {
5-
compileSdkVersion 27
5+
compileSdkVersion 28
66
buildToolsVersion '28.0.3'
77

88
defaultConfig {
99
applicationId "org.wordpress.aztec"
1010
minSdkVersion 16
11-
targetSdkVersion 27
11+
targetSdkVersion 28
1212
versionCode 1
1313
versionName "1.0"
14-
testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
14+
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
1515
}
1616

1717
buildTypes {
@@ -40,13 +40,13 @@ dependencies {
4040

4141
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
4242

43-
implementation "com.android.support:appcompat-v7:$supportLibVersion"
43+
implementation 'androidx.appcompat:appcompat:1.0.0'
4444
implementation "org.wordpress:utils:$wordpressUtilsVersion"
4545

46-
androidTestImplementation "com.android.support.test.espresso:espresso-core:$espressoVersion", {
46+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0', {
4747
exclude group: 'com.android.support', module: 'support-annotations'
4848
}
49-
androidTestImplementation "com.android.support.test.espresso:espresso-intents:$espressoVersion", {
49+
androidTestImplementation 'androidx.test.espresso:espresso-intents:3.1.0', {
5050
exclude group: 'com.android.support', module: 'support-annotations'
5151
}
5252
androidTestImplementation('com.xamarin.testcloud:espresso-support:1.3')

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
package org.wordpress.aztec.demo;
22

3-
import android.support.test.espresso.PerformException;
4-
import android.support.test.espresso.UiController;
5-
import android.support.test.espresso.ViewAction;
6-
import android.support.test.espresso.action.CoordinatesProvider;
7-
import android.support.test.espresso.action.PrecisionDescriber;
8-
import android.support.test.espresso.action.Tap;
9-
import android.support.test.espresso.action.Tapper;
10-
import android.support.test.espresso.util.HumanReadables;
3+
import androidx.test.espresso.PerformException;
4+
import androidx.test.espresso.UiController;
5+
import androidx.test.espresso.ViewAction;
6+
import androidx.test.espresso.action.CoordinatesProvider;
7+
import androidx.test.espresso.action.PrecisionDescriber;
8+
import androidx.test.espresso.action.Tap;
9+
import androidx.test.espresso.action.Tapper;
10+
import androidx.test.espresso.util.HumanReadables;
1111
import android.view.View;
1212
import android.view.ViewConfiguration;
1313
import android.webkit.WebView;
1414

1515
import org.hamcrest.Matcher;
1616

17-
import static android.support.test.espresso.matcher.ViewMatchers.isDisplayingAtLeast;
17+
import static androidx.test.espresso.matcher.ViewMatchers.isDisplayingAtLeast;
1818
import static org.hamcrest.Matchers.allOf;
1919

2020
/**

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
package org.wordpress.aztec.demo;
22

3-
import static android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom;
4-
import static android.support.test.espresso.matcher.ViewMatchers.isDescendantOfA;
5-
import static android.support.test.espresso.matcher.ViewMatchers.isDisplayingAtLeast;
6-
import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
3+
import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom;
4+
import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA;
5+
import static androidx.test.espresso.matcher.ViewMatchers.isDisplayingAtLeast;
6+
import static androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
77
import static org.hamcrest.Matchers.allOf;
88
import static org.hamcrest.Matchers.anyOf;
99

10-
import android.support.test.espresso.PerformException;
11-
import android.support.test.espresso.UiController;
12-
import android.support.test.espresso.ViewAction;
13-
import android.support.test.espresso.matcher.ViewMatchers.Visibility;
14-
import android.support.test.espresso.util.HumanReadables;
10+
import androidx.test.espresso.PerformException;
11+
import androidx.test.espresso.UiController;
12+
import androidx.test.espresso.ViewAction;
13+
import androidx.test.espresso.matcher.ViewMatchers.Visibility;
14+
import androidx.test.espresso.util.HumanReadables;
1515

1616
import android.graphics.Rect;
1717
import android.util.Log;

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package org.wordpress.aztec.demo
22

33
import android.graphics.Rect
4-
import android.support.test.espresso.UiController
5-
import android.support.test.espresso.ViewAction
6-
import android.support.test.espresso.action.CoordinatesProvider
7-
import android.support.test.espresso.action.GeneralClickAction
8-
import android.support.test.espresso.action.Press
9-
import android.support.test.espresso.action.Tap
10-
import android.support.test.espresso.matcher.ViewMatchers.isAssignableFrom
11-
import android.support.test.espresso.matcher.ViewMatchers.isClickable
12-
import android.support.test.espresso.matcher.ViewMatchers.isDisplayed
4+
import androidx.test.espresso.UiController
5+
import androidx.test.espresso.ViewAction
6+
import androidx.test.espresso.action.CoordinatesProvider
7+
import androidx.test.espresso.action.GeneralClickAction
8+
import androidx.test.espresso.action.Press
9+
import androidx.test.espresso.action.Tap
10+
import androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom
11+
import androidx.test.espresso.matcher.ViewMatchers.isClickable
12+
import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
1313
import android.view.View
1414
import android.widget.EditText
1515
import org.hamcrest.Matcher

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.wordpress.aztec.demo
22

3-
import android.support.test.rule.ActivityTestRule
3+
import androidx.test.rule.ActivityTestRule
44
import org.junit.Before
55
import org.junit.Rule
66
import org.wordpress.aztec.AztecText
@@ -24,4 +24,4 @@ abstract class BaseHistoryTest : BaseTest() {
2424
val aztecText = mActivityTestRule.activity.findViewById<AztecText>(R.id.aztec)
2525
aztecText.history.historyThrottleTime = throttleTime
2626
}
27-
}
27+
}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package org.wordpress.aztec.demo
22

3-
import android.support.test.espresso.ViewAction
4-
import android.support.test.espresso.ViewInteraction
5-
import android.support.test.espresso.action.GeneralLocation
6-
import android.support.test.espresso.action.Press
7-
import android.support.test.espresso.action.Tap
8-
import android.support.test.espresso.action.ViewActions
9-
import android.support.test.espresso.assertion.ViewAssertions.matches
10-
import android.support.test.espresso.matcher.ViewMatchers.isDisplayed
3+
import androidx.test.espresso.ViewAction
4+
import androidx.test.espresso.ViewInteraction
5+
import androidx.test.espresso.action.GeneralLocation
6+
import androidx.test.espresso.action.Press
7+
import androidx.test.espresso.action.Tap
8+
import androidx.test.espresso.action.ViewActions
9+
import androidx.test.espresso.assertion.ViewAssertions.matches
10+
import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
1111

1212
abstract class BasePage {
1313

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.wordpress.aztec.demo
22

3-
import android.support.test.rule.GrantPermissionRule
4-
import android.support.test.runner.AndroidJUnit4
3+
import androidx.test.rule.GrantPermissionRule
4+
import androidx.test.runner.AndroidJUnit4
55
import com.xamarin.testcloud.espresso.Factory
66
import com.xamarin.testcloud.espresso.ReportHelper
77
import org.junit.Before

0 commit comments

Comments
 (0)