Merge pull request #11733 from wordpress-mobile/merge/14.7-rc-2-to-ma…

…ster

Merge 14.7-rc-2 to master

.circleci/config.yml

@@ -158,7 +158,7 @@ jobs:
       - android/save-gradle-cache
   strings-check:
     docker:
-      - image: circleci/ruby:2.5.5
+      - image: circleci/ruby:2.6.4
     steps:
       - git/shallow-checkout
       - run:

.configure

@@ -1,7 +1,7 @@
 {
   "project_name": "WordPress-Android",
   "branch": "master",
-  "pinned_hash": "eb32678967bdbe1e100a6dbb4cf8adeb8935e335",
+  "pinned_hash": "c9fee80926844dde0c23d55128de6232539571e2",
   "files_to_copy": [
     {
       "file": "android/WPAndroid/gradle.properties",
@@ -27,4 +27,4 @@
   "file_dependencies": [
 
   ]
-}
+}

.ruby-version

@@ -1 +1 @@
-2.5.5
+2.6.4

Gemfile

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 source "https://rubygems.org" do
-  gem 'fastlane', "2.140.0"
+  gem 'fastlane', "2.142.0"
   gem 'nokogiri'
 end
 

Gemfile.lock

@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/wordpress-mobile/release-toolkit
-  revision: 2e9929c49b1a93761e320ba6b56b0ee1579de5e8
-  tag: 0.8.2
+  revision: e426345db3afc839ee463ec1ce8432f584880957
+  tag: 0.9.2
   specs:
-    fastlane-plugin-wpmreleasetoolkit (0.8.2)
+    fastlane-plugin-wpmreleasetoolkit (0.9.2)
       activesupport (~> 4)
       chroma (= 0.2.0)
       diffy (~> 3.3)
@@ -35,16 +35,16 @@ GEM
     colored2 (3.1.2)
     commander-fastlane (4.4.6)
       highline (~> 1.7.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     declarative (0.0.10)
     declarative-option (0.1.0)
     diffy (3.3.0)
-    digest-crc (0.4.1)
+    digest-crc (0.5.1)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.7.5)
     emoji_regex (1.0.1)
-    excon (0.71.1)
+    excon (0.73.0)
     faraday (0.17.3)
       multipart-post (>= 1.2, < 3)
     faraday-cookie_jar (0.0.6)
@@ -53,7 +53,7 @@ GEM
     faraday_middleware (0.13.1)
       faraday (>= 0.7.4, < 1.0)
     fastimage (2.1.7)
-    fastlane (2.140.0)
+    fastlane (2.142.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.3, < 3.0.0)
       babosa (>= 1.0.2, < 2.0.0)
@@ -91,7 +91,8 @@ GEM
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
     gh_inspector (1.1.3)
-    git (1.5.0)
+    git (1.6.0)
+      rchardet (~> 1.8)
     google-api-client (0.36.4)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (~> 0.9)
@@ -103,18 +104,18 @@ GEM
     google-cloud-core (1.5.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.3.0)
-      faraday (~> 0.11)
+    google-cloud-env (1.3.1)
+      faraday (>= 0.17.3, < 2.0)
     google-cloud-errors (1.0.0)
-    google-cloud-storage (1.25.1)
+    google-cloud-storage (1.26.0)
       addressable (~> 2.5)
       digest-crc (~> 0.4)
       google-api-client (~> 0.33)
       google-cloud-core (~> 1.2)
       googleauth (~> 0.9)
       mini_mime (~> 1.0)
-    googleauth (0.10.0)
-      faraday (~> 0.12)
+    googleauth (0.11.0)
+      faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
       multi_json (~> 1.11)
@@ -135,29 +136,31 @@ GEM
     mini_magick (4.10.1)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.13.0)
