[TEST] Release 1.27.1 (Without Jitpack)

RELEASE-NOTES.txt

@@ -1,3 +1,7 @@
+1.27.1
+------
+* Remove Subscription Button from the Blog template since it didn't have an initial functionality and it is hard to configure for users.
+
 1.27.0
 ------
 * Prefill caption for image blocks when available on the Media library

bundle/android/strings.xml

@@ -76,8 +76,6 @@
     <string name="gutenberg_native_email_me_a_href_mailto_mail_example_com_mail_example_com_a" tools:ignore="UnusedResources">Email me: &lt;a href=\"mailto:mail@example.com\"&gt;mail@example.com&lt;/a&gt;</string>
     <string name="gutenberg_native_excerpt_length_words" tools:ignore="UnusedResources">Excerpt length (words)</string>
     <string name="gutenberg_native_failed_to_insert_media_please_tap_for_options" tools:ignore="UnusedResources">Failed to insert media.\nPlease tap for options.</string>
-    <!-- translators: sample content for "Blog" page template -->
-    <string name="gutenberg_native_follow_our_blog" tools:ignore="UnusedResources">Follow our Blog</string>
     <!-- translators: accessibility text. %s: gallery caption. -->
     <string name="gutenberg_native_gallery_caption_s" tools:ignore="UnusedResources">Gallery caption. %s</string>
     <!-- translators: sample content for "About" page template
@@ -183,8 +181,6 @@ translators: sample content for "Services" page template -->
     <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>
-    <!-- translators: sample content for "Blog" page template -->
-    <string name="gutenberg_native_subscribe" tools:ignore="UnusedResources">Subscribe</string>
     <string name="gutenberg_native_success_message" tools:ignore="UnusedResources">Success Message</string>
     <string name="gutenberg_native_take_a_photo" tools:ignore="UnusedResources">Take a Photo</string>
     <string name="gutenberg_native_take_a_photo_or_video" tools:ignore="UnusedResources">Take a Photo or Video</string>

bundle/ios/GutenbergNativeTranslations.swift

