react-native 0.68.4 → 0.68.6

package/Libraries/Core/ReactNativeVersion.js

@@ -12,6 +12,6 @@
 exports.version = {
   major: 0,
   minor: 68,
-  patch: 4,
+  patch: 6,
   prerelease: null,
 };

package/React/Base/RCTVersion.m

@@ -23,7 +23,7 @@ NSDictionary* RCTGetReactNativeVersion(void)
     __rnVersion = @{
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(68),
-                  RCTVersionPatch: @(4),
+                  RCTVersionPatch: @(6),
                   RCTVersionPrerelease: [NSNull null],
                   };
   });

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.68.4
+VERSION_NAME=0.68.6
 GROUP=com.facebook.react
 
 POM_NAME=ReactNative

package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java

@@ -17,6 +17,6 @@ public class ReactNativeVersion {
   public static final Map<String, Object> VERSION = MapBuilder.<String, Object>of(
       "major", 0,
       "minor", 68,
-      "patch", 4,
+      "patch", 6,
       "prerelease", null);
 }

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java

@@ -549,6 +549,10 @@ public class ReactEditText extends AppCompatEditText
         new SpannableStringBuilder(reactTextUpdate.getText());
 
     manageSpans(spannableStringBuilder, reactTextUpdate.mContainsMultipleFragments);
+
+    // Mitigation for https://github.com/facebook/react-native/issues/35936 (S318090)
+    stripAbsoluteSizeSpans(spannableStringBuilder);
+
     mContainsImages = reactTextUpdate.containsImages();
 
     // When we update text, we trigger onChangeText code that will
@@ -622,6 +626,27 @@ public class ReactEditText extends AppCompatEditText
     }
   }
 
+  private void stripAbsoluteSizeSpans(SpannableStringBuilder sb) {
+    // We have already set a font size on the EditText itself. We can safely remove sizing spans
+    // which are the same as the set font size, and not otherwise overlapped.
+    final int effectiveFontSize = mTextAttributes.getEffectiveFontSize();
+    ReactAbsoluteSizeSpan[] spans = sb.getSpans(0, sb.length(), ReactAbsoluteSizeSpan.class);
+
+    outerLoop:
+    for (ReactAbsoluteSizeSpan span : spans) {
+      ReactAbsoluteSizeSpan[] overlappingSpans =
+          sb.getSpans(sb.getSpanStart(span), sb.getSpanEnd(span), ReactAbsoluteSizeSpan.class);
+
+      for (ReactAbsoluteSizeSpan overlappingSpan : overlappingSpans) {
+        if (span.getSize() != effectiveFontSize) {
+          continue outerLoop;
+        }
+      }
+
+      sb.removeSpan(span);
+    }
+  }
+
   private static boolean sameTextForSpan(
       final Editable oldText,
       final SpannableStringBuilder newText,

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -17,7 +17,7 @@ namespace facebook::react {
 constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 68;
-  int32_t Patch = 4;
+  int32_t Patch = 6;
   std::string_view Prerelease = "";
 } ReactNativeVersion;
 

package/android/com/facebook/react/react-native/0.68.6/react-native-0.68.6-sources.jar.md5

@@ -0,0 +1 @@
+46a571e4ba755771fe792729d22658d4

package/android/com/facebook/react/react-native/0.68.6/react-native-0.68.6-sources.jar.sha1

@@ -0,0 +1 @@
+63f7b3460e1ee648b7d6b4f747418ee6a0ceeeca

package/android/com/facebook/react/react-native/0.68.6/react-native-0.68.6-sources.jar.sha256

@@ -0,0 +1 @@
+edc0bef674b33007d13baf9bc1edc17868f5c231f4746ae29ba7cebd76586bc9

package/android/com/facebook/react/react-native/0.68.6/react-native-0.68.6-sources.jar.sha512

@@ -0,0 +1 @@
+effd92f00c6c0a0e7889a946aa40a8a5a9aa6f0ffd049c11958188d8d57a9e144ba5592e7e9745ab14cb111a7fc740ddddf17d31e94b200d17eef01acf19d609

package/android/com/facebook/react/react-native/0.68.6/react-native-0.68.6.aar.md5

@@ -0,0 +1 @@
+c1014c0af902fb23a5a0fa6b7caedfac

package/android/com/facebook/react/react-native/0.68.6/react-native-0.68.6.aar.sha1

@@ -0,0 +1 @@
+ff9d26e9c1fda23defa191df46335c769c9fd008

package/android/com/facebook/react/react-native/0.68.6/react-native-0.68.6.aar.sha256

@@ -0,0 +1 @@
+3a1d69237cec2a92b02881c7f76dc9eeb5fec697d5d35aa104ee21eba794fb76

package/android/com/facebook/react/react-native/0.68.6/react-native-0.68.6.aar.sha512

@@ -0,0 +1 @@
+19874019d99da2f197c79dc9dc4aee65eb1ae805132df5a153d6284feac2cf59373e22c9f9b827b8e93cf2a5d499c19ada2888f01aba4bbd6187e248ce92a8b3

package/android/com/facebook/react/react-native/{0.68.4/react-native-0.68.4.module → 0.68.6/react-native-0.68.6.module}

@@ -3,7 +3,7 @@
   "component": {
     "group": "com.facebook.react",
     "module": "react-native",
-    "version": "0.68.4",
+    "version": "0.68.6",
     "attributes": {
       "org.gradle.status": "release"
     }
@@ -131,13 +131,13 @@
       ],
       "files": [
         {
-          "name": "react-native-0.68.4.aar",
-          "url": "react-native-0.68.4.aar",
-          "size": 15448544,
-          "sha512": "1f60c5e4865c1b2abbd87cdfba101d196ed2e34a7bb079230d37d9960a4e12f7ea9666860491926d2b097f19e7549cd61fe4f6236293a71c18123a399bf6c2ab",
-          "sha256": "36f0b709b38c553125931555157c8e8429e45676c74f1c41c67cf7ab0f9523af",
-          "sha1": "99c1ca2d54896975e6415ec76302d1c90fd5060e",
-          "md5": "785d2e11f8d7730e07e68cd5fdf76bcf"
+          "name": "react-native-0.68.6.aar",
+          "url": "react-native-0.68.6.aar",
+          "size": 15448890,
+          "sha512": "19874019d99da2f197c79dc9dc4aee65eb1ae805132df5a153d6284feac2cf59373e22c9f9b827b8e93cf2a5d499c19ada2888f01aba4bbd6187e248ce92a8b3",
+          "sha256": "3a1d69237cec2a92b02881c7f76dc9eeb5fec697d5d35aa104ee21eba794fb76",
+          "sha1": "ff9d26e9c1fda23defa191df46335c769c9fd008",
+          "md5": "c1014c0af902fb23a5a0fa6b7caedfac"
         }
       ]
     },
