diff --git a/README.md b/README.md index 198d49c2..fce2b677 100644 --- a/README.md +++ b/README.md @@ -31,10 +31,10 @@ npx react-native init MyApp --template react-native-template-typescript ### Usage with older versions of React Native -#### e.g. `react-native@0.64.x` +#### e.g. `react-native@0.65.x` ```sh -npx react-native init MyApp --template react-native-template-typescript@6.6.* +npx react-native init MyApp --template react-native-template-typescript@6.7.* ``` See the below table to find out which version of the template to use. @@ -43,6 +43,7 @@ See the below table to find out which version of the template to use. | React Native | Template | | ------------ | -------- | +| 0.66 | 6.8.\* | | 0.65 | 6.7.\* | | 0.64 | 6.6.\* | | 0.63 | 6.5.\* | diff --git a/template/_gitignore b/template/_gitignore index ad572e63..cc53454e 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 c8d4b0e5..4e64e6a0 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/res/values/styles.xml b/template/android/app/src/main/res/values/styles.xml index 9fab0be7..24bc0613 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 @@ diff --git a/template/android/build.gradle b/template/android/build.gradle index e64d31e5..65098950 100644 --- a/template/android/build.gradle +++ b/template/android/build.gradle @@ -6,14 +6,14 @@ buildscript { minSdkVersion = 21 compileSdkVersion = 30 targetSdkVersion = 30 - ndkVersion = "20.1.5948944" + ndkVersion = "21.4.7075529" } repositories { google() mavenCentral() } dependencies { - classpath("com.android.tools.build:gradle:4.2.1") + classpath("com.android.tools.build:gradle:4.2.2") // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/template/android/gradle.properties b/template/android/gradle.properties index dbcbe6f2..cdb4c211 100644 --- a/template/android/gradle.properties +++ b/template/android/gradle.properties @@ -25,4 +25,4 @@ android.useAndroidX=true android.enableJetifier=true # Version of flipper SDK to use with React Native -FLIPPER_VERSION=0.93.0 +FLIPPER_VERSION=0.99.0 diff --git a/template/ios/HelloWorld.xcodeproj/project.pbxproj b/template/ios/HelloWorld.xcodeproj/project.pbxproj index 32e37dc4..4b5a17e8 100644 --- a/template/ios/HelloWorld.xcodeproj/project.pbxproj +++ b/template/ios/HelloWorld.xcodeproj/project.pbxproj @@ -583,6 +583,7 @@ "$(inherited)", ); LIBRARY_SEARCH_PATHS = ( + "\"$(SDKROOT)/usr/lib/swift\"", "\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"", "\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"", "\"$(inherited)\"", @@ -641,6 +642,7 @@ "$(inherited)", ); LIBRARY_SEARCH_PATHS = ( + "\"$(SDKROOT)/usr/lib/swift\"", "\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"", "\"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)\"", "\"$(inherited)\"", diff --git a/template/ios/Podfile b/template/ios/Podfile index 64a70486..a076cea9 100644 --- a/template/ios/Podfile +++ b/template/ios/Podfile @@ -25,5 +25,6 @@ target 'HelloWorld' do post_install do |installer| react_native_post_install(installer) + __apply_Xcode_12_5_M1_post_install_workaround(installer) end end \ No newline at end of file diff --git a/template/package.json b/template/package.json index 47bd6759..bc20a0be 100644 --- a/template/package.json +++ b/template/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "react": "17.0.2", - "react-native": "0.65.1" + "react-native": "0.66.0" }, "devDependencies": { "@babel/core": "^7.12.9", @@ -23,8 +23,7 @@ "babel-jest": "^26.6.3", "eslint": "^7.14.0", "jest": "^26.6.3", - "metro-react-native-babel-preset": "^0.66.0", - "react-native-codegen": "^0.0.7", + "metro-react-native-babel-preset": "^0.66.2", "react-test-renderer": "17.0.2", "typescript": "^3.8.3" },