feat: updated react-native version to 0.69.4 and updated libraries …

…version
ajaykumar97 · Aug 20, 2022 · fbab433 · fbab433
1 parent 3327576
commit fbab433
Show file tree

Hide file tree

Showing 53 changed files with 4,157 additions and 3,627 deletions.
diff --git a/README.md b/README.md
@@ -19,7 +19,6 @@ A starter kit for initializing a new React-Native project with some commonly use
 - Git hooks using [husky](https://typicode.github.io/husky/#/)
 - Staging and Production environment configurations using [react-native-config](https://github.com/luggit/react-native-config)
 - Unsecured local data storage using [AsyncStorage](https://github.com/react-native-async-storage/async-storage#readme)
-- Image caching using [react-native-fast-image](https://github.com/DylanVann/react-native-fast-image)
 - Splash screen using [react-native-bootsplash](https://github.com/zoontek/react-native-bootsplash)
 - API request using [axios](https://axios-http.com/)
 - Localization using [react-native-localization](https://github.com/stefalda/ReactNativeLocalization)
@@ -42,7 +41,7 @@ npm uninstall -g react-native-cli
 
 ## Quick start
 
-Generate a new React Native(**v0.67.3**) app using the **@ajaysidhu/react-native-template**:
+Generate a new React Native(**v0.69.4**) app using the **@ajaysidhu/react-native-template**:
 
 ```shell
 npx react-native init MyApp --template @ajaysidhu/react-native-template --skip-install
@@ -56,6 +55,10 @@ The template will automatically install the `npm` dependencies and the `pods` (i
 
 Check out the [documentation website](https://ajaykumar97.github.io/react-native-template/) to learn more about the template.
 
+## Configure Bundle Ids, App Name and Google Service Files
+
+If you want to extend the setup further to configure different bundle ids, App Names and Google Service files for **Staging** and **Production** environments, you can follow my [this](https://medium.com/swlh/part-3-configure-bundle-ids-app-name-and-google-service-files-94aed34bbca5) Medium post.
+
 ## Roadmap
 - [] Add [react-native-keychain](https://github.com/oblador/react-native-keychain) for secured user data storage
 - [] Add dark mode

diff --git a/post-init.script.sh b/post-init.script.sh
@@ -3,7 +3,7 @@
 echo "\nInitializing git repository\n"
 git init
 
-echo "\nInitializing husky\n"
+echo "\nInitializing husky (Please hit return/enter key for the next prompt)\n"
 npx husky-init
 
 echo "\nInstalling node_modules\n"

diff --git a/template/.ruby-version b/template/.ruby-version
@@ -1 +1 @@
-2.7.4
+2.7.5
diff --git a/template/Gemfile b/template/Gemfile
@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
+
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
-ruby '2.7.4'
+ruby '2.7.5'
+
 gem 'cocoapods', '~> 1.11', '>= 1.11.2'
diff --git a/template/Gemfile.lock b/template/Gemfile.lock
diff --git a/template/android/app/build.gradle b/template/android/app/build.gradle
@@ -3,10 +3,9 @@ apply plugin: "com.android.application"
 import com.android.build.OutputFile
 
 project.ext.envConfigFiles = [
-  staging: ".env.staging",
-  production: ".env.production",
+    staging: ".env.staging",
+    production: ".env.production",
 ]
-
 apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.gradle"
 
 /**
@@ -128,9 +127,12 @@ def jscFlavor = 'org.webkit:android-jsc:+'
 def enableHermes = project.ext.react.get("enableHermes", false);
 
 /**
- * Architectures to build native code for in debug.
+ * Architectures to build native code for.
  */
-def nativeArchitectures = project.getProperties().get("reactNativeDebugArchitectures")
+def reactNativeArchitectures() {
+    def value = project.getProperties().get("reactNativeArchitectures")
+    return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
+}
 
 android {
     ndkVersion rootProject.ext.ndkVersion
@@ -144,13 +146,82 @@ android {
         versionCode 1
         versionName "1.0.0"
         resValue "string", "build_config_package", "com.projectname"
+        buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
+
+        if (isNewArchitectureEnabled()) {
+            // We configure the NDK build only if you decide to opt-in for the New Architecture.
+            externalNativeBuild {
+                ndkBuild {
+                    arguments "APP_PLATFORM=android-21",
+                        "APP_STL=c++_shared",
+                        "NDK_TOOLCHAIN_VERSION=clang",
+                        "GENERATED_SRC_DIR=$buildDir/generated/source",
+                        "PROJECT_BUILD_DIR=$buildDir",
+                        "REACT_ANDROID_DIR=$rootDir/../node_modules/react-native/ReactAndroid",
+                        "REACT_ANDROID_BUILD_DIR=$rootDir/../node_modules/react-native/ReactAndroid/build",
+                        "NODE_MODULES_DIR=$rootDir/../node_modules"
+                    cFlags "-Wall", "-Werror", "-fexceptions", "-frtti", "-DWITH_INSPECTOR=1"
+                    cppFlags "-std=c++17"
+                    // Make sure this target name is the same you specify inside the
+                    // src/main/jni/Android.mk file for the `LOCAL_MODULE` variable.
+                    targets "projectname_appmodules"
+                }
+            }
+            if (!enableSeparateBuildPerCPUArchitecture) {
+                ndk {
+                    abiFilters (*reactNativeArchitectures())
+                }
+            }
+        }
     }
+
+    if (isNewArchitectureEnabled()) {
+        // We configure the NDK build only if you decide to opt-in for the New Architecture.
+        externalNativeBuild {
+            ndkBuild {
+                path "$projectDir/src/main/jni/Android.mk"
+            }
+        }
+        def reactAndroidProjectDir = project(':ReactAndroid').projectDir
+        def packageReactNdkDebugLibs = tasks.register("packageReactNdkDebugLibs", Copy) {
+            dependsOn(":ReactAndroid:packageReactNdkDebugLibsForBuck")
+            from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib")
+            into("$buildDir/react-ndk/exported")
+        }
+        def packageReactNdkReleaseLibs = tasks.register("packageReactNdkReleaseLibs", Copy) {
+            dependsOn(":ReactAndroid:packageReactNdkReleaseLibsForBuck")
+            from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib")
+            into("$buildDir/react-ndk/exported")
+        }
+        afterEvaluate {
+            // If you wish to add a custom TurboModule or component locally,
+            // you should uncomment this line.
+            // preBuild.dependsOn("generateCodegenArtifactsFromSchema")
+            preDebugBuild.dependsOn(packageReactNdkDebugLibs)
+            preReleaseBuild.dependsOn(packageReactNdkReleaseLibs)
+
+            // Due to a bug inside AGP, we have to explicitly set a dependency
+            // between configureNdkBuild* tasks and the preBuild tasks.
+            // This can be removed once this is solved: https://issuetracker.google.com/issues/207403732
+            configureNdkBuildRelease.dependsOn(preReleaseBuild)
+            configureNdkBuildDebug.dependsOn(preDebugBuild)
+            reactNativeArchitectures().each { architecture ->
+                tasks.findByName("configureNdkBuildDebug[${architecture}]")?.configure {
+                    dependsOn("preDebugBuild")
+                }
+                tasks.findByName("configureNdkBuildRelease[${architecture}]")?.configure {
+                    dependsOn("preReleaseBuild")
+                }
+            }
+        }
+    }
+
     splits {
         abi {
             reset()
             enable enableSeparateBuildPerCPUArchitecture
             universalApk false  // If true, also generate a universal APK
-            include "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
+            include (*reactNativeArchitectures())
         }
     }
     signingConfigs {
@@ -164,11 +235,6 @@ android {
     buildTypes {
         debug {
             signingConfig signingConfigs.debug
-            if (nativeArchitectures) {
-                ndk {
-                    abiFilters nativeArchitectures.split(',')
-                }
-            }
         }
         release {
             // Caution! In production, you need to generate your own keystore file.
@@ -180,23 +246,23 @@ android {
     }
 
     flavorDimensions "appType"
-
     productFlavors {
-      staging {
-        dimension "appType"
-        resValue "string", "app_name", "ProjectName - Staging"
-      }
-      production {
-        dimension "appType"
-        resValue "string", "app_name", "ProjectName"
-      }
+        staging {
+            dimension "appType"
+            resValue "string", "app_name", "ProjectName - Staging"
+        }
+        production {
+            dimension "appType"
+            resValue "string", "app_name", "ProjectName"
+        }
     }
 
     // applicationVariants are e.g. debug, release
     applicationVariants.all { variant ->
         variant.outputs.each { output ->
             // For each separate APK per architecture, set a unique version code as described here:
             // https://developer.android.com/studio/build/configure-apk-splits.html
+            // Example: versionCode 1 will generate 1001 for armeabi-v7a, 1002 for x86, etc.
             def versionCodes = ["armeabi-v7a": 1, "x86": 2, "arm64-v8a": 3, "x86_64": 4]
             def abi = output.getFilter(OutputFile.ABI)
             if (abi != null) {  // null for the universal-debug, universal-release variants
@@ -210,11 +276,12 @@ android {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
+
     //noinspection GradleDynamicVersion
     implementation "com.facebook.react:react-native:+"  // From node_modules
 
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
-    implementation "androidx.core:core-splashscreen:1.0.0-beta01"
+    implementation "androidx.core:core-splashscreen:1.0.0"
 
     debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
         exclude group:'com.facebook.fbjni'
@@ -230,14 +297,31 @@ dependencies {
     }
 
     if (enableHermes) {
-        def hermesPath = "../../node_modules/hermes-engine/android/";
-        debugImplementation files(hermesPath + "hermes-debug.aar")
-        releaseImplementation files(hermesPath + "hermes-release.aar")
+        //noinspection GradleDynamicVersion
+        implementation("com.facebook.react:hermes-engine:+") { // From node_modules
+            exclude group:'com.facebook.fbjni'
+        }
     } else {
         implementation jscFlavor
     }
 }
 
+if (isNewArchitectureEnabled()) {
+    // If new architecture is enabled, we let you build RN from source
+    // Otherwise we fallback to a prebuilt .aar bundled in the NPM package.
+    // This will be applied to all the imported transtitive dependency.
+    configurations.all {
+        resolutionStrategy.dependencySubstitution {
+            substitute(module("com.facebook.react:react-native"))
+                    .using(project(":ReactAndroid"))
+                    .because("On New Architecture we're building React Native from source")
+            substitute(module("com.facebook.react:hermes-engine"))
+                    .using(project(":ReactAndroid:hermes-engine"))
+                    .because("On New Architecture we're building Hermes from source")
+        }
+    }
+}
+
 // Run this once to be able to run the application with BUCK
 // puts all compile dependencies into folder libs for BUCK to use
 task copyDownloadableDepsToLibs(type: Copy) {
@@ -246,3 +330,11 @@ task copyDownloadableDepsToLibs(type: Copy) {
 }
 
 apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
+
+def isNewArchitectureEnabled() {
+    // To opt-in for the New Architecture, you can either:
+    // - Set `newArchEnabled` to true inside the `gradle.properties` file
+    // - Invoke gradle with `-newArchEnabled=true`
+    // - Set an environment variable `ORG_GRADLE_PROJECT_newArchEnabled=true`
+    return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
+}
diff --git a/template/android/app/debug.keystore b/template/android/app/debug.keystore
diff --git a/template/android/app/src/debug/AndroidManifest.xml b/template/android/app/src/debug/AndroidManifest.xml
@@ -5,9 +5,9 @@
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 
     <application
-      android:usesCleartextTraffic="true"
-      tools:targetApi="28"
-      tools:ignore="GoogleAppIndexingWarning">
-      <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
+        android:usesCleartextTraffic="true"
+        tools:targetApi="28"
+        tools:ignore="GoogleAppIndexingWarning">
+        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false" />
     </application>
 </manifest>