Release 1.41.0

.circleci/config.yml

@@ -45,6 +45,12 @@ commands:
             name: Create reports directory
             command: mkdir reports && mkdir reports/test-results
 
+parameters:
+  android-docker-image:
+    type: string
+    # Hash points to previous version with node 12. When everything works with node 14 it can be removed
+    default: "circleci/android:api-29-node@sha256:71d61d6c21b29948d57120f476a83cc322a280979bce355c5a0ad771293ca380" 
+
 jobs:
   checks:
     parameters:
@@ -93,37 +99,41 @@ jobs:
       is-canary:
         type: string
         default: ""
-    docker:
-    - image: circleci/android:api-29-node@sha256:71d61d6c21b29948d57120f476a83cc322a280979bce355c5a0ad771293ca380
-    environment:
-      JAVA_OPTS: '-Xms512m -Xmx2g'
-      GRADLE_OPTS: '-Xmx3g -Dorg.gradle.daemon=false -Dorg.gradle.jvmargs="-Xmx2g -XX:+HeapDumpOnOutOfMemoryError"'
+    machine:
+      image: ubuntu-2004:202010-01 # Latest supported ubuntu image from https://circleci.com/docs/2.0/configuration-reference/#available-machine-images
     steps:
       - checkout
       - checkout-submodules
+      - run: node -v
+      - run: npm install -g yarn
       - npm-install
-      - add-jest-reporter-dir
+      - run: npm run test:e2e:bundle:android
       - run:
-          name: Set Environment Variables
+          name: Build apk
           command: |
-            echo 'export TEST_RN_PLATFORM=android' >> $BASH_ENV
-            echo 'export TEST_ENV=sauce' >> $BASH_ENV
-      - run:
-          name: Bundle Android and Generate debug .apk file for testing
-          command: npm run test:e2e:bundle:android && npm run test:e2e:build-app:android
+            docker run --rm -it \
+            --volume $(pwd):/home/circleci/project \
+            --workdir /home/circleci/project \
+            --env JAVA_OPTS='-Xms512m -Xmx2g' \
+            --env GRADLE_OPTS='-Xmx3g -Dorg.gradle.daemon=false -Dorg.gradle.jvmargs="-Xmx2g -XX:+HeapDumpOnOutOfMemoryError"' \
+            << pipeline.parameters.android-docker-image >> \
+            /bin/bash -c "sudo chown -R circleci:circleci . && npm run core test:e2e:build-app:android"
       - run:
           name: Upload apk to sauce labs
           command: |
             source bin/sauce-pre-upload.sh
             curl -u "$SAUCE_USERNAME:$SAUCE_ACCESS_KEY" -X POST -H "Content-Type: application/octet-stream" https://saucelabs.com/rest/v1/storage/automattic/Gutenberg-$SAUCE_FILENAME.apk?overwrite=true --data-binary @./gutenberg/packages/react-native-editor/android/app/build/outputs/apk/debug/app-debug.apk
+      - run: mkdir /home/circleci/test-results
       - run:
           name: Run Device Tests
           command: npm run device-tests<<parameters.is-canary>>
           no_output_timeout: 1200
           environment:
-            JEST_JUNIT_OUTPUT: "reports/test-results/android-test-results.xml"
+            TEST_RN_PLATFORM: android
+            TEST_ENV: sauce
+            JEST_JUNIT_OUTPUT: "/home/circleci/test-results/android-test-results.xml"
       - store_test_results:
-          path: ./reports/test-results
+          path: /home/circleci/test-results
       - when:
           condition: << parameters.post-to-slack >>
           steps:
@@ -139,7 +149,7 @@ jobs:
         type: boolean
         default: false
     docker:
-    - image: circleci/android:api-29-node@sha256:71d61d6c21b29948d57120f476a83cc322a280979bce355c5a0ad771293ca380
+    - image: << pipeline.parameters.android-docker-image >>
     steps:
       - checkout
       - checkout-submodules
@@ -157,7 +167,7 @@ jobs:
         type: string
         default: ""
     macos:
-      xcode: "11.2.1"
+      xcode: "12.0.0"
     steps:
     - checkout
     - checkout-submodules
@@ -184,7 +194,7 @@ jobs:
         - dependencies-v4-
     - run:
         name: Build (if needed)
-        command: test -e gutenberg/packages/react-native-editor/ios/build/GutenbergDemo/Build/Products/Release-iphonesimulator/GutenbergDemo.app || SKIP_BUNDLING=true npm run core test:e2e:build-app:ios
+        command: test -e gutenberg/packages/react-native-editor/ios/build/GutenbergDemo/Build/Products/Release-iphonesimulator/GutenbergDemo.app || npm run core test:e2e:build-app:ios
     - save_cache:
         name: Save Dependencies Cache
         key: dependencies-v4-{{ checksum "gutenberg/packages/react-native-editor/ios/Gemfile.lock" }}-{{ checksum "gutenberg/packages/react-native-editor/ios/Podfile.lock" }}-{{ checksum "gutenberg/package-lock.json" }}

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "gitsubmodule" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"

.gitignore

@@ -41,6 +41,8 @@ build.log
 bundle/android/raw/*
 bundle/android/App.js
 bundle/android/App.js.map
+bundle/android/App.text.js
+bundle/android/App.text.js.map
 bundle/ios/assets/gutenberg/packages/block-library/src/*
 
 # Local configuration file (sdk path, etc)

README.md

@@ -15,6 +15,7 @@ For a developer experience closer to the one the project maintainers current hav
 * [AndroidStudio](https://developer.android.com/studio/) to be able to compile the Android version of the app
 * [Xcode](https://developer.apple.com/xcode/) to be able to compile the iOS app
 * CocoaPods(`sudo gem install cocoapods`) needed to fetch React and third-party dependencies.
+* [Carthage](https://github.com/Carthage/Carthage#installing-carthage) for appium to be able run iOS UI tests
 
 Note that the OS platform used by the maintainers is macOS but the tools and setup should be usable in other platforms too.
 

RELEASE-NOTES.txt

@@ -1,3 +1,13 @@
+1.41.0
+------
+
+* [***] Faster editor start and overall operation on Android. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/2780]
+* [*] [Android] Enable multiple upload support for Image block. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/2530]
+
+1.40.0
+------
+
+
 1.39.0
 ------
 * [***] Full-width and wide alignment support for Video, Latest-posts, Gallery, Media & text, and Pullquote block. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/2605]

bundle/android/strings.xml

@@ -32,7 +32,6 @@
     <string name="gutenberg_native_add_video" tools:ignore="UnusedResources">ADD VIDEO</string>
     <string name="gutenberg_native_alt_text" tools:ignore="UnusedResources">Alt Text</string>
     <string name="gutenberg_native_an_unknown_error_occurred_please_try_again" tools:ignore="UnusedResources">An unknown error occurred. Please try again.</string>
-    <string name="gutenberg_native_angle" tools:ignore="UnusedResources">Angle</string>
     <string name="gutenberg_native_annotations_sidebar" tools:ignore="UnusedResources">Annotations Sidebar</string>
     <!-- translators: displayed right after the block is copied. -->
     <string name="gutenberg_native_block_copied" tools:ignore="UnusedResources">Block copied</string>
@@ -207,7 +206,6 @@ translators: sample content for "Services" page template -->
     <!-- translators: Checkbox toggle label -->
     <string name="gutenberg_native_show_section" tools:ignore="UnusedResources">Show section</string>
     <string name="gutenberg_native_sidebar_title_plugin" tools:ignore="UnusedResources">Sidebar title plugin</string>
-    <string name="gutenberg_native_size" tools:ignore="UnusedResources">Size</string>
     <string name="gutenberg_native_start_writing" tools:ignore="UnusedResources">Start writing…</string>
     <!-- translators: sample content for "Services" page template -->
     <string name="gutenberg_native_strategy" tools:ignore="UnusedResources">Strategy</string>