@@ -258,13 +258,13 @@
       ],
       "files": [
         {
-          "name": "react-native-0.68.4.aar",
-          "url": "react-native-0.68.4.aar",
-          "size": 15448544,
-          "sha512": "1f60c5e4865c1b2abbd87cdfba101d196ed2e34a7bb079230d37d9960a4e12f7ea9666860491926d2b097f19e7549cd61fe4f6236293a71c18123a399bf6c2ab",
-          "sha256": "36f0b709b38c553125931555157c8e8429e45676c74f1c41c67cf7ab0f9523af",
-          "sha1": "99c1ca2d54896975e6415ec76302d1c90fd5060e",
-          "md5": "785d2e11f8d7730e07e68cd5fdf76bcf"
+          "name": "react-native-0.68.6.aar",
+          "url": "react-native-0.68.6.aar",
+          "size": 15448890,
+          "sha512": "19874019d99da2f197c79dc9dc4aee65eb1ae805132df5a153d6284feac2cf59373e22c9f9b827b8e93cf2a5d499c19ada2888f01aba4bbd6187e248ce92a8b3",
+          "sha256": "3a1d69237cec2a92b02881c7f76dc9eeb5fec697d5d35aa104ee21eba794fb76",
+          "sha1": "ff9d26e9c1fda23defa191df46335c769c9fd008",
+          "md5": "c1014c0af902fb23a5a0fa6b7caedfac"
         }
       ]
     }

package/android/com/facebook/react/react-native/0.68.6/react-native-0.68.6.module.md5

@@ -0,0 +1 @@
+f8ec6179bc7c24d77fb87fa181b4d7ab

package/android/com/facebook/react/react-native/0.68.6/react-native-0.68.6.module.sha1

@@ -0,0 +1 @@
+05fed929fbf591a005f3fce1b991fcc48baf8158

package/android/com/facebook/react/react-native/0.68.6/react-native-0.68.6.module.sha256

@@ -0,0 +1 @@
+3eb0e758425030abfcd446d07d1d31c5ebbc422d05eded253956205998dba3a2

package/android/com/facebook/react/react-native/0.68.6/react-native-0.68.6.module.sha512

@@ -0,0 +1 @@
+cabd6b9bb3a03733394e15d26b0908fc27d62767ee2002c8ba6a9c7f55968b0991191dc08c0392bf5bbb04defa783d3e5aaa148e8081bb97a6085a9decd897ed

package/android/com/facebook/react/react-native/{0.68.4/react-native-0.68.4.pom → 0.68.6/react-native-0.68.6.pom}

