Skip to content

Commit 790f4ff

Browse files
committed
dependencies update
1 parent e037b71 commit 790f4ff

File tree

15 files changed

+533
-568
lines changed

15 files changed

+533
-568
lines changed

template/_flowconfig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ emoji=true
2525

2626
exact_by_default=true
2727

28+
format.bracket_spacing=false
29+
2830
module.file_ext=.js
2931
module.file_ext=.json
3032
module.file_ext=.ios.js
@@ -60,4 +62,4 @@ untyped-import
6062
untyped-type-import
6163

6264
[version]
63-
^0.137.0
65+
^0.158.0

template/_gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ build/
2828
.gradle
2929
local.properties
3030
*.iml
31+
*.hprof
3132

3233
# node.js
3334
#

template/android/app/build.gradle

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ import com.android.build.OutputFile
7878
*/
7979

8080
project.ext.react = [
81-
enableHermes: false, // clean and rebuild if changing
81+
enableHermes: true, // clean and rebuild if changing
8282
]
8383

8484
apply from: "../../node_modules/react-native/react.gradle"
@@ -120,6 +120,11 @@ def jscFlavor = 'org.webkit:android-jsc:+'
120120
*/
121121
def enableHermes = project.ext.react.get("enableHermes", false);
122122

123+
/**
124+
* Architectures to build native code for in debug.
125+
*/
126+
def nativeArchitectures = project.getProperties().get("reactNativeDebugArchitectures")
127+
123128
android {
124129
ndkVersion rootProject.ext.ndkVersion
125130

@@ -151,6 +156,11 @@ android {
151156
buildTypes {
152157
debug {
153158
signingConfig signingConfigs.debug
159+
if (nativeArchitectures) {
160+
ndk {
161+
abiFilters nativeArchitectures.split(',')
162+
}
163+
}
154164
}
155165
release {
156166
// Caution! In production, you need to generate your own keystore file.
@@ -186,7 +196,7 @@ dependencies {
186196
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
187197

188198
debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
189-
exclude group:'com.facebook.fbjni'
199+
exclude group:'com.facebook.fbjni'
190200
}
191201

192202
debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {

template/android/app/src/main/java/com/boilerplate/MainApplication.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.boilerplate;
22

3+
import com.facebook.react.bridge.JSIModulePackage;
4+
import com.swmansion.reanimated.ReanimatedJSIModulePackage;
35
import android.app.Application;
46
import android.content.Context;
57
import com.facebook.react.PackageList;
@@ -33,6 +35,11 @@ protected List<ReactPackage> getPackages() {
3335
protected String getJSMainModuleName() {
3436
return "index";
3537
}
38+
39+
@Override
40+
protected JSIModulePackage getJSIModulePackage() {
41+
return new ReanimatedJSIModulePackage(); // <- add
42+
}
3643
};
3744

3845
@Override

template/android/app/src/main/res/values/styles.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<!-- Base application theme. -->
44
<style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
55
<!-- Customize your theme here. -->
6-
<item name="android:textColor">#000000</item>
76
</style>
87

98
<style name="SplashTheme" parent="AppTheme">

template/android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ buildscript {
66
minSdkVersion = 21
77
compileSdkVersion = 30
88
targetSdkVersion = 30
9-
ndkVersion = "20.1.5948944"
9+
ndkVersion = "21.4.7075529"
1010
}
1111
repositories {
1212
google()
1313
mavenCentral()
1414
}
1515
dependencies {
16-
classpath("com.android.tools.build:gradle:4.2.1")
16+
classpath("com.android.tools.build:gradle:4.2.2")
1717
// NOTE: Do not place your application dependencies here; they belong
1818
// in the individual module build.gradle files
1919
}

template/android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ android.useAndroidX=true
2525
android.enableJetifier=true
2626

2727
# Version of flipper SDK to use with React Native
28-
FLIPPER_VERSION=0.94.1
28+
FLIPPER_VERSION=0.99.0

template/babel.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ plugins.push([
1010
'@': './src',
1111
},
1212
},
13+
'react-native-reanimated/plugin',
1314
])
1415

1516
module.exports = {

template/ios/Boilerplate.xcodeproj/project.pbxproj

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -370,11 +370,13 @@
370370
"${PODS_ROOT}/Target Support Files/Pods-Boilerplate/Pods-Boilerplate-frameworks.sh",
371371
"${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-DoubleConversion/double-conversion.framework/double-conversion",
372372
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL",
373+
"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/hermes.framework/hermes",
373374
);
374375
name = "[CP] Embed Pods Frameworks";
375376
outputPaths = (
376377
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/double-conversion.framework",
377378
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
379+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
378380
);
379381
runOnlyForDeploymentPostprocessing = 0;
380382
shellPath = /bin/sh;
@@ -444,11 +446,13 @@
444446
"${PODS_ROOT}/Target Support Files/Pods-Boilerplate-BoilerplateTests/Pods-Boilerplate-BoilerplateTests-frameworks.sh",
445447
"${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-DoubleConversion/double-conversion.framework/double-conversion",
446448
"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL",
449+
"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/hermes.framework/hermes",
447450
);
448451
name = "[CP] Embed Pods Frameworks";
449452
outputPaths = (
450453
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/double-conversion.framework",
451454
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
455+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
452456
);
453457
runOnlyForDeploymentPostprocessing = 0;
454458
shellPath = /bin/sh;
@@ -839,7 +843,7 @@
839843
COPY_PHASE_STRIP = NO;
840844
ENABLE_STRICT_OBJC_MSGSEND = YES;
841845
ENABLE_TESTABILITY = YES;
842-
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
846+
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 i386";
843847
GCC_C_LANGUAGE_STANDARD = gnu99;
844848
GCC_DYNAMIC_NO_PIC = NO;
845849
GCC_NO_COMMON_BLOCKS = YES;
@@ -903,7 +907,7 @@
903907
COPY_PHASE_STRIP = YES;
904908
ENABLE_NS_ASSERTIONS = NO;
905909
ENABLE_STRICT_OBJC_MSGSEND = YES;
906-
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
910+
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 i386";
907911
GCC_C_LANGUAGE_STANDARD = gnu99;
908912
GCC_NO_COMMON_BLOCKS = YES;
909913
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;

template/ios/Podfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ target 'Boilerplate' do
99
use_react_native!(
1010
:path => config[:reactNativePath],
1111
# to enable hermes on iOS, change `false` to `true` and then install pods
12-
:hermes_enabled => false
12+
:hermes_enabled => true
1313
)
1414

1515
target 'BoilerplateTests' do
@@ -25,5 +25,6 @@ target 'Boilerplate' do
2525

2626
post_install do |installer|
2727
react_native_post_install(installer)
28+
__apply_Xcode_12_5_M1_post_install_workaround(installer)
2829
end
2930
end

0 commit comments

Comments
 (0)