[RNMobile] Upgrade compile and target sdk version to Android API 31 (#…

…44610)

* Upgrade compile and target sdk version to API 31

* Enable component exporting for demo activity

* [TEST] Point Android dependencies to snapshot version

* [TEST] Point react-native-aztec Android dependencies to SHA commits

* Bump Android build tools version to 31

* Fix extra space on Aztec views

* Update react-native-editor changelog

* Update Aztec version to 1.6.2

* Revert: Point Android dependencies to snapshot version

* Bump react-native-editor dependencies from forked repos

* Revert updating wordpressUtilsVersion

packages/react-native-aztec/android/build.gradle

@@ -9,7 +9,7 @@ buildscript {
         jSoupVersion = '1.10.3'
         wordpressUtilsVersion = '2.3.0'
         espressoVersion = '3.0.1'
-        aztecVersion = 'v1.6.0'
+        aztecVersion = 'v1.6.2'
     }
 }
 
@@ -34,11 +34,11 @@ List<String> dirs = [
         'template'] // boilerplate code that is generated by the sample template process
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 31
     }
 
     compileOptions {

packages/react-native-aztec/android/src/main/res/values/template-dimens.xml

@@ -23,4 +23,5 @@
     <dimen name="margin_large">32dp</dimen>
 
     <dimen name="heading_vertical_padding">0dp</dimen>
+    <dimen name="block_vertical_margin">0dp</dimen>
 </resources>

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

@@ -14,11 +14,11 @@ group='org.wordpress-mobile.gutenberg-mobile'
 def buildAssetsFolder = 'build/assets'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 31
         buildConfigField "boolean", "SHOULD_ATTACH_JS_BUNDLE", willPublishReactNativeBridgeBinary.toString()
     }
 

packages/react-native-editor/CHANGELOG.md

@@ -10,6 +10,7 @@ For each user feature we should also add a importance categorization label  to i
 -->
 
 ## Unreleased
