Release/merge master 1.28 to develop

bin/generate-podspecs.sh

@@ -19,6 +19,7 @@ EXTERNAL_PODSPECS=$(find "node_modules/react-native/third-party-podspecs" \
                          "node_modules/react-native-svg" \
                          "node_modules/react-native-keyboard-aware-scroll-view" \
                          "node_modules/react-native-safe-area" \
+                         "node_modules/react-native-video" \
                          "node_modules/react-native-dark-mode" -type f -name "*.podspec" -print)
 
 for podspec in $EXTERNAL_PODSPECS

bundle/android/strings.xml

@@ -95,8 +95,6 @@ translators: sample content for "Services" page template -->
     <string name="gutenberg_native_j_k_rowling" tools:ignore="UnusedResources">J.K. Rowling</string>
     <!-- translators: sample content for "Team" page template -->
     <string name="gutenberg_native_juan_p_rez" tools:ignore="UnusedResources">Juan Pérez</string>
-    <!-- translators: sample content for "Blog" page template -->
-    <string name="gutenberg_native_latest_blog_posts" tools:ignore="UnusedResources">Latest Blog Posts</string>
     <!-- translators: sample content for "About" page template -->
     <string name="gutenberg_native_let_s_build_something_together" tools:ignore="UnusedResources">Let’s build something together</string>
     <!-- translators: sample content for "Services" page template -->
@@ -207,6 +205,8 @@ translators: sample content for "Services" page template -->
     <string name="gutenberg_native_we_are_working_hard_to_add_more_blocks_with_each_release_in_the_m" tools:ignore="UnusedResources">We are working hard to add more blocks with each release. In the meantime, you can also edit this post on the web.</string>
     <!-- translators: sample content for "Services" page template -->
     <string name="gutenberg_native_we_offer_a_range_of_services_to_help_you_achieve_the_results_you" tools:ignore="UnusedResources">We offer a range of services to help you achieve the results you\'re after. Not sure what you need, or what it costs? We can explain what services are right for you and tell you more about our fees. Get in touch below.</string>
+    <!-- translators: sample content for "Blog" page template -->
+    <string name="gutenberg_native_welcome_to_our_new_blog" tools:ignore="UnusedResources">Welcome to our new blog</string>
     <!-- translators: sample content for "About" page template -->
     <string name="gutenberg_native_what_people_say" tools:ignore="UnusedResources">What People Say</string>
     <string name="gutenberg_native_wordpress_media_library" tools:ignore="UnusedResources">WordPress Media Library</string>

bundle/ios/GutenbergNativeTranslations.swift

