Merge branch 'develop' of github.com:wordpress-mobile/WordPress-Android into update/editor-session-analytic-properties

Author: dcalhoun

.bundle/config

@@ -1,5 +1,5 @@
 ---
 BUNDLE_PATH: "vendor/bundle"
 BUNDLE_RETRY: "3"
-BUNDLE_JOBS: "3"
+BUNDLE_JOBS: "16"
 BUNDLE_WITHOUT: "screenshots"

.circleci/config.yml

@@ -376,7 +376,7 @@ jobs:
           timeout: 10m
           results-history-name: CircleCI WPUtils Connected Tests
       - android/save-gradle-cache
-  strings-check:
+  submodules-strings-check:
     docker:
       - image: circleci/ruby:2.6.4
     steps:
@@ -390,7 +390,7 @@ jobs:
           cache_key_prefix: strings-check-v2
       - run:
           name: Validate login strings
-          command: FASTLANE_SKIP_UPDATE_CHECK=1 bundle exec fastlane validate_login_strings pr_url:$CIRCLE_PULL_REQUEST
+          command: FASTLANE_SKIP_UPDATE_CHECK=1 bundle exec fastlane validate_submodules_strings pr_url:$CIRCLE_PULL_REQUEST
   translation-review-build:
     executor:
       name: android/default
@@ -440,7 +440,7 @@ workflows:
         - << pipeline.parameters.generate_screenshots >>
         - << pipeline.parameters.release_build >>
     jobs:
-      - strings-check
+      - submodules-strings-check
       - test
       - lint
       - Installable Build:

Gemfile.lock

@@ -35,7 +35,7 @@ GEM
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     declarative (0.0.20)
     diffy (3.4.0)
     digest-crc (0.6.3)
@@ -101,7 +101,7 @@ GEM
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
-    fastlane-plugin-wpmreleasetoolkit (1.0.1)
+    fastlane-plugin-wpmreleasetoolkit (1.2.0)
       activesupport (~> 5)
       bigdecimal (~> 1.4)
       chroma (= 0.2.0)
@@ -175,13 +175,13 @@ GEM
     memoist (0.16.2)
     mini_magick (4.11.0)
     mini_mime (1.1.0)
-    mini_portile2 (2.5.1)
+    mini_portile2 (2.5.3)
     minitest (5.14.4)
     multi_json (1.15.0)
     multipart-post (2.0.0)
     nanaimo (0.3.0)
     naturally (2.2.1)
-    nokogiri (1.11.5)
+    nokogiri (1.11.7)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
     octokit (4.21.0)
@@ -258,9 +258,9 @@ PLATFORMS
 
 DEPENDENCIES
   fastlane (~> 2)
-  fastlane-plugin-wpmreleasetoolkit (~> 1.0)
+  fastlane-plugin-wpmreleasetoolkit (~> 1.1)
   nokogiri
   rmagick (~> 4.1)
 
 BUNDLED WITH
-   2.2.16
+   2.2.19

RELEASE-NOTES.txt

@@ -1,9 +1,16 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 
-17.6
+17.7
 -----
 
 
+17.6
+-----
+* [*] Disables the ability to open the editor for Post Pages [#14523]
+* [*] Block Editor: "Set as featured" button within image block settings. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3116]
+* [***] Block Editor: Audio block now available on WP.com sites on the free plan. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3523]
+* [*] Block Editor: Improve unsupported block message for reusable block. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3621]
+
 17.5
 -----
 * [**] Block Editor: Audio block: Add Insert from URL functionality. [https://github.com/wordpress-mobile/gutenberg-mobile/pull/3031]

WordPress/build.gradle

@@ -1,13 +1,14 @@
 buildscript {
     repositories {
+        google()
         jcenter()
         maven { url 'https://plugins.gradle.org/m2/' }
     }
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
-        classpath 'com.google.gms:google-services:3.2.0'
+        classpath 'com.google.gms:google-services:4.3.8'
         classpath 'se.bjurr.violations:violation-comments-to-github-gradle-plugin:1.67'
-        classpath 'io.sentry:sentry-android-gradle-plugin:1.7.28'
+        classpath 'io.sentry:sentry-android-gradle-plugin:2.0.0'
     }
 }
 
@@ -64,8 +65,6 @@ allOpen {
     annotation 'org.wordpress.android.testing.OpenClassAnnotation'
 }
 
