chore: imessageclone maintenance, upgrading dependencies, added alert if no env variables found

projects/iMessageClone/.gitignore

@@ -30,6 +30,7 @@ build/
 local.properties
 *.iml
 *.hprof
+.cxx/
 
 # node.js
 #

projects/iMessageClone/App.tsx

@@ -15,6 +15,7 @@ import {Channel as ChannelType} from 'stream-chat';
 import {useStreamChatTheme} from './useStreamChatTheme';
 import {chatClient, user, userToken} from './src/client';
 import {GestureHandlerRootView} from 'react-native-gesture-handler';
+import {Alert} from 'react-native';
 
 type State = {
   channel?: ChannelType;
@@ -32,6 +33,12 @@ const App = () => {
 
   useEffect(() => {
     const setupClient = async () => {
+      if (!user.id || !userToken) {
+        Alert.alert(
+          'Please set API_KEY, USER_ID and USER_TOKEN in .env file as mentioned in README file and restart the project',
+        );
+        return;
+      }
       await chatClient.connectUser(user, userToken);
       setClientReady(true);
     };

projects/iMessageClone/android/app/build.gradle

@@ -1,6 +1,7 @@
 apply plugin: "com.android.application"
 
 import com.android.build.OutputFile
+import org.apache.tools.ant.taskdefs.condition.Os
 
 /**
  * The react.gradle file registers a task for each build variant (e.g. bundleDebugJsAndAssets
@@ -143,22 +144,14 @@ android {
         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.
+            // We configure the CMake 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 "imessageclone_appmodules"
+                cmake {
+                    arguments "-DPROJECT_BUILD_DIR=$buildDir",
+                        "-DREACT_ANDROID_DIR=$rootDir/../node_modules/react-native/ReactAndroid",
+                        "-DREACT_ANDROID_BUILD_DIR=$rootDir/../node_modules/react-native/ReactAndroid/build",
+                        "-DNODE_MODULES_DIR=$rootDir/../node_modules",
+                        "-DANDROID_STL=c++_shared"
                 }
             }
             if (!enableSeparateBuildPerCPUArchitecture) {
@@ -172,8 +165,8 @@ android {
     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"
+            cmake {
+                path "$projectDir/src/main/jni/CMakeLists.txt"
             }
         }
         def reactAndroidProjectDir = project(':ReactAndroid').projectDir
@@ -195,15 +188,15 @@ android {
             preReleaseBuild.dependsOn(packageReactNdkReleaseLibs)
 
             // Due to a bug inside AGP, we have to explicitly set a dependency
-            // between configureNdkBuild* tasks and the preBuild tasks.
+            // between configureCMakeDebug* 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)
+            configureCMakeRelWithDebInfo.dependsOn(preReleaseBuild)
+            configureCMakeDebug.dependsOn(preDebugBuild)
             reactNativeArchitectures().each { architecture ->
-                tasks.findByName("configureNdkBuildDebug[${architecture}]")?.configure {
+                tasks.findByName("configureCMakeDebug[${architecture}]")?.configure {
                     dependsOn("preDebugBuild")
                 }
-                tasks.findByName("configureNdkBuildRelease[${architecture}]")?.configure {
+                tasks.findByName("configureCMakeRelWithDebInfo[${architecture}]")?.configure {
                     dependsOn("preReleaseBuild")
                 }
             }

projects/iMessageClone/android/app/src/main/jni/CMakeLists.txt

@@ -0,0 +1,5 @@
+cmake_minimum_required(VERSION 3.13)
+# Define the library name here.
+project(rndiffapp_appmodules)
+# This file includes all the necessary to let you build your application with the New Architecture.
+include(${REACT_ANDROID_DIR}/cmake-utils/ReactNative-application.cmake)

projects/iMessageClone/android/app/src/main/jni/MainApplicationModuleProvider.cpp

@@ -1,11 +1,13 @@
 #include "MainApplicationModuleProvider.h"
 #include <rncore.h>
+#include <rncli.h>
+
 namespace facebook
 {
     namespace react
     {
         std::shared_ptr<TurboModule> MainApplicationModuleProvider(
-            const std::string moduleName,
+            const std::string &moduleName,
             const JavaTurboModule::InitParams &params)
         {
             // Here you can provide your own module provider for TurboModules coming from
@@ -17,7 +19,15 @@ namespace facebook
             //    return module;
             // }
             // return rncore_ModuleProvider(moduleName, params);
+
+            // Module providers autolinked by RN CLI
+            auto rncli_module = rncli_ModuleProvider(moduleName, params);
+            if (rncli_module != nullptr)
+            {
+                return rncli_module;
+            }
+
             return rncore_ModuleProvider(moduleName, params);
         }
     } // namespace react
-} // namespace facebook
+} // namespace facebook

projects/iMessageClone/android/app/src/main/jni/MainApplicationModuleProvider.h

@@ -9,7 +9,7 @@ namespace facebook
     namespace react
     {
         std::shared_ptr<TurboModule> MainApplicationModuleProvider(
-            const std::string moduleName,
+            const std::string &moduleName,
             const JavaTurboModule::InitParams &params);
     } // namespace react
-} // namespace facebook
+} // namespace facebook

projects/iMessageClone/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp

@@ -22,21 +22,21 @@ namespace facebook
         }
         std::shared_ptr<TurboModule>
         MainApplicationTurboModuleManagerDelegate::getTurboModule(
-            const std::string name,
-            const std::shared_ptr<CallInvoker> jsInvoker)
+            const std::string &name,
+            const std::shared_ptr<CallInvoker> &jsInvoker)
         {
             // Not implemented yet: provide pure-C++ NativeModules here.
             return nullptr;
         }
         std::shared_ptr<TurboModule>
         MainApplicationTurboModuleManagerDelegate::getTurboModule(
-            const std::string name,
+            const std::string &name,
             const JavaTurboModule::InitParams &params)
         {
             return MainApplicationModuleProvider(name, params);
         }
         bool MainApplicationTurboModuleManagerDelegate::canCreateTurboModule(
-            std::string name)
+            const std::string &name)
         {
             return getTurboModule(name, nullptr) != nullptr ||
                    getTurboModule(name, {.moduleName = name}) != nullptr;

projects/iMessageClone/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h

@@ -20,16 +20,16 @@ namespace facebook
             static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject>);
             static void registerNatives();
             std::shared_ptr<TurboModule> getTurboModule(
-                const std::string name,
+                const std::string &name,
                 const std::shared_ptr<CallInvoker> jsInvoker) override;
             std::shared_ptr<TurboModule> getTurboModule(
-                const std::string name,
+                const std::string &name,
                 const JavaTurboModule::InitParams &params) override;
             /**
              * Test-only method. Allows user to verify whether a TurboModule can be
              * created by instances of this class.
              */
-            bool canCreateTurboModule(std::string name);
+            bool canCreateTurboModule(const std::string &name);
         };
     } // namespace react
 } // namespace facebook

projects/iMessageClone/android/app/src/main/jni/MainComponentsRegistry.cpp

@@ -3,6 +3,8 @@
 #include <fbjni/fbjni.h>
 #include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
 #include <react/renderer/components/rncore/ComponentDescriptors.h>
+#include <rncli.h>
+
 namespace facebook
 {
     namespace react
@@ -12,6 +14,10 @@ namespace facebook
         MainComponentsRegistry::sharedProviderRegistry()
         {
             auto providerRegistry = CoreComponentsRegistry::sharedProviderRegistry();
+
+            // Autolinked providers registered by RN CLI
+            rncli_registerProviders(providerRegistry);
+
             // Custom Fabric Components go here. You can register custom
             // components coming from your App or from 3rd party libraries here.
             //

projects/iMessageClone/android/build.gradle

@@ -21,7 +21,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:7.1.1")
+        classpath("com.android.tools.build:gradle:7.2.1")
         classpath("com.facebook.react:react-native-gradle-plugin")
         classpath("de.undercouch:gradle-download-task:5.0.1")
         // NOTE: Do not place your application dependencies here; they belong

projects/iMessageClone/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Mon Aug 15 18:34:46 CEST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

projects/iMessageClone/ios/Podfile

@@ -4,8 +4,6 @@ require_relative '../node_modules/@react-native-community/cli-platform-ios/nativ
 platform :ios, '12.4'
 install! 'cocoapods', :deterministic_uuids => false
 
-production = ENV["PRODUCTION"] == "1"
-
 target 'iMessageCloneReactNative' do
   config = use_native_modules!
 
@@ -14,10 +12,15 @@ target 'iMessageCloneReactNative' do
 
   use_react_native!(
     :path => config[:reactNativePath],
-    # to enable hermes on iOS, change `false` to `true` and then install pods
-    :production => production,
-    :hermes_enabled => flags[:hermes_enabled],
+    # Hermes is now enabled by default. Disable by setting this flag to false.
+    # Upcoming versions of React Native may rely on get_default_flags(), but
+    # we make it explicit here to aid in the React Native upgrade process.
+    :hermes_enabled => true,
     :fabric_enabled => flags[:fabric_enabled],
+    # Enables Flipper.
+    #
+    # Note that if you have use_frameworks! enabled, Flipper will not work and
+    # you should disable the next line.
     :flipper_configuration => FlipperConfiguration.enabled,
     # An absolute path to your application root.
     :app_path => "#{Pod::Config.instance.installation_root}/.."
@@ -29,7 +32,12 @@ target 'iMessageCloneReactNative' do
   end
 
   post_install do |installer|
-    react_native_post_install(installer)
+    react_native_post_install(
+      installer,
+      # Set `mac_catalyst_enabled` to `true` in order to apply patches
+      # necessary for Mac Catalyst builds
+      :mac_catalyst_enabled => false
+    )
     __apply_Xcode_12_5_M1_post_install_workaround(installer)
   end
-end
+end