+-   [*] Upgrade compile and target sdk version to Android API 31 [#44610]
 
 ## 1.83.0
 * No User facing changes *

packages/react-native-editor/android/app/src/main/AndroidManifest.xml

@@ -17,7 +17,8 @@
         android:label="@string/app_name"
         android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
         android:launchMode="singleTask"
-        android:windowSoftInputMode="adjustResize">
+        android:windowSoftInputMode="adjustResize"
+        android:exported="true">
         <intent-filter>
             <action android:name="android.intent.action.MAIN" />
             <category android:name="android.intent.category.LAUNCHER" />

packages/react-native-editor/android/build.gradle

@@ -2,10 +2,10 @@ buildscript {
     ext {
         gradlePluginVersion = '7.2.1'
         kotlinVersion = '1.5.32'
-        buildToolsVersion = "30.0.2"
+        buildToolsVersion = "31.0.0"
         minSdkVersion = 21
-        compileSdkVersion = 30
-        targetSdkVersion = 30
+        compileSdkVersion = 31
+        targetSdkVersion = 31
         supportLibVersion = '28.0.0'
         ndkVersion = "21.4.7075529"
     }

packages/react-native-editor/ios/Podfile.lock

@@ -1,6 +1,6 @@
 PODS:
   - boost (1.76.0)
-  - BVLinearGradient (2.5.6-wp-2):
+  - BVLinearGradient (2.5.6-wp-3):
     - React-Core
   - DoubleConversion (1.1.6)
   - FBLazyVector (0.66.2)
@@ -235,12 +235,12 @@ PODS:
     - React-Core
   - react-native-safe-area-context (3.2.0):
     - React-Core
-  - react-native-slider (3.0.2-wp-2):
+  - react-native-slider (3.0.2-wp-3):
     - React-Core
-  - react-native-video (5.2.0-wp-2):
+  - react-native-video (5.2.0-wp-4):
     - React-Core
-    - react-native-video/Video (= 5.2.0-wp-2)
-  - react-native-video/Video (5.2.0-wp-2):
+    - react-native-video/Video (= 5.2.0-wp-4)
+  - react-native-video/Video (5.2.0-wp-4):
     - React-Core
   - react-native-webview (11.6.2):
     - React-Core
@@ -317,9 +317,9 @@ PODS:
     - React-Core
     - SDWebImage (~> 5.11.1)
     - SDWebImageWebPCoder (~> 0.8.4)
-  - RNGestureHandler (2.3.2-wp-1):
+  - RNGestureHandler (2.3.2-wp-2):
     - React-Core
-  - RNReanimated (2.4.1-wp-3):
+  - RNReanimated (2.4.1-wp-4):
     - DoubleConversion
     - FBLazyVector
     - FBReactNativeSpec
@@ -522,7 +522,7 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   boost: a7c83b31436843459a1961bfd74b96033dc77234
-  BVLinearGradient: f6eff3552b842aac99ff6f21197e57f87cfd956d
+  BVLinearGradient: ace34fab72158c068ae989a0ebdbf86cb4ef0e49
   DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
   FBLazyVector: 57a8b34460679fb69e1ce7d625b04dbd1596b1f1
   FBReactNativeSpec: 18438b1c04ce502ed681cd19db3f4508964c082a
@@ -547,8 +547,8 @@ SPEC CHECKSUMS:
   react-native-keyboard-aware-scroll-view: 0bc6c2dfe9056935a40dc1a70e764b7a1bbf6568
   react-native-safe-area: c9cf765aa2dd96159476a99633e7d462ce5bb94f
   react-native-safe-area-context: f0906bf8bc9835ac9a9d3f97e8bde2a997d8da79
-  react-native-slider: d4c3367c5db5d2bec3ac0ab9d15ebb73d896034c
-  react-native-video: 0b09cc469df0249509def5dc1484e0419342de9b
+  react-native-slider: a433f1c13c5da3c17a587351bff7371f65cc9a07
+  react-native-video: 628148a219f300d4d9f8127563aea2fe0120b718
   react-native-webview: 193d233c29eacce1f42ca2637dab7ba79c25a6de
   React-perflogger: 5ab487cacfe6ec19bfe3d3f8072bf71eb07d63da
   React-RCTActionSheet: 03f25695e095fb5aa003828620943c74cc281fec
@@ -565,8 +565,8 @@ SPEC CHECKSUMS:
   RNCClipboard: 99fc8ad669a376b756fbc8098ae2fd05c0ed0668
   RNCMaskedView: c298b644a10c0c142055b3ae24d83879ecb13ccd
   RNFastImage: 1f2cab428712a4baaf78d6169eaec7f622556dd7
-  RNGestureHandler: 3b13cc25407d1cdbee33b6ae65790a55c032d2a9
-  RNReanimated: b413cc7aa3e2a740d9804cda3a9396a68f9eea7f
+  RNGestureHandler: 3e0ea0c115175e66680032904339696bab928ca3
+  RNReanimated: 2366094144f5bfc2179b401237ef49034ecbee3e
   RNScreens: 953633729a42e23ad0c93574d676b361e3335e8b
   RNSVG: 36a7359c428dcb7c6bce1cc546fbfebe069809b0
   RNTAztecView: cd8b382fee06712786e5a80a85f7069f0bd42045

packages/react-native-editor/package.json

@@ -32,7 +32,7 @@
 		"@babel/runtime": "^7.16.0",
 		"@react-native-clipboard/clipboard": "1.9.0",
 		"@react-native-community/blur": "3.6.0",
-		"@react-native-community/slider": "https://raw.githubusercontent.com/wordpress-mobile/react-native-slider/v3.0.2-wp-2/react-native-community-slider-3.0.2-wp-2.tgz",
+		"@react-native-community/slider": "https://raw.githubusercontent.com/wordpress-mobile/react-native-slider/v3.0.2-wp-3/react-native-community-slider-3.0.2-wp-3.tgz",
 		"@react-native-masked-view/masked-view": "0.2.6",
 		"@react-navigation/core": "5.12.0",
 		"@react-navigation/native": "5.7.0",
@@ -58,22 +58,22 @@
 		"node-fetch": "^2.6.0",
 		"react-native": "0.66.2",
 		"react-native-fast-image": "8.5.11",
-		"react-native-gesture-handler": "https://raw.githubusercontent.com/wordpress-mobile/react-native-gesture-handler/2.3.2-wp-1/react-native-gesture-handler-2.3.2-wp-1.tgz",
+		"react-native-gesture-handler": "https://raw.githubusercontent.com/wordpress-mobile/react-native-gesture-handler/2.3.2-wp-2/react-native-gesture-handler-2.3.2-wp-2.tgz",
 		"react-native-get-random-values": "1.4.0",
 		"react-native-hr": "git+https://github.com/Riglerr/react-native-hr.git#2d01a5cf77212d100e8b99e0310cce5234f977b3",
-		"react-native-hsv-color-picker": "https://raw.githubusercontent.com/wordpress-mobile/react-native-hsv-color-picker/v1.0.1-wp-2/react-native-hsv-color-picker-1.0.1-wp-2.tgz",
+		"react-native-hsv-color-picker": "https://raw.githubusercontent.com/wordpress-mobile/react-native-hsv-color-picker/v1.0.1-wp-3/react-native-hsv-color-picker-1.0.1-wp-3.tgz",
 		"react-native-keyboard-aware-scroll-view": "https://raw.githubusercontent.com/wordpress-mobile/react-native-keyboard-aware-scroll-view/v0.8.8-wp-1/react-native-keyboard-aware-scroll-view-0.8.8-wp-1.tgz",
-		"react-native-linear-gradient": "https://raw.githubusercontent.com/wordpress-mobile/react-native-linear-gradient/v2.5.6-wp-2/react-native-linear-gradient-2.5.6-wp-2.tgz",
+		"react-native-linear-gradient": "https://raw.githubusercontent.com/wordpress-mobile/react-native-linear-gradient/v2.5.6-wp-3/react-native-linear-gradient-2.5.6-wp-3.tgz",
 		"react-native-modal": "^11.10.0",
-		"react-native-prompt-android": "https://raw.githubusercontent.com/wordpress-mobile/react-native-prompt-android/v1.0.0-wp-2/react-native-prompt-android-1.0.0-wp-2.tgz",
-		"react-native-reanimated": "https://raw.githubusercontent.com/wordpress-mobile/react-native-reanimated/2.4.1-wp-3/react-native-reanimated-2.4.1-wp-3.tgz",
+		"react-native-prompt-android": "https://raw.githubusercontent.com/wordpress-mobile/react-native-prompt-android/v1.0.0-wp-3/react-native-prompt-android-1.0.0-wp-3.tgz",
+		"react-native-reanimated": "https://raw.githubusercontent.com/wordpress-mobile/react-native-reanimated/2.4.1-wp-4/react-native-reanimated-2.4.1-wp-4.tgz",
 		"react-native-safe-area": "^0.5.0",
 		"react-native-safe-area-context": "3.2.0",
 		"react-native-sass-transformer": "^1.1.1",
 		"react-native-screens": "2.9.0",
 		"react-native-svg": "9.13.6",
 		"react-native-url-polyfill": "^1.1.2",
-		"react-native-video": "https://raw.githubusercontent.com/wordpress-mobile/react-native-video/5.2.0-wp-2/react-native-video-5.2.0-wp-2.tgz",
+		"react-native-video": "https://raw.githubusercontent.com/wordpress-mobile/react-native-video/5.2.0-wp-4/react-native-video-5.2.0-wp-4.tgz",
 		"react-native-webview": "11.6.2"
 	},
 	"publishConfig": {