-android.defaultConfig.javaCompileOptions.annotationProcessorOptions.includeCompileClasspath = true
-
 android {
     useLibrary 'android.test.runner'
 
@@ -87,9 +86,9 @@ android {
         if (project.hasProperty("versionName")) {
             versionName project.property("versionName")
         } else {
-            versionName "alpha-297"
+            versionName "alpha-300"
         }
-        versionCode 1057
+        versionCode 1064
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
 
@@ -105,12 +104,15 @@ android {
         buildConfigField "boolean", "MY_SITE_IMPROVEMENTS", "false"
         buildConfigField "boolean", "SEEN_UNSEEN_WITH_COUNTER", "false"
         buildConfigField "boolean", "CONTACT_INFO_BLOCK_AVAILABLE", "true"
+        buildConfigField "boolean", "LAYOUT_GRID_BLOCK_AVAILABLE", "true"
         buildConfigField "boolean", "LIKES_ENHANCEMENTS", "false"
         buildConfigField "boolean", "IS_JETPACK_APP", "false"
         buildConfigField "String", "TRACKS_EVENT_PREFIX", '"wpandroid_"'
         buildConfigField "String", "PUSH_NOTIFICATIONS_APP_KEY", '"org.wordpress.android"'
         buildConfigField "boolean", "UNIFIED_COMMENTS_LIST", "false"
         buildConfigField "boolean", "MP4_COMPOSER_VIDEO_OPTIMIZATION", "false"
+        buildConfigField "boolean", "BLOGGING_REMINDERS", "false"
+        buildConfigField "boolean", "MANAGE_CATEGORIES", "false"
 
         manifestPlaceholders = [magicLinkScheme:"wordpress"]
     }
@@ -150,13 +152,14 @@ android {
             dimension "buildType"
             // Only set the release version if one isn't provided
             if (!project.hasProperty("versionName")) {
-                versionName "17.5-rc-1"
+                versionName "17.6-rc-3"
             }
-            versionCode 1056
+            versionCode 1063
             buildConfigField "boolean", "ME_ACTIVITY_AVAILABLE", "false"
             buildConfigField "long", "REMOTE_CONFIG_FETCH_INTERVAL", "3600"
             buildConfigField "boolean", "ENABLE_FEATURE_CONFIGURATION", "false"
             buildConfigField "boolean", "CONTACT_INFO_BLOCK_AVAILABLE", "true"
+            buildConfigField "boolean", "LAYOUT_GRID_BLOCK_AVAILABLE", "false"
         }
 
         zalpha { // alpha version - enable experimental features
@@ -203,8 +206,7 @@ android {
     lintOptions{
         checkDependencies = true
         checkGeneratedSources = true
-        lintConfig file('lint.xml')
-        baseline file("lint-baseline.xml")
+        lintConfig file("${project.rootDir}/config/lint.xml")
     }
 
     packagingOptions {
@@ -280,6 +282,8 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion"
     // ProcessLifecycleOwner
     implementation "androidx.lifecycle:lifecycle-process:$lifecycleVersion"
+    // Paging Library
+    implementation("androidx.paging:paging-runtime-ktx:$pagingVersion")
 
     testImplementation("androidx.arch.core:core-testing:$androidxArchCoreVersion", {
         exclude group: 'com.android.support', module: 'support-compat'
@@ -299,6 +303,7 @@ dependencies {
     implementation 'org.wordpress:graphview:3.4.0'
     implementation 'org.wordpress:persistentedittext:1.0.2'
     implementation 'org.wordpress:emailchecker2:1.1.0'
+    implementation "com.github.Automattic:Automattic-Tracks-Android:$tracksVersion"
     implementation 'com.squareup.okio:okio:2.8.0'
     implementation 'org.apache.commons:commons-text:1.1'
     implementation 'com.airbnb.android:lottie:3.4.0'
@@ -328,7 +333,11 @@ dependencies {
     androidTestImplementation 'org.mockito:mockito-android:3.3.3'
     androidTestImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:$nhaarmanMockitoVersion"
     androidTestImplementation 'com.squareup.okhttp:mockwebserver:2.7.5'
-    testImplementation('org.bouncycastle:bcprov-jdk15on:1.64') { force = true }
+    testImplementation('org.bouncycastle:bcprov-jdk15on') {
+        version {
+            strictly '1.64'
+        }
+    }
 
     androidTestImplementation 'com.squareup.okio:okio:2.8.0'
     androidTestImplementation "androidx.test.espresso:espresso-core:$espressoVersion", {
@@ -356,7 +365,7 @@ dependencies {
     androidTestImplementation 'tools.fastlane:screengrab:2.0.0',  {
         exclude group: 'com.android.support.test.uiautomator', module: 'uiautomator-v18'
     }
-    androidTestCompile (name:'cloudtestingscreenshotter_lib', ext:'aar') // Screenshots on Firebase Cloud Testing
+    androidTestImplementation (name:'cloudtestingscreenshotter_lib', ext:'aar') // Screenshots on Firebase Cloud Testing
     androidTestImplementation "androidx.work:work-testing:$androidxWorkVersion"
 
     kaptAndroidTest "com.google.dagger:dagger-compiler:$daggerVersion"
@@ -388,7 +397,8 @@ dependencies {
     implementation (project(path:':libs:editor:WordPressEditor')) {
         exclude group: 'org.wordpress', module: 'utils'
     }
-    implementation (project(path:':libs:login:WordPressLoginFlow')) {
+
+    implementation ("$gradle.ext.loginFlowBinaryPath:$wordPressLoginVersion") {
         exclude group: "com.github.wordpress-mobile.WordPress-FluxC-Android", module: "fluxc"
         exclude group: 'com.github.bumptech.glide'
         exclude group: 'org.wordpress', module: 'utils'
@@ -403,10 +413,6 @@ dependencies {
 
     lintChecks 'org.wordpress:lint:1.0.1'
 
-    // Sentry
-    implementation 'io.sentry:sentry-android:2.1.3'
-    implementation 'org.slf4j:slf4j-nop:1.7.25'
-
     // Firebase
     implementation 'com.google.firebase:firebase-config:19.1.3'