@@ -9,7 +9,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.facebook.react</groupId>
   <artifactId>react-native</artifactId>
-  <version>0.68.4</version>
+  <version>0.68.6</version>
   <packaging>aar</packaging>
   <name>ReactNative</name>
   <description>A framework for building native apps with React</description>

package/android/com/facebook/react/react-native/0.68.6/react-native-0.68.6.pom.md5

@@ -0,0 +1 @@
+99a638fa8d25b8a7d32cf94547a71e37

package/android/com/facebook/react/react-native/0.68.6/react-native-0.68.6.pom.sha1

@@ -0,0 +1 @@
+84f5b7a288d11945660b3df8906fd88f1149bc91

package/android/com/facebook/react/react-native/0.68.6/react-native-0.68.6.pom.sha256

@@ -0,0 +1 @@
+8320ef82fdcbe7ba3806a06837eda845034dd9eff8c83797b49a1058322f53e3

package/android/com/facebook/react/react-native/0.68.6/react-native-0.68.6.pom.sha512

@@ -0,0 +1 @@
+576971754e816f4755a0a9d88ba66c841fd5ff7335c3d87b7e9d0ea24a7748705c93bdb42a23752c73b79b1554564ad976988e645f30e2e906a3ff5dca1c2248

package/android/com/facebook/react/react-native/maven-metadata.xml

@@ -3,11 +3,11 @@
   <groupId>com.facebook.react</groupId>
   <artifactId>react-native</artifactId>
   <versioning>
-    <latest>0.68.4</latest>
-    <release>0.68.4</release>
+    <latest>0.68.6</latest>
+    <release>0.68.6</release>
     <versions>
-      <version>0.68.4</version>
+      <version>0.68.6</version>
     </versions>
-    <lastUpdated>20221010133451</lastUpdated>
+    <lastUpdated>20230130181532</lastUpdated>
   </versioning>
 </metadata>

package/android/com/facebook/react/react-native/maven-metadata.xml.md5

@@ -1 +1 @@
-ba7bb65ba87a6af060e01f17835adf72
+adf0ab20f00e9094ea1539043c03c329

package/android/com/facebook/react/react-native/maven-metadata.xml.sha1

@@ -1 +1 @@
-d80e3d201b5417e3f2b0cfe2821730d96fcaf6e4
+173815dbdab8129cdcd788a3d43a7021b3d116d9

package/android/com/facebook/react/react-native/maven-metadata.xml.sha256

@@ -1 +1 @@
-7d68cba6e4f6bbfa76b03a8ede875f77045fbba4281d46b1c96ff9c429939ce9
+ea9bfb262c533f784e282d1ce003d61061eab8bfe145d43c659c89d526c4f9fd

package/android/com/facebook/react/react-native/maven-metadata.xml.sha512

@@ -1 +1 @@
-4d13858b3f0f7b7a89a2dd7716d6dd615689942842adb89f0b5c2aed9dcb97abcb9d5682283eb8f8053a834ce1b06d20d3c13937a6cebf3c802dab25f9ea3b73
+aaefe16b5e55d948ad749394eb30fb936edb6d4d33ffd44aaec7c2a37144eedcf34432d0bc975e414b9c42ea61864e1029fe7a5c87f2470cdaed2ded2be6b2ed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.68.4",
+  "version": "0.68.6",
   "bin": "./cli.js",
   "description": "A framework for building native apps using React",
   "license": "MIT",

package/react.gradle

@@ -440,3 +440,17 @@ afterEvaluate {
         }
     }
 }
+
+// Patch needed for https://github.com/facebook/react-native/issues/35210
+// This is a patch to short-circuit the "+" dependencies inside the
+// users' app/build.gradle file and the various .gradle files of libraries.
+// As using plain "+" dependencies causes Gradle to always download the latest,
+// this logic forces Gradle to use latest release in the minor series.
+project.rootProject.allprojects {
+    configurations.all {
+        resolutionStrategy {
+            force "com.facebook.react:react-native:0.68.+"
+            force "com.facebook.react:hermes-engine:0.68.+"
+        }
+    }
+}

package/template/Gemfile.lock

@@ -1,9 +1,9 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.5)
+    CFPropertyList (3.0.6)
       rexml