@@ -72,7 +72,6 @@ private func dummy() {
     _ = NSLocalizedString("It is our choices, Harry, that show what we truly are, far more than our abilities.", comment: "translators: sample content for \"About\" page template")
     _ = NSLocalizedString("J.K. Rowling", comment: "translators: sample content for \"About\" page template")
     _ = NSLocalizedString("Juan Pérez", comment: "translators: sample content for \"Team\" page template")
-    _ = NSLocalizedString("Latest Blog Posts", comment: "translators: sample content for \"Blog\" page template")
     _ = NSLocalizedString("Let's build something together.", comment: "translators: sample content for \"Portfolio\" page template")
     _ = NSLocalizedString("Let's talk 👋 Don't hesitate to reach out with the contact information below, or send a message using the form.", comment: "translators: sample content for \"Contact\" page template")
     _ = NSLocalizedString("Let’s build something together", comment: "translators: sample content for \"About\" page template")
@@ -145,5 +144,6 @@ private func dummy() {
     _ = NSLocalizedString("We are a small team of talented professionals with a wide range of skills and experience. We love what we do, and we do it with passion. We look forward to working with you.", comment: "translators: sample content for \"Team\" page template")
     _ = NSLocalizedString("We are working hard to add more blocks with each release. In the meantime, you can also edit this post on the web.", comment: "")
     _ = NSLocalizedString("We offer a range of services to help you achieve the results you're after. Not sure what you need, or what it costs? We can explain what services are right for you and tell you more about our fees. Get in touch below.", comment: "translators: sample content for \"Services\" page template")
+    _ = NSLocalizedString("Welcome to our new blog", comment: "translators: sample content for \"Blog\" page template")
     _ = NSLocalizedString("What People Say", comment: "translators: sample content for \"About\" page template")
     _ = NSLocalizedString("WordPress Media Library", comment: "")

ios/Podfile.lock

@@ -21,7 +21,7 @@ PODS:
     - DoubleConversion
     - glog
   - glog (0.3.5)
-  - Gutenberg (1.27.1):
+  - Gutenberg (1.28.0):
     - React (= 0.61.5)
     - React-CoreModules (= 0.61.5)
     - React-RCTImage (= 0.61.5)
@@ -239,7 +239,7 @@ PODS:
     - React
   - RNSVG (9.13.6-gb):
     - React
-  - RNTAztecView (1.27.1):
+  - RNTAztecView (1.28.0):
     - React-Core
     - WordPress-Aztec-iOS (~> 1.19.0)
   - WordPress-Aztec-iOS (1.19.0)
@@ -367,7 +367,7 @@ SPEC CHECKSUMS:
   FBReactNativeSpec: 118d0d177724c2d67f08a59136eb29ef5943ec75
   Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
   glog: 1f3da668190260b06b429bb211bfbee5cd790c28
-  Gutenberg: 13cbcc0422333b06532bbcbcbea95514fc5a05b5
+  Gutenberg: 0c90bd47ecf991fbe677172a3a2f8ab1ef715c07
   RCTRequired: b153add4da6e7dbc44aebf93f3cf4fcae392ddf1
   RCTTypeSafety: 9aa1b91d7f9310fc6eadc3cf95126ffe818af320
   React: b6a59ef847b2b40bb6e0180a97d0ca716969ac78
@@ -393,7 +393,7 @@ SPEC CHECKSUMS:
   ReactCommon: 198c7c8d3591f975e5431bec1b0b3b581aa1c5dd
   ReactNativeDarkMode: f61376360c5d983907e5c316e8e1c853a8c2f348
   RNSVG: 68a534a5db06dcbdaebfd5079349191598caef7b
-  RNTAztecView: dc2364760fad53f52defde7c01be765e77b9ba19
+  RNTAztecView: c8face301ee453aab24e9e10615353134cca505b
   WordPress-Aztec-iOS: fb6ea6409a5228292568f665eb22ea0a0aa7ad7e
   Yoga: f2a7cd4280bfe2cca5a7aed98ba0eb3d1310f18b
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gutenberg-mobile",
-  "version": "1.27.1",
+  "version": "1.28.0",
   "private": true,
   "config": {
     "jsfiles": "./*.js src/*.js src/**/*.js src/**/**/*.js",

react-native-gutenberg-bridge/android/build.gradle

@@ -20,7 +20,7 @@ buildscript {
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
 
         if (buildGutenbergMobileJSBundle) {
-            classpath "com.moowork.gradle:gradle-node-plugin:1.2.0"
+            classpath "com.moowork.gradle:gradle-node-plugin:1.3.1"
         }
     }
 }
@@ -40,13 +40,13 @@ if (buildGutenbergMobileJSBundle) {
 
     node {
         // Version of node to use.
-        version = '12.13.1'
+        version = '12.16.1'
 
         // Version of npm to use.
-        npmVersion = '6.3.0'
+        npmVersion = '6.14.2'
 
         // Version of Yarn to use.
-        yarnVersion = '1.10.1'
+        yarnVersion = '1.22.4'
 
         // Base URL for fetching node distributions (change if you have a mirror).
         distBaseUrl = 'https://nodejs.org/dist'
@@ -91,6 +91,7 @@ project.ext.buildGutenbergFromSource = false
 
 def hermesOriginalPath = "../../node_modules/hermes-engine/android/";
 def hermesPath = hermesOriginalPath;
+def buildAssetsFolder = 'build/assets'
 
 android {
     compileSdkVersion 28
@@ -109,6 +110,12 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
+    sourceSets {
+        main {
+            assets.srcDirs += buildAssetsFolder
+        }
+    }
 }
 
 repositories {
@@ -163,21 +170,89 @@ dependencies {
     releaseImplementation files(hermesPath + "hermes-release.aar")
 }
 
+boolean isBundleUpToDate() {
+    return project.hasProperty('isBundleUpToDate') && isBundleUpToDate
+}
+
 if (buildGutenbergMobileJSBundle) {
-    def assetsFolder = 'src/main/assets'
-    def aarFolder = 'src/main/assets'
+    def bundleName = 'index.android.bundle'
+    def jsRootDir = '../..'
+
+    task bundleUpToDateCheck {
+        description("Checks if the inputs to the javascript bundle and the bundle itself are unchanged. \
+Only if they are is the isBundleUpToDate flag set to true. That flag is used by other tasks.")
+
+        def isRelevantFile = { it.name.endsWithAny('.js', '.css') || it.name == 'package.json' }
+        def inputFiles = {
+            def jsFiles = []
+            def dirs = []
+            file(jsRootDir).eachDir { dir ->
+                if (dir.name != 'node_modules'
+                        && dir.name != 'bundle'
+                        && dir.name != 'gutenberg'
+                        && !dir.name.startsWith('symlinked')) {
+                    dirs << dir
+                }
+            }
+            file("$jsRootDir/gutenberg").eachDir { dir ->
+                if (dir.name != 'node_modules') {
+                    dirs << dir
+                }
+            }
 
-    task buildJSBundle(type: YarnTask) {
-        args = ['bundle:android']
-    }
+            dirs.forEach { dir ->
+                file(dir).eachFileRecurse {
+                    if (isRelevantFile(it)) {
+                        jsFiles << it
+                    }
+                }
+            }
 
-    task ensureAssetsDirectory { 
+            def jsRootDirFiles = file(jsRootDir).listFiles().findAll {
+                isRelevantFile(it)
+            }
+            def gutenbergRootDirFiles = file("$jsRootDir/gutenberg").listFiles().findAll {
+                isRelevantFile(it)
+            }
+            return jsFiles + jsRootDirFiles + gutenbergRootDirFiles
+        }
+        inputs.files(inputFiles())
+
+        outputs.file("$buildAssetsFolder/$bundleName")
+
+        // Having this task create this file as an output because changes to
+        // the actual bundle (or even deleting the bundle file) was not triggering
+        // this task to rerun (and flip the isBundleUpToDate flag to false). Now that
+        // this second indicator file is here, which gets deleted if the project is cleaned,
+        // this task knows that it is out of date. Note that if there are changes to the
+        // bundle file though, that alone will not trigger this task to run again, so you'll
+        // need to use --rerun-tasks in that case.
+        def upToDateIndicatorFile = "$buildAssetsFolder/up-to-date-bundle-indicator"
+        outputs.file(upToDateIndicatorFile)
+
+        // set flag to true before task tries to run
+        project.ext.isBundleUpToDate = true
         doLast {
-            mkdir assetsFolder
+            // If this task runs, either the inputs or outputs have changed, so the bundle is out of date.
+            project.ext.isBundleUpToDate = false
+            file(upToDateIndicatorFile).createNewFile()
         }
     }
 
+    yarn_install.dependsOn bundleUpToDateCheck
+    yarn_install.onlyIf { !isBundleUpToDate() }
+
+    task buildJSBundle(type: YarnTask) {
+        dependsOn bundleUpToDateCheck
+        onlyIf { !isBundleUpToDate() }
+
+        args = ['bundle:android']
+    }
+
     task backupHermesDebugAAR(type: Copy) {
+        dependsOn bundleUpToDateCheck
+        onlyIf { !isBundleUpToDate() }
+
         def origFileName = 'hermes-debug.aar'
         def origWithPath = hermesOriginalPath + origFileName
         from origWithPath
@@ -188,6 +263,9 @@ if (buildGutenbergMobileJSBundle) {
     }
 
     task backupHermesReleaseAAR(type: Copy) {
+        dependsOn bundleUpToDateCheck
+        onlyIf { !isBundleUpToDate() }
+
         def origFileName = 'hermes-release.aar'
         def origWithPath = hermesOriginalPath + origFileName
         from origWithPath
@@ -198,27 +276,30 @@ if (buildGutenbergMobileJSBundle) {
     }
 
     task copyJSBundle(type: Copy) {
+        dependsOn bundleUpToDateCheck
+        onlyIf { !isBundleUpToDate() }
+
         def origFileName = 'App.js'
         def origWithPath = "../../bundle/android/${origFileName}"
-        def target = 'index.android.bundle'
         from origWithPath
-        into assetsFolder
-        rename origFileName, target
+        into buildAssetsFolder
+        rename origFileName, bundleName
         doLast {
             println "Done copying the Android JS bundle to assets folder"
         }
     }
 
     task cleanupNodeModulesFolder(type: Delete) {
+        dependsOn bundleUpToDateCheck
+        onlyIf { !isBundleUpToDate() }
+
         delete '../../node_modules'
     }
 
-    if (buildGutenbergMobileJSBundle) {
-        preBuild.dependsOn(cleanupNodeModulesFolder)
-        cleanupNodeModulesFolder.dependsOn(backupHermesDebugAAR)
-        backupHermesDebugAAR.dependsOn(backupHermesReleaseAAR)
-        backupHermesReleaseAAR.dependsOn(copyJSBundle)
-        copyJSBundle.dependsOn(buildJSBundle)
-        buildJSBundle.dependsOn(yarn_install, ensureAssetsDirectory)
-    }
+    preBuild.dependsOn(cleanupNodeModulesFolder)
+    cleanupNodeModulesFolder.dependsOn(backupHermesDebugAAR)
+    backupHermesDebugAAR.dependsOn(backupHermesReleaseAAR)
+    backupHermesReleaseAAR.dependsOn(copyJSBundle)
+    copyJSBundle.dependsOn(buildJSBundle)
+    buildJSBundle.dependsOn(yarn_install)
 }

react-native-gutenberg-bridge/third-party-podspecs/react-native-keyboard-aware-scroll-view.podspec.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-keyboard-aware-scroll-view",
-  "version": "0.8.7",
+  "version": "0.8.8",
   "homepage": "https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view",
   "summary": "React Native module to arrange scroll poisition according to keyboard on input fields.",
   "license": "MIT",
@@ -10,7 +10,7 @@
   },
   "source": {
     "git": "https://github.com/wordpress-mobile/react-native-keyboard-aware-scroll-view.git",
-    "tag": "gb-v0.8.7"
+    "tag": "gb-v0.8.8"
   },
   "source_files": "ios/RNTKeyboardAwareScrollView/*.{h,m}",
   "preserve_paths": "**/*.js",

react-native-gutenberg-bridge/third-party-podspecs/react-native-video.podspec.json

@@ -1,22 +1,22 @@
 {
   "name": "react-native-video",
-  "version": "4.4.1",
+  "version": "5.0.2",
   "summary": "A <Video /> element for react-native",
   "description": "A <Video /> element for react-native",
   "license": "MIT",
   "authors": "Brent Vatne <brentvatne@gmail.com> (https://github.com/brentvatne)",
   "homepage": "https://github.com/brentvatne/react-native-video",
   "source": {
     "git": "https://github.com/brentvatne/react-native-video.git",
-    "tag": "4.4.1"
+    "tag": "5.0.2"
   },
   "platforms": {
     "ios": "8.0",
     "tvos": "9.0"
   },
   "static_framework": true,
   "dependencies": {
-    "React-Core": [
+    "React": [
 
     ]
   },