+    minitest (5.14.0)
     multi_json (1.14.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     nanaimo (0.2.6)
     naturally (2.2.0)
     nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
-    octokit (4.14.0)
+    octokit (4.18.0)
+      faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    oj (3.10.0)
+    oj (3.10.6)
     optimist (3.0.0)
     options (2.3.2)
-    os (1.0.1)
+    os (1.1.0)
     parallel (1.19.1)
     plist (3.5.0)
     progress_bar (1.3.1)
       highline (>= 1.6, < 3)
       options (~> 2.3.0)
     public_suffix (2.0.5)
     rake (12.3.3)
-    rake-compiler (1.0.8)
+    rake-compiler (1.1.0)
       rake
+    rchardet (1.8.0)
     representable (3.0.4)
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
@@ -170,32 +173,32 @@ GEM
       addressable (>= 2.3.5)
       faraday (> 0.8, < 2.0)
     security (0.1.3)
-    signet (0.12.0)
+    signet (0.14.0)
       addressable (~> 2.3)
-      faraday (~> 0.9)
+      faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    simctl (1.6.7)
+    simctl (1.6.8)
       CFPropertyList
       naturally
     slack-notifier (2.3.2)
     terminal-notifier (2.0.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
-    tty-cursor (0.7.0)
-    tty-screen (0.7.0)
-    tty-spinner (0.9.2)
+    tty-cursor (0.7.1)
+    tty-screen (0.7.1)
+    tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     uber (0.1.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.6)
-    unicode-display_width (1.6.0)
+    unf_ext (0.0.7.7)
+    unicode-display_width (1.7.0)
     word_wrap (1.0.0)
-    xcodeproj (1.14.0)
+    xcodeproj (1.15.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
@@ -210,7 +213,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  fastlane (= 2.140.0)!
+  fastlane (= 2.142.0)!
   fastlane-plugin-wpmreleasetoolkit!
   nokogiri!
   rmagick (~> 3.2.0)

RELEASE-NOTES.txt

@@ -1,10 +1,22 @@
-14.7
+14.8
 -----
 
+14.7
+-----
+* Block editor: Disable ripple effect for Slider control
+* Block editor: New block: Columns
+* Block editor: New starter page template: Blog
+* Block editor: Make Starter Page Template picker buttons visible only when the screen height is enough
+* Block editor: Fix a bug which caused to show URL settings modal randomly when changing the device orientation multiple times during the time Starter Page Template Preview is open
+* Block editor: "Choose media from device" now opens our built-in media picker instead of the OS default media picker.
+* Added user Gravatar to the Me menu in My Site.
+* Updated site details screen title to "My site", to avoid duplicating the title of the current site which is displayed in the screen's header area. 
+
 14.6
 -----
 * Block editor: You can now crop, zoom in/out and rotate images that are already inserted in a post.
 * Fix a deeplinking issue that could lead to the app not being open after clicking on some special "wordpress://" URLs.
+* Site Creation: Improved look of the loading screen while the site is being created
 * Block editor: New block: Cover
 * Block editor: Improve icon on the "Take a Video" media option
 * Block editor: Removed the dimming effect on unselected blocks

WordPress/build.gradle

@@ -15,7 +15,6 @@ repositories {
     google()
     jcenter()
     maven { url 'https://zendesk.jfrog.io/zendesk/repo' }
-    maven { url "https://giphy.bintray.com/giphy-sdk" }
     maven { url "https://www.jitpack.io" }
     maven { url "http://dl.bintray.com/terl/lazysodium-maven" }
 }
@@ -56,9 +55,9 @@ android {
         if (project.hasProperty("versionName")) {
             versionName project.property("versionName")
         } else {
-            versionName "alpha-216"
+            versionName "alpha-218"
         }
-        versionCode 849
+        versionCode 855
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
 
@@ -68,6 +67,7 @@ android {
         testInstrumentationRunner 'org.wordpress.android.WordPressTestRunner'
 
         buildConfigField "boolean", "OFFER_GUTENBERG", "true"
+        buildConfigField "boolean", "TENOR_AVAILABLE", "true"
     }
 
     // Gutenberg's dependency - react-native-video is using
@@ -84,10 +84,11 @@ android {
             dimension "buildType"
             // Only set the release version if one isn't provided
             if (!project.hasProperty("versionName")) {
-                versionName "14.6"
+                versionName "14.7-rc-2"
             }
-            versionCode 850
+            versionCode 854
             buildConfigField "boolean", "ME_ACTIVITY_AVAILABLE", "false"
+            buildConfigField "boolean", "TENOR_AVAILABLE", "false"
         }
 
         zalpha { // alpha version - enable experimental features
@@ -117,6 +118,7 @@ android {
     }
 
     testOptions {
+        animationsDisabled = true
         unitTests {
             includeAndroidResources = true
             returnDefaultValues = true
@@ -225,6 +227,7 @@ dependencies {
     testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0'
     testImplementation "org.assertj:assertj-core:$assertJVersion"
     testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.2.1'
+    testImplementation 'androidx.test:core:1.2.0'
 
     androidTestImplementation 'org.mockito:mockito-android:2.27.0'
     androidTestImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.1.0'
@@ -290,6 +293,8 @@ dependencies {
         exclude group: 'com.google.dagger'
     }
 
+    implementation 'com.github.Tenor-Inc:tenor-android-core:0.5.1'
+
     lintChecks 'org.wordpress:lint:1.0.1'
 
     // Sentry
@@ -303,7 +308,6 @@ dependencies {
     // Debug
     debugImplementation 'com.facebook.stetho:stetho:1.5.1'
     debugImplementation 'com.facebook.stetho:stetho-okhttp3:1.5.1'
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.2'
 
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlin_coroutines_version"