Merge pull request #10673 from wordpress-mobile/merge/13.5-into-master

Merge 13.5 Code Freeze + Final Release Notes into master
wordpress-mobile · Oct 25, 2019 · e8ceca5 · e8ceca5
2 parents 1bbf0ff + 3decc92
commit e8ceca5
Show file tree

Hide file tree

Showing 94 changed files with 2,261 additions and 1,200 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,6 +1,7 @@
 orbs:
-  android: wordpress-mobile/[email protected]
-  git: wordpress-mobile/[email protected]
+  # Using 1.0 of the Orbs means it will use the latest 1.0.x version from https://github.com/wordpress-mobile/circleci-orbs
+  android: wordpress-mobile/[email protected]
+  git: wordpress-mobile/[email protected]
   bundle-install: toshimaru/[email protected]
   slack: circleci/[email protected]
 
@@ -131,5 +132,11 @@ workflows:
       - strings-check
       - test
       - lint
-      - Installable Build
-      - connected-tests
+      - Installable Build:
+          filters:
+            branches:
+              ignore: /pull\/[0-9]+/
+      - connected-tests:
+          filters:
+            branches:
+              ignore: /pull\/[0-9]+/
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -1,5 +1,11 @@
+13.6
+-----
+
 13.5
 -----
+ * Block Editor: Fix issue when multiple media selection adds only one image or video block.
+ * Block Editor: Add Link Target (Open in new tab) to Image Block.
+ * Block Editor: New block "Media & Text".
 
 13.4
 -----

diff --git a/WordPress/build.gradle b/WordPress/build.gradle
@@ -53,9 +53,9 @@ android {
         if (project.hasProperty("versionName")) {
             versionName project.property("versionName")
         } else {
-            versionName "alpha-191"
+            versionName "alpha-192"
         }
-        versionCode 783
+        versionCode 786
         minSdkVersion 21
         targetSdkVersion 28
 
@@ -81,23 +81,23 @@ android {
             dimension "buildType"
             // Only set the release version if one isn't provided
             if (!project.hasProperty("versionName")) {
-                versionName "13.4"
+                versionName "13.5-rc-1"
             }
-            versionCode 784
+            versionCode 785
             buildConfigField "boolean", "ME_ACTIVITY_AVAILABLE", "false"
         }
 
         zalpha { // alpha version - enable experimental features
             applicationId "org.wordpress.android"
             dimension "buildType"
             buildConfigField "boolean", "VIDEO_OPTIMIZATION_AVAILABLE", "true"
-            buildConfigField "boolean", "ME_ACTIVITY_AVAILABLE", "true"
+            buildConfigField "boolean", "ME_ACTIVITY_AVAILABLE", "false"
         }
 
         wasabi { // "hot" version, can be installed along release, alpha or beta versions
             applicationId "org.wordpress.android.beta"
             dimension "buildType"
-            buildConfigField "boolean", "ME_ACTIVITY_AVAILABLE", "true"
+            buildConfigField "boolean", "ME_ACTIVITY_AVAILABLE", "false"
         }
     }
 
@@ -182,13 +182,16 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-core-utils'
     })
 
+    implementation 'com.android.volley:volley:1.1.1'
     implementation 'com.google.firebase:firebase-messaging:17.0.0'
     implementation 'com.google.android.gms:play-services-auth:15.0.1'
     implementation 'com.google.android.gms:play-services-places:15.0.1'
     implementation 'com.android.installreferrer:installreferrer:1.0'
     implementation 'com.github.chrisbanes.photoview:library:1.2.4'
     implementation 'org.greenrobot:eventbus:3.1.1'
-    implementation 'com.automattic:rest:1.0.7'
+    implementation ('com.automattic:rest:1.0.7') {
+        exclude group: 'com.mcxiaoke.volley'
+    }
     implementation 'org.wordpress:graphview:3.4.0'
     implementation 'org.wordpress:persistentedittext:1.0.2'
     implementation 'org.wordpress:emailchecker2:1.1.0'
@@ -206,8 +209,8 @@ dependencies {
     implementation 'com.github.bumptech.glide:volley-integration:4.6.1@aar'
 
     testImplementation 'junit:junit:4.12'
-    testImplementation 'org.robolectric:robolectric:3.6.1'
-    testImplementation 'org.robolectric:shadows-multidex:3.6.1'
+    testImplementation 'org.robolectric:robolectric:4.3'
+    testImplementation 'org.robolectric:shadows-multidex:4.3'
     testImplementation 'org.mockito:mockito-core:2.23.0'
     testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0'
     testImplementation 'org.assertj:assertj-core:3.11.1'
@@ -260,7 +263,9 @@ dependencies {
     implementation ('com.github.indexos.media-for-mobile:android:43a9026f0973a2f0a74fa813132f6a16f7499c3a')
 
     implementation project(path:':libs:utils:WordPressUtils')
-    implementation project(path:':libs:networking:WordPressNetworking')
+    implementation (project(path:':libs:networking:WordPressNetworking')) {
+        exclude group: "com.android.volley"
+    }
     implementation project(path:':libs:analytics:WordPressAnalytics')
     implementation project(path:':libs:editor:WordPressEditor')
     implementation (project(path:':libs:login:WordPressLoginFlow')) {