diff --git a/package.json b/package.json index 020c4a986..695ff5cbf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@thecodingmachine/react-native-boilerplate", - "version": "3.1.3", + "version": "3.2.0", "description": "TheCodingMachine React Native Boilerplate", "repository": { "type": "git", @@ -25,7 +25,7 @@ "starter-kit" ], "dependencies": { - "@thecodingmachine/rnb-plugin-typescript": "^1.0.5", + "@thecodingmachine/rnb-plugin-typescript": "^1.1.0", "kleur": "^4.1.4", "prompts": "^2.4.1" } diff --git a/template/_flowconfig b/template/_flowconfig index 43f7bb7b3..4320b7070 100644 --- a/template/_flowconfig +++ b/template/_flowconfig @@ -25,6 +25,8 @@ emoji=true exact_by_default=true +format.bracket_spacing=false + module.file_ext=.js module.file_ext=.json module.file_ext=.ios.js @@ -60,4 +62,4 @@ untyped-import untyped-type-import [version] -^0.137.0 +^0.158.0 diff --git a/template/_gitignore b/template/_gitignore index b93eb949f..cb24e7902 100644 --- a/template/_gitignore +++ b/template/_gitignore @@ -28,6 +28,7 @@ build/ .gradle local.properties *.iml +*.hprof # node.js # diff --git a/template/android/app/build.gradle b/template/android/app/build.gradle index cc1938f16..a4c8b4576 100644 --- a/template/android/app/build.gradle +++ b/template/android/app/build.gradle @@ -120,6 +120,11 @@ def jscFlavor = 'org.webkit:android-jsc:+' */ def enableHermes = project.ext.react.get("enableHermes", false); +/** + * Architectures to build native code for in debug. + */ +def nativeArchitectures = project.getProperties().get("reactNativeDebugArchitectures") + android { ndkVersion rootProject.ext.ndkVersion @@ -151,6 +156,11 @@ android { buildTypes { debug { signingConfig signingConfigs.debug + if (nativeArchitectures) { + ndk { + abiFilters nativeArchitectures.split(',') + } + } } release { // Caution! In production, you need to generate your own keystore file. @@ -186,7 +196,7 @@ dependencies { implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0" debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") { - exclude group:'com.facebook.fbjni' + exclude group:'com.facebook.fbjni' } debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") { diff --git a/template/android/app/src/main/java/com/boilerplate/MainApplication.java b/template/android/app/src/main/java/com/boilerplate/MainApplication.java index 60d672781..a719c975a 100644 --- a/template/android/app/src/main/java/com/boilerplate/MainApplication.java +++ b/template/android/app/src/main/java/com/boilerplate/MainApplication.java @@ -1,5 +1,7 @@ package com.boilerplate; +import com.facebook.react.bridge.JSIModulePackage; +import com.swmansion.reanimated.ReanimatedJSIModulePackage; import android.app.Application; import android.content.Context; import com.facebook.react.bridge.JSIModulePackage; @@ -38,7 +40,7 @@ protected String getJSMainModuleName() { @Override protected JSIModulePackage getJSIModulePackage() { - return new ReanimatedJSIModulePackage(); // for React Native Reanimated + return new ReanimatedJSIModulePackage(); } }; diff --git a/template/android/app/src/main/res/values/styles.xml b/template/android/app/src/main/res/values/styles.xml index 922e95cd7..064a795e8 100644 --- a/template/android/app/src/main/res/values/styles.xml +++ b/template/android/app/src/main/res/values/styles.xml @@ -3,7 +3,6 @@