Merge pull request #792 from wordpress-mobile/feature/update-docs-for-v1.3.21

Update README and CHANGELOG for a v1.3.21

Author: hypest

.circleci/config.yml

@@ -0,0 +1,70 @@
+version: 2.1
+
+orbs:
+  android: wordpress-mobile/[email protected]
+
+jobs:
+  Lint:
+    executor: 
+      name: android/default
+      api-version: "27"
+    steps:
+      - checkout
+      - android/restore-gradle-cache:
+          cache-prefix: lint
+      - run:
+          name: klint
+          command: ./gradlew --stacktrace ktlint
+      - run:
+          name: Lint
+          command: ./gradlew --stacktrace lintRelease
+      - android/save-gradle-cache:
+          cache-prefix: lint
+      - store_artifacts:
+          path: aztec/build/reports
+          destination: reports
+  Unit Tests:
+    executor: 
+      name: android/default
+      api-version: "27"
+    steps:
+      - checkout
+      - android/restore-gradle-cache:
+          cache-prefix: unit-tests
+      - run:
+          name: Unit tests
+          command: ./gradlew --stacktrace -PtestsMaxHeapSize=1536m aztec:testRelease
+      - android/save-gradle-cache:
+          cache-prefix: unit-tests
+      - android/save-test-results
+  Connected Tests:
+    executor: 
+      name: android/default
+      api-version: "27"
+    steps:
+      - checkout
+      - android/restore-gradle-cache:
+          cache-prefix: connected-tests
+      - run:
+          name: Build
+          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}"
+      - android/firebase-test:
+          key-file: .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
+      - android/save-gradle-cache:
+          cache-prefix: connected-tests
+
+workflows:
+  AztecEditor-Android:
+    jobs:
+      - Lint
+      - Unit Tests
+      - Connected Tests

.firebase.secrets.json.enc

@@ -9,7 +9,7 @@ android:
     - extra-google-m2repository
     - platform-tools
     - tools
-    - build-tools-27.0.3
+    - build-tools-28.0.3
     - android-27
 
 env:
@@ -21,7 +21,7 @@ env:
 
 before_install:
   # Decrypt secret.json (firebase access)
-  - openssl aes-256-cbc -K $encrypted_3480988b28c1_key -iv $encrypted_3480988b28c1_iv -in .firebase.secrets.json.enc -out .firebase.secrets.json -d
+  - openssl aes-256-cbc -md sha256 -d -in .firebase.secrets.json.enc -out .firebase.secrets.json -k "${FIREBASE_SECRETS_ENCRYPTION_KEY}"
 
 script:
   # Build

.travis.yml

@@ -1,4 +1,24 @@
 # Changelog
+## [v1.3.21](https://github.com/wordpress-mobile/AztecEditor-Android/releases/tag/v1.3.21)
+### Changed
+- Some performance improvements, mostly visible via the WPAndroid app https://github.com/wordpress-mobile/gutenberg-mobile/issues/672
+
+## [v1.3.20](https://github.com/wordpress-mobile/AztecEditor-Android/releases/tag/v1.3.20)
+### Changed
+- Support for `<em>` for italic and using it as default via the formatting toolbar #777
+
+## [v1.3.19](https://github.com/wordpress-mobile/AztecEditor-Android/releases/tag/v1.3.19)
+### Fixed
+- Option to avoid autofocus when getting visible #783
+
+## [v1.3.18](https://github.com/wordpress-mobile/AztecEditor-Android/releases/tag/v1.3.18)
+### Fixed
+- Revert merge #776
+
+## [v1.3.17](https://github.com/wordpress-mobile/AztecEditor-Android/releases/tag/v1.3.17)
+### Fixed
+- Add jitpack.yml to work around the Google licence issue (#778)
+
 ## [v1.3.16](https://github.com/wordpress-mobile/AztecEditor-Android/releases/tag/v1.3.16)
 ### Fixed
 - Fix onSelectionChange being emitted twice when calling fromHTML (#776)

CHANGELOG.md

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

README.md

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 
 android {
     compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         applicationId "org.wordpress.aztec"

app/build.gradle

@@ -187,7 +187,7 @@ class FormattingHistoryTests : BaseHistoryTest() {
     @Test
     fun testAddItalicAndUnderlineUndoRedo() {
         val text = "There's no crying in baseball!"
-        val htmlRegex = Regex("<i><u>$text</u></i>|<u><i>$text</i></u>")
+        val htmlRegex = Regex("<em><u>$text</u></em>|<u><em>$text</em></u>")
         val editorPage = EditorPage()
 
         // Insert text snippet

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

@@ -22,7 +22,7 @@ class MixedTextFormattingTests : BaseTest() {
         val text1 = "so"
         val text2 = "me "
         val text3 = "text "
-        val regex = Regex("<strong>$text1</strong><i>$text2</i><(strong|i)><(strong|i)>$text3</(strong|i)></(strong|i)>")
+        val regex = Regex("<strong>$text1</strong><em>$text2</em><(strong|em)><(strong|em)>$text3</(strong|em)></(strong|em)>")
 
         EditorPage()
                 .toggleBold()

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

@@ -32,7 +32,7 @@ class SimpleTextFormattingTests : BaseTest() {
     fun testSimpleItalicFormatting() {
         val text1 = "some"
         val text2 = "text"
-        val html = "$text1<i>$text2</i>"
+        val html = "$text1<em>$text2</em>"
 
         EditorPage()
                 .insertText(text1)
@@ -335,7 +335,7 @@ class SimpleTextFormattingTests : BaseTest() {
     @Test
     fun testInlineStyleAndDelete() {
         val text1 = "some"
-        val html = "<i>som</i>"
+        val html = "<em>som</em>"
 
         EditorPage()
                 .toggleItalics()

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

@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
 
 android {
     compileSdkVersion 27
-    buildToolsVersion "27.0.3"
+    buildToolsVersion "28.0.3"
 
     defaultConfig {
         minSdkVersion 16
@@ -27,6 +27,13 @@ android {
     testOptions {
         unitTests {
             includeAndroidResources = true
+            all {
+                if (project.hasProperty('testsMaxHeapSize')) {
+                    // maxHeapSize for tests is not limited unless we give an explicit value
+                    // See https://docs.gradle.org/current/dsl/org.gradle.api.tasks.testing.Test.html
+                    maxHeapSize project.properties.get('testsMaxHeapSize')
+                }
+            }
         }
     }
 }