Merge pull request #877 from wordpress-mobile/release/1.3.35

Merge Release/1.3.35 into master

Author: anitaa1990

.circleci/.firebase.secrets.json.enc

@@ -1,13 +1,13 @@
 version: 2.1
 
 orbs:
-  android: wordpress-mobile/[email protected].21
+  android: wordpress-mobile/[email protected].27
 
 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:
@@ -50,15 +50,15 @@ jobs:
           command: ./gradlew --stacktrace app:assembleDebug app:assembleDebugAndroidTest
       - run:
           name: Decrypt credentials
-          command: openssl aes-256-cbc -md sha256 -d -in .firebase.secrets.json.enc -out .firebase.secrets.json -k "${FIREBASE_SECRETS_ENCRYPTION_KEY}"
+          command: openssl aes-256-cbc -md sha256 -d -in .circleci/.firebase.secrets.json.enc -out .circleci/.firebase.secrets.json -k "${FIREBASE_SECRETS_ENCRYPTION_KEY}"
       - android/firebase-test:
-          key-file: .firebase.secrets.json
+          key-file: .circleci/.firebase.secrets.json
           type: instrumentation
           apk-path: app/build/outputs/apk/debug/app-debug.apk
           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
 

.circleci/config.yml

@@ -7,4 +7,8 @@
 3. [STEP_3]
 
 ### Review
-@[USER_NAME]
+@[USER_NAME]
+
+Make sure strings will be translated:
+
+- [ ] If there are new strings that have to be translated, I have added them to the client's `strings.xml` as a part of the integration PR.

.firebase.secrets.json.enc

@@ -1,4 +1,47 @@
 # Changelog
+
+## [1.3.35](https://github.com/wordpress-mobile/AztecEditor-Android/releases/tag/v1.3.35)
+### Changed
+- Update Glide version to 4.10.0
+
+## [1.3.34](https://github.com/wordpress-mobile/AztecEditor-Android/releases/tag/v1.3.34)
+### Added
+- Added the ability to report to the host app the IndexOutOfBounds exception
+ in android.text.DynamicLayout.getBlockIndex(DynamicLayout.java:646) under Android 8.XX (#861)
+
+## [1.3.33](https://github.com/wordpress-mobile/AztecEditor-Android/releases/tag/v1.3.33)
+### Fixed
+- IndexOutOfBounds case in DynamicLayout.reflow() under Android 8.0.0 (#834)
+
+## [1.3.32](https://github.com/wordpress-mobile/AztecEditor-Android/releases/tag/v1.3.32)
+### Fixed
+- Allow paragraph spans that do not extend AlignmentSpan (#851)
+
+## [1.3.31](https://github.com/wordpress-mobile/AztecEditor-Android/releases/tag/v1.3.31)
+### Fixed
+- Fix lag deleting and inserting text #853 and #854
+
+## [1.3.30](https://github.com/wordpress-mobile/AztecEditor-Android/releases/tag/v1.3.30)
+### Added
+- Added the ability to signal undo/redo events to host app
+
+## [1.3.29](https://github.com/wordpress-mobile/AztecEditor-Android/releases/tag/v1.3.29)
+### Fixed
+- Fix span overlapping on window resizing (Chromebooks)
+- Fix cursor size on new paragraph line (Chromebooks)
+- Fix breaking layout on slow window resizing (Chromebooks)
+
+## [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:
+  * Suppress multiple onSelectionChanged events when listener is disabled #817
+  * Avoid trimming spaces around html block elemts
+
+
 ## [v1.3.26](https://github.com/wordpress-mobile/AztecEditor-Android/releases/tag/v1.3.26)
 ### Fixed
 - DynamicLayout Crash #813

.github/PULL_REQUEST_TEMPLATE.md

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

CHANGELOG.md

@@ -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')

README.md

@@ -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/build.gradle

@@ -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/java/org/wordpress/aztec/demo/BetterClickAction.java

@@ -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