From f4920ca916c2e2993175713fb27dae427b98b05d Mon Sep 17 00:00:00 2001
From: Tommy Nguyen <4123478+tido64@users.noreply.github.com>
Date: Wed, 30 Mar 2022 19:09:11 +0200
Subject: [PATCH] fix: add support for react-native 0.68 (#739)

---
 android/gradle.properties | 28 +++++++++++++++++++---------
 example/package.json      |  8 ++++----
 package.json              |  4 ++--
 yarn.lock                 | 12 ++++++------
 4 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/android/gradle.properties b/android/gradle.properties
index 37853754e..c40976145 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,25 +1,35 @@
 # Project-wide Gradle settings.
+
 # IDE (e.g. Android Studio) users:
 # Gradle settings configured through the IDE *will override*
 # any settings specified in this file.
+
 # For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+
+# Specifies the JVM arguments used for the Gradle Daemon. The setting is
+# particularly useful for configuring JVM memory settings for build performance.
+# This does not affect the JVM settings for the Gradle client VM.
+# The default is `-Xmx512m -XX:MaxMetaspaceSize=256m`.
+org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+# When configured, Gradle will fork up to org.gradle.workers.max JVMs to execute
+# projects in parallel. To learn more about parallel task execution, see the
+# section on Gradle build performance:
+# https://docs.gradle.org/current/userguide/performance.html#parallel_execution.
+# Default is `false`.
+#org.gradle.parallel=true
+
 # AndroidX package structure to make it clearer which packages are bundled with the
 # Android operating system, and which are packaged with your app's APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
-# Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
 
 # Failed to transform '/~/bcprov-jdk15on-1.68.jar' using Jetifier.
 # Reason: IllegalArgumentException, message: Unsupported class file major version 59.
 android.jetifier.ignorelist=bcprov-jdk15on
+
+# Kotlin code style for this project: "official" or "obsolete":
+kotlin.code.style=official
diff --git a/example/package.json b/example/package.json
index d3b2e3bb3..87bdf19ff 100644
--- a/example/package.json
+++ b/example/package.json
@@ -17,10 +17,10 @@
     "windows": "react-native run-windows --no-packager"
   },
   "peerDependencies": {
-    "react": "~16.8.6 || ~16.9.0 || ~16.11.0 || ~16.13.1 || ~17.0.1 || ~17.0.2",
-    "react-native": "^0.0.0-0 || 0.60 - 0.67 || 1000.0.0",
-    "react-native-macos": "^0.0.0-0 || 0.60 - 0.66",
-    "react-native-windows": "^0.0.0-0 || 0.62 - 0.67"
+    "react": "~16.11.0 || ~16.13.1 || ~17.0.1 || ~17.0.2",
+    "react-native": "^0.0.0-0 || 0.62 - 0.68 || 1000.0.0",
+    "react-native-macos": "^0.0.0-0 || 0.62 - 0.66",
+    "react-native-windows": "^0.0.0-0 || 0.62 - 0.68"
   },
   "devDependencies": {
     "@babel/core": "^7.0.0",
diff --git a/package.json b/package.json
index 4ff45b47c..9c886cad5 100644
--- a/package.json
+++ b/package.json
@@ -80,9 +80,9 @@
     "@react-native-community/cli-platform-ios": ">=4.10.0",
     "mustache": "^4.0.0",
     "react": "~16.11.0 || ~16.13.1 || ~17.0.1 || ~17.0.2",
-    "react-native": "^0.0.0-0 || 0.62 - 0.67 || 1000.0.0",
+    "react-native": "^0.0.0-0 || 0.62 - 0.68 || 1000.0.0",
     "react-native-macos": "^0.0.0-0 || 0.62 - 0.66",
-    "react-native-windows": "^0.0.0-0 || 0.62 - 0.67"
+    "react-native-windows": "^0.0.0-0 || 0.62 - 0.68"
   },
   "peerDependenciesMeta": {
     "@react-native-community/cli": {
diff --git a/yarn.lock b/yarn.lock
index 133f41b09..d585fb9cf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5414,10 +5414,10 @@ __metadata:
     react-native-test-app: "workspace:."
     react-native-windows: ^0.66.11
   peerDependencies:
-    react: ~16.8.6 || ~16.9.0 || ~16.11.0 || ~16.13.1 || ~17.0.1 || ~17.0.2
-    react-native: ^0.0.0-0 || 0.60 - 0.67 || 1000.0.0
-    react-native-macos: ^0.0.0-0 || 0.60 - 0.66
-    react-native-windows: ^0.0.0-0 || 0.62 - 0.67
+    react: ~16.11.0 || ~16.13.1 || ~17.0.1 || ~17.0.2
+    react-native: ^0.0.0-0 || 0.62 - 0.68 || 1000.0.0
+    react-native-macos: ^0.0.0-0 || 0.62 - 0.66
+    react-native-windows: ^0.0.0-0 || 0.62 - 0.68
   languageName: unknown
   linkType: soft
 
@@ -10634,9 +10634,9 @@ __metadata:
     "@react-native-community/cli-platform-ios": ">=4.10.0"
     mustache: ^4.0.0
     react: ~16.11.0 || ~16.13.1 || ~17.0.1 || ~17.0.2
-    react-native: ^0.0.0-0 || 0.62 - 0.67 || 1000.0.0
+    react-native: ^0.0.0-0 || 0.62 - 0.68 || 1000.0.0
     react-native-macos: ^0.0.0-0 || 0.62 - 0.66
-    react-native-windows: ^0.0.0-0 || 0.62 - 0.67
+    react-native-windows: ^0.0.0-0 || 0.62 - 0.68
   peerDependenciesMeta:
     "@react-native-community/cli":
       optional: true