@@ -65,7 +65,6 @@ private func dummy() {
     _ = NSLocalizedString("Email me: <a href=\"mailto:mail@example.com\">mail@example.com</a>", comment: "translators: sample content for \"Team\" page template")
     _ = NSLocalizedString("Excerpt length (words)", comment: "")
     _ = NSLocalizedString("Failed to insert media.\nPlease tap for options.", comment: "")
-    _ = NSLocalizedString("Follow our Blog", comment: "translators: sample content for \"Blog\" page template")
     _ = NSLocalizedString("Gallery caption. %s", comment: "translators: accessibility text. %s: gallery caption.")
     _ = NSLocalizedString("Get in Touch", comment: "translators: sample content for \"About\" page template\ntranslators: sample content for \"Contact\" page template\ntranslators: sample content for \"Services\" page template")
     _ = NSLocalizedString("Get in touch!", comment: "translators: sample content for \"Portfolio\" page template")
@@ -130,7 +129,6 @@ private func dummy() {
     _ = NSLocalizedString("Size", comment: "")
     _ = NSLocalizedString("Start writing…", comment: "")
     _ = NSLocalizedString("Strategy", comment: "translators: sample content for \"Services\" page template")
-    _ = NSLocalizedString("Subscribe", comment: "translators: sample content for \"Blog\" page template")
     _ = NSLocalizedString("Success Message", comment: "")
     _ = NSLocalizedString("Take a Photo", comment: "")
     _ = NSLocalizedString("Take a Photo or Video", comment: "")

ios/Podfile.lock

@@ -21,7 +21,7 @@ PODS:
     - DoubleConversion
     - glog
   - glog (0.3.5)
-  - Gutenberg (1.27.0):
+  - Gutenberg (1.27.1):
     - 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.0):
+  - RNTAztecView (1.27.1):
     - React-Core
     - WordPress-Aztec-iOS (~> 1.18.0)
   - WordPress-Aztec-iOS (1.18.0)
@@ -367,7 +367,7 @@ SPEC CHECKSUMS:
   FBReactNativeSpec: 118d0d177724c2d67f08a59136eb29ef5943ec75
   Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
   glog: 1f3da668190260b06b429bb211bfbee5cd790c28
-  Gutenberg: aa041019bf81d30c7b9c7de0f313a2d55561cc4a
+  Gutenberg: 13cbcc0422333b06532bbcbcbea95514fc5a05b5
   RCTRequired: b153add4da6e7dbc44aebf93f3cf4fcae392ddf1
   RCTTypeSafety: 9aa1b91d7f9310fc6eadc3cf95126ffe818af320
   React: b6a59ef847b2b40bb6e0180a97d0ca716969ac78
@@ -393,7 +393,7 @@ SPEC CHECKSUMS:
   ReactCommon: 198c7c8d3591f975e5431bec1b0b3b581aa1c5dd
   ReactNativeDarkMode: f61376360c5d983907e5c316e8e1c853a8c2f348
   RNSVG: 68a534a5db06dcbdaebfd5079349191598caef7b
-  RNTAztecView: 58f944218c32079d76f2542e5b762b8a4dff263b
+  RNTAztecView: 4b7dc7d72fad7778f03c70441450dc311eea7d2b
   WordPress-Aztec-iOS: fae5d158879dfd6f36c8d0ff0cc111a0b8e36790
   Yoga: f2a7cd4280bfe2cca5a7aed98ba0eb3d1310f18b
 

jitpack.yml

@@ -1,5 +1,6 @@
 install:
    - export TMPDIR=`dirname $(mktemp)`
+   - export BUILD_GUTENBERG_JS_BUNDLE=1
    - echo "Removing react-native-aztec-old-submodule folder"
    - rm -rf react-native-aztec-old-submodule
    - echo "Changing into the android folder of the Bridge module"

package.json

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

react-native-aztec/android/build.gradle

@@ -75,6 +75,7 @@ android {
 
     lintOptions {
         disable 'GradleCompatible'
+        abortOnError false
     }
 }
 

react-native-aztec/android/src/main/kotlin/org/wordpress/mobile/ReactNativeAztec/EnterPressedWatcher.kt

@@ -18,7 +18,7 @@ interface EnterDeleter {
 class EnterPressedWatcher(aztecText: AztecText, var enterDeleter: EnterDeleter) : TextWatcher {
 
     private val aztecTextRef: WeakReference<AztecText?> = WeakReference(aztecText)
-    private lateinit var textBefore : SpannableStringBuilder
+    private lateinit var textBefore: SpannableStringBuilder
     private var start: Int = -1
     private var selStart: Int = 0
     private var selEnd: Int = 0
@@ -46,7 +46,12 @@ class EnterPressedWatcher(aztecText: AztecText, var enterDeleter: EnterDeleter)
                 if (newTextCopy[this.start] == Constants.NEWLINE) {
                     done = false
                     aztecText.editableText.setSpan(EnterPressedUnderway(), 0, 0, Spanned.SPAN_USER)
-                    aztecKeyListener.onEnterKey(newTextCopy.replace(this.start, this.start+1, ""), true, selStart, selEnd)
+                    aztecKeyListener.onEnterKey(
+                            newTextCopy.replace(this.start, this.start + 1, ""),
+                            true,
+                            selStart,
+                            selEnd
+                    )
                 }
             }
         }

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

@@ -1,11 +1,13 @@
 buildscript {
-    def isJitPack = System.getenv('JITPACK').asBoolean()
+    def buildGutenbergMobileJSBundle = rootProject.ext.has("buildGutenbergMobileJSBundle")
+            ? rootProject.ext.has("buildGutenbergMobileJSBundle")
+            : System.getenv('BUILD_GUTENBERG_JS_BUNDLE').asBoolean()
 
     repositories {
         jcenter()
         google()
 
-        if (isJitPack) {
+        if (buildGutenbergMobileJSBundle) {
             maven {
                 url "https://plugins.gradle.org/m2/"
             }
@@ -16,7 +18,7 @@ buildscript {
         classpath 'com.android.tools.build:gradle:3.4.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
 
-        if (isJitPack) {
+        if (buildGutenbergMobileJSBundle) {
             classpath "com.moowork.gradle:gradle-node-plugin:1.2.0"
         }
     }
@@ -25,10 +27,12 @@ buildscript {
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 
-def isJitPack = System.getenv('JITPACK').asBoolean()
+def buildGutenbergMobileJSBundle = rootProject.ext.has("buildGutenbergMobileJSBundle")
+        ? rootProject.ext.has("buildGutenbergMobileJSBundle")
+        : System.getenv('BUILD_GUTENBERG_JS_BUNDLE').asBoolean()
 
-if (isJitPack) {
-    println 'Building in JitPack'
+if (buildGutenbergMobileJSBundle) {
+    println 'Building the Gutenberg Mobile JS bundle'
 
     apply plugin: 'com.moowork.node'
 
@@ -63,6 +67,10 @@ if (isJitPack) {
         // Set the work directory where node_modules should be located
         nodeModulesDir = file("${project.projectDir}/../../")
     }
+
+    yarn_install {
+        args = ['--frozen-lockfile', '--prefer-offline', '--network-concurrency 1']
+    }
 }
 
 // import the `readReactNativeVersion()` function
@@ -136,7 +144,7 @@ dependencies {
 
         implementation 'com.facebook.react:react-native:+'
     } else {
-        hermesPath = "../../bundle/";
+        hermesPath = "${projectDir}/../../bundle/android/";
 
         implementation (waitJitpack('com.github.wordpress-mobile', 'react-native-svg', readHashedVersion('../../package.json', 'react-native-svg', 'dependencies')))
         implementation (waitJitpack('com.github.wordpress-mobile', 'react-native-video', readHashedVersion('../../package.json', 'react-native-video', 'dependencies')))
@@ -153,7 +161,7 @@ dependencies {
     releaseImplementation files(hermesPath + "hermes-release.aar")
 }
 
-if (isJitPack) {
+if (buildGutenbergMobileJSBundle) {
     def assetsFolder = 'src/main/assets'
     def aarFolder = 'src/main/assets'
 
@@ -203,7 +211,7 @@ if (isJitPack) {
         delete '../../node_modules'
     }
 
-    if (isJitPack) {
+    if (buildGutenbergMobileJSBundle) {
         preBuild.dependsOn(cleanupNodeModulesFolder)
         cleanupNodeModulesFolder.dependsOn(backupHermesDebugAAR)
         backupHermesDebugAAR.dependsOn(backupHermesReleaseAAR)