-    activesupport (6.1.7)
+    activesupport (6.1.7.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -54,9 +54,9 @@ GEM
       netrc (~> 0.11)
     cocoapods-try (1.2.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.0)
     escape (0.0.4)
-    ethon (0.15.0)
+    ethon (0.16.0)
       ffi (>= 1.15.0)
     ffi (1.15.5)
     fourflusher (2.3.1)
@@ -65,8 +65,8 @@ GEM
     httpclient (2.8.3)
     i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    json (2.6.2)
-    minitest (5.16.3)
+    json (2.6.3)
+    minitest (5.17.0)
     molinillo (0.8.0)
     nanaimo (0.3.0)
     nap (1.1.0)
@@ -76,7 +76,7 @@ GEM
     ruby-macho (2.5.1)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     xcodeproj (1.22.0)
       CFPropertyList (>= 2.3.3, < 4.0)
@@ -85,7 +85,7 @@ GEM
       colored2 (~> 3.1)
       nanaimo (~> 0.3.0)
       rexml (~> 3.2.4)
-    zeitwerk (2.6.1)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   ruby

package/template/package.json

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "react": "17.0.2",
-    "react-native": "0.68.4"
+    "react-native": "0.68.6"
   },
   "devDependencies": {
     "@babel/core": "^7.12.9",

package/android/com/facebook/react/react-native/0.68.4/react-native-0.68.4-sources.jar.md5

@@ -1 +0,0 @@
-3a54a7151da62c2a7e177f5837e8d6b4

package/android/com/facebook/react/react-native/0.68.4/react-native-0.68.4-sources.jar.sha1

@@ -1 +0,0 @@
-15dc280696c55d5ebecee6e6ec59d5d51014dfdc

package/android/com/facebook/react/react-native/0.68.4/react-native-0.68.4-sources.jar.sha256

@@ -1 +0,0 @@
-68222e23dc12acbe658d4d642689c95362b5de5f9eb16e6951e7f9921ec9eac0

package/android/com/facebook/react/react-native/0.68.4/react-native-0.68.4-sources.jar.sha512

@@ -1 +0,0 @@
-c72afd11233f3353ba5d5844773599a11229e5f875a80fb870b45a877537c2856c2e15d0ef3b7e91e5837108ab4d08a808b2595070ff0ef0b32358905d8d489c

package/android/com/facebook/react/react-native/0.68.4/react-native-0.68.4.aar.md5

@@ -1 +0,0 @@
-785d2e11f8d7730e07e68cd5fdf76bcf

package/android/com/facebook/react/react-native/0.68.4/react-native-0.68.4.aar.sha1

@@ -1 +0,0 @@
-99c1ca2d54896975e6415ec76302d1c90fd5060e

package/android/com/facebook/react/react-native/0.68.4/react-native-0.68.4.aar.sha256

@@ -1 +0,0 @@
-36f0b709b38c553125931555157c8e8429e45676c74f1c41c67cf7ab0f9523af

package/android/com/facebook/react/react-native/0.68.4/react-native-0.68.4.aar.sha512

@@ -1 +0,0 @@
-1f60c5e4865c1b2abbd87cdfba101d196ed2e34a7bb079230d37d9960a4e12f7ea9666860491926d2b097f19e7549cd61fe4f6236293a71c18123a399bf6c2ab

package/android/com/facebook/react/react-native/0.68.4/react-native-0.68.4.module.md5

@@ -1 +0,0 @@
-3714874059b37046dbc52345a297e587

package/android/com/facebook/react/react-native/0.68.4/react-native-0.68.4.module.sha1

@@ -1 +0,0 @@
-32b2a152fb29e7d9bd441a74ba39e464da0492db

package/android/com/facebook/react/react-native/0.68.4/react-native-0.68.4.module.sha256

@@ -1 +0,0 @@
-9279e8fec8e8f6d8be440526a8f3f1696697a197d7bf7d4ef632a26b41f2f739

package/android/com/facebook/react/react-native/0.68.4/react-native-0.68.4.module.sha512

@@ -1 +0,0 @@
-86179473480cdec2fa1128447e667c3da89dc45734922b35d6c49b3417ee616a5adc8bac91fc2d6d8e8c6301f6ceb92f3693351835debc7b6bb76ee5b41edbb5

package/android/com/facebook/react/react-native/0.68.4/react-native-0.68.4.pom.md5

@@ -1 +0,0 @@
-51ec2257a317c46dfa10223728c05623

package/android/com/facebook/react/react-native/0.68.4/react-native-0.68.4.pom.sha1

@@ -1 +0,0 @@
-5c53de4d27c661d0a979af3286f4c20ef6032993

package/android/com/facebook/react/react-native/0.68.4/react-native-0.68.4.pom.sha256

@@ -1 +0,0 @@
-df544faeb08ae6c239c8d50dbb4bb008f1b49983769aee5f020060693a0b928a

package/android/com/facebook/react/react-native/0.68.4/react-native-0.68.4.pom.sha512

@@ -1 +0,0 @@
-f911b52e0aa445dd22ffd4dd83b91fada4ec792f3aaa1adefcde288bbf61b71225319043a850e055a2bf99a7728e266bfb557031d33328d6c8b78d45e821138c