Skip to content

Commit

Permalink
fix: add support for react-native 0.68 (#739)
Browse files Browse the repository at this point in the history
  • Loading branch information
tido64 authored Mar 30, 2022
1 parent 4911f3b commit f4920ca
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 21 deletions.
28 changes: 19 additions & 9 deletions android/gradle.properties
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
12 changes: 6 additions & 6 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit f4920ca

Please sign in to comment.