react-native-tvos 0.81.3-0 → 0.82.0-0

package/ReactAndroid/build.gradle.kts

@@ -19,6 +19,7 @@ plugins {
   alias(libs.plugins.android.library)
   alias(libs.plugins.download)
   alias(libs.plugins.kotlin.android)
+  alias(libs.plugins.ktfmt)
 }
 
 version = project.findProperty("VERSION_NAME")?.toString()!!
@@ -40,6 +41,9 @@ val downloadsDir =
 val thirdPartyNdkDir = File("$buildDir/third-party-ndk")
 val reactNativeRootDir = projectDir.parent
 
+val hermesV1Enabled =
+    rootProject.extensions.getByType(PrivateReactExtension::class.java).hermesV1Enabled.get()
+
 // We put the publishing version from gradle.properties inside ext. so other
 // subprojects can access it as well.
 extra["publishing_version"] = project.findProperty("VERSION_NAME")?.toString()!!
@@ -75,7 +79,14 @@ val GLOG_VERSION = libs.versions.glog.get()
 
 val preparePrefab by
     tasks.registering(PreparePrefabHeadersTask::class) {
-      dependsOn(prepareBoost, prepareDoubleConversion, prepareFolly, prepareGlog)
+      dependsOn(
+          prepareBoost,
+          prepareDoubleConversion,
+          prepareFastFloat,
+          prepareFmt,
+          prepareFolly,
+          prepareGlog,
+      )
       dependsOn("generateCodegenArtifactsFromSchema")
       // To export to a ReactNativePrefabProcessingEntities.kt once all
       // libraries have been moved. We keep it here for now as it make easier to
@@ -109,21 +120,25 @@ val preparePrefab by
                       // react_devtoolsruntimesettings
                       Pair(
                           "../ReactCommon/react/devtoolsruntimesettings/",
-                          "react/devtoolsruntimesettings/"),
+                          "react/devtoolsruntimesettings/",
+                      ),
                       // react_renderer_animations
                       Pair(
                           "../ReactCommon/react/renderer/animations/",
-                          "react/renderer/animations/"),
+                          "react/renderer/animations/",
+                      ),
                       // react_renderer_bridging
                       Pair("../ReactCommon/react/renderer/bridging/", "react/renderer/bridging/"),
                       // react_renderer_componentregistry
                       Pair(
                           "../ReactCommon/react/renderer/componentregistry/",
-                          "react/renderer/componentregistry/"),
+                          "react/renderer/componentregistry/",
+                      ),
                       // react_renderer_consistency
                       Pair(
                           "../ReactCommon/react/renderer/consistency/",
-                          "react/renderer/consistency/"),
+                          "react/renderer/consistency/",
+                      ),
                       // react_renderer_core
                       Pair("../ReactCommon/react/renderer/core/", "react/renderer/core/"),
                       // react_renderer_css
@@ -138,7 +153,8 @@ val preparePrefab by
                       // react_renderer_imagemanager
                       Pair(
                           "../ReactCommon/react/renderer/imagemanager/",
-                          "react/renderer/imagemanager/"),
+                          "react/renderer/imagemanager/",
+                      ),
                       Pair("../ReactCommon/react/renderer/imagemanager/platform/cxx/", ""),
                       // react_renderer_mounting
                       Pair("../ReactCommon/react/renderer/mounting/", "react/renderer/mounting/"),
@@ -151,37 +167,45 @@ val preparePrefab by
                       // rrc_image
                       Pair(
                           "../ReactCommon/react/renderer/components/image/",
-                          "react/renderer/components/image/"),
+                          "react/renderer/components/image/",
+                      ),
                       // rrc_view
                       Pair(
                           "../ReactCommon/react/renderer/components/view/",
-                          "react/renderer/components/view/"),
+                          "react/renderer/components/view/",
+                      ),
                       Pair("../ReactCommon/react/renderer/components/view/platform/android/", ""),
                       // rrc_root
                       Pair(
                           "../ReactCommon/react/renderer/components/root/",
-                          "react/renderer/components/root/"),
+                          "react/renderer/components/root/",
+                      ),
                       // runtimeexecutor
                       Pair("../ReactCommon/runtimeexecutor/", ""),
                       // react_renderer_textlayoutmanager
                       Pair(
                           "../ReactCommon/react/renderer/textlayoutmanager/",
-                          "react/renderer/textlayoutmanager/"),
+                          "react/renderer/textlayoutmanager/",
+                      ),
                       Pair("../ReactCommon/react/renderer/textlayoutmanager/platform/android/", ""),
                       // rrc_text
                       Pair(
                           "../ReactCommon/react/renderer/components/text/",
-                          "react/renderer/components/text/"),
+                          "react/renderer/components/text/",
+                      ),
                       Pair(
                           "../ReactCommon/react/renderer/attributedstring",
-                          "react/renderer/attributedstring"),
+                          "react/renderer/attributedstring",
+                      ),
                       // rrc_textinput
                       Pair(
                           "../ReactCommon/react/renderer/components/textinput/",
-                          "react/renderer/components/textinput/"),
+                          "react/renderer/components/textinput/",
+                      ),
                       Pair(
                           "../ReactCommon/react/renderer/components/textinput/platform/android/",
-                          ""),
+                          "",
+                      ),
                       // react_newarchdefaults
                       Pair("src/main/jni/react/newarchdefaults", ""),
                       // react_nativemodule_core
@@ -198,20 +222,24 @@ val preparePrefab by
                       Pair("../ReactCommon/react/nativemodule/core/platform/android/", ""),
                       Pair(
                           "../ReactCommon/react/renderer/componentregistry/",
-                          "react/renderer/componentregistry/"),
+                          "react/renderer/componentregistry/",
+                      ),
                       Pair(
                           "../ReactCommon/react/renderer/components/root/",
-                          "react/renderer/components/root/"),
+                          "react/renderer/components/root/",
+                      ),
                       Pair("../ReactCommon/react/renderer/core/", "react/renderer/core/"),
                       Pair("../ReactCommon/react/renderer/debug/", "react/renderer/debug/"),
                       Pair(
                           "../ReactCommon/react/renderer/leakchecker/",
-                          "react/renderer/leakchecker/"),
+                          "react/renderer/leakchecker/",
+                      ),
                       Pair("../ReactCommon/react/renderer/mapbuffer/", "react/renderer/mapbuffer/"),
                       Pair("../ReactCommon/react/renderer/mounting/", "react/renderer/mounting/"),
                       Pair(
                           "../ReactCommon/react/renderer/runtimescheduler/",
-                          "react/renderer/runtimescheduler/"),
+                          "react/renderer/runtimescheduler/",
+                      ),
                       Pair("../ReactCommon/react/renderer/scheduler/", "react/renderer/scheduler/"),
                       Pair("../ReactCommon/react/renderer/telemetry/", "react/renderer/telemetry/"),
                       Pair("../ReactCommon/react/renderer/uimanager/", "react/renderer/uimanager/"),
@@ -223,22 +251,32 @@ val preparePrefab by
                       // react_performance_timeline
                       Pair(
                           "../ReactCommon/react/performance/timeline/",
-                          "react/performance/timeline/"),
+                          "react/performance/timeline/",
+                      ),
+                      // react_performance_cdpmetrics
+                      Pair(
+                          "../ReactCommon/react/performance/cdpmetrics/",
+                          "react/performance/cdpmetrics/",
+                      ),
                       // react_renderer_observers_events
                       Pair(
                           "../ReactCommon/react/renderer/observers/events/",
-                          "react/renderer/observers/events/"),
+                          "react/renderer/observers/events/",
+                      ),
                       // react_timing
                       Pair("../ReactCommon/react/timing/", "react/timing/"),
                       // yoga
                       Pair("../ReactCommon/yoga/", ""),
                       Pair("src/main/jni/first-party/yogajni/jni", ""),
-                  )),
+                  ),
+              ),
               PrefabPreprocessingEntry(
                   "hermestooling",
                   // hermes_executor
-                  Pair("../ReactCommon/hermes/inspector-modern/", "hermes/inspector-modern/")),
-          ))
+                  Pair("../ReactCommon/hermes/inspector-modern/", "hermes/inspector-modern/"),
+              ),
+          )
+      )
       outputDir.set(prefabHeadersDir)
     }
 
@@ -253,7 +291,8 @@ val downloadBoost by
     tasks.registering(Download::class) {
       dependsOn(createNativeDepsDirectories)
       src(
-          "https://archives.boost.io/release/${BOOST_VERSION.replace("_", ".")}/source/boost_${BOOST_VERSION}.tar.gz")
+          "https://archives.boost.io/release/${BOOST_VERSION.replace("_", ".")}/source/boost_${BOOST_VERSION}.tar.gz"
+      )
       onlyIfModified(true)
       overwrite(false)
       retries(5)
@@ -276,7 +315,8 @@ val downloadDoubleConversion by
     tasks.registering(Download::class) {
       dependsOn(createNativeDepsDirectories)
       src(
-          "https://github.com/google/double-conversion/archive/v${DOUBLE_CONVERSION_VERSION}.tar.gz")
+          "https://github.com/google/double-conversion/archive/v${DOUBLE_CONVERSION_VERSION}.tar.gz"
+      )
       onlyIfModified(true)
       overwrite(false)
       retries(5)
@@ -415,7 +455,8 @@ val buildCodegenCLI by
           fileTree(codegenDir) {
             include("lib/**/*.js")
             include("lib/**/*.js.flow")
-          })
+          }
+      )
       rootProjectName.set(rootProject.name)
     }
 
@@ -526,7 +567,12 @@ android {
             "-DANDROID_STL=c++_shared",
             "-DANDROID_TOOLCHAIN=clang",
             "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON",
-            "-DCMAKE_POLICY_DEFAULT_CMP0069=NEW")
+            "-DCMAKE_POLICY_DEFAULT_CMP0069=NEW",
+        )
+
+        if (hermesV1Enabled) {
+          arguments("-DHERMES_V1_ENABLED=1")
+        }
 
         targets(
             "reactnative",
@@ -551,11 +597,13 @@ android {
           buildCodegenCLI,
           "generateCodegenArtifactsFromSchema",
           prepareNative3pDependencies,
-          preparePrefab)
+          preparePrefab,
+      )
   tasks.getByName("generateCodegenSchemaFromJavaScript").dependsOn(buildCodegenCLI)
   prepareKotlinBuildScriptModel.dependsOn("preBuild")
   prepareKotlinBuildScriptModel.dependsOn(
-      ":packages:react-native:ReactAndroid:hermes-engine:preBuild")
+      ":packages:react-native:ReactAndroid:hermes-engine:preBuild"
+  )
 
   sourceSets.getByName("main") {
     res.setSrcDirs(
@@ -565,7 +613,9 @@ android {
             "src/main/res/views/alert",
             "src/main/res/views/modal",
             "src/main/res/views/uimanager",
-            "src/main/res/views/view"))
+            "src/main/res/views/view",
+        )
+    )
     java.exclude("com/facebook/react/processing")
     java.exclude("com/facebook/react/module/processing")
   }
@@ -582,7 +632,7 @@ android {
     // we produce. The reason behind this is that we want to allow users to pick the
     // JS engine by specifying a dependency on either `hermes-engine` or other engines
     // that will include the necessary .so files to load.
-    jniLibs.excludes.add("**/libhermes.so")
+    jniLibs.excludes.add("**/libhermesvm.so")
   }
 
   buildFeatures {
@@ -600,7 +650,7 @@ android {
   publishing {
     multipleVariants {
       withSourcesJar()
-      includeBuildTypeValues("debug", "release", "debugOptimized")
+      allVariants()
     }
   }
 

package/ReactAndroid/gradle.properties

@@ -1,5 +1,6 @@
-VERSION_NAME=0.81.3-0
+VERSION_NAME=0.82.0-0
 react.internal.publishingGroup=io.github.react-native-tvos
+react.internal.hermesPublishingGroup=com.facebook.hermes
 
 android.useAndroidX=true
 

package/ReactAndroid/hermes-engine/build.gradle.kts

@@ -5,6 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import com.facebook.react.internal.PrivateReactExtension
 import com.facebook.react.tasks.internal.*
 import de.undercouch.gradle.tasks.download.Download
 import org.apache.tools.ant.taskdefs.condition.Os
@@ -52,6 +53,8 @@ fun getSDKManagerPath(): String {
   }
 }
 
+val hermesV1Enabled =
+    rootProject.extensions.getByType(PrivateReactExtension::class.java).hermesV1Enabled.get()
 val reactNativeRootDir = project(":packages:react-native:ReactAndroid").projectDir.parent
 val customDownloadDir = System.getenv("REACT_NATIVE_DOWNLOADS_DIR")
 val downloadsDir =
@@ -81,12 +84,21 @@ val hermesBuildOutputFileTree =
     fileTree(hermesBuildDir.toString())
         .include("**/*.cmake", "**/*.marks", "**/compiler_depends.ts", "**/Makefile", "**/link.txt")
 
-var hermesVersion = "main"
-val hermesVersionFile = File(reactNativeRootDir, "sdks/.hermesversion")
+val hermesVersionProvider: Provider<String> =
+    providers.provider {
+      var hermesVersion = if (hermesV1Enabled) "250829098.0.0-stable" else "main"
+      val hermesVersionFile =
+          File(
+              reactNativeRootDir,
+              if (hermesV1Enabled) "sdks/.hermesv1version" else "sdks/.hermesversion",
+          )
 
-if (hermesVersionFile.exists()) {
-  hermesVersion = hermesVersionFile.readText()
-}
+      if (hermesVersionFile.exists()) {
+        hermesVersion = hermesVersionFile.readText()
+      }
+
+      hermesVersion
+    }
 
 val ndkBuildJobs = Runtime.getRuntime().availableProcessors().toString()
 val prefabHeadersDir = File("$buildDir/prefab-headers")
@@ -97,7 +109,11 @@ val jsiDir = File(reactNativeRootDir, "ReactCommon/jsi")
 val downloadHermesDest = File(downloadsDir, "hermes.tar.gz")
 val downloadHermes by
     tasks.registering(Download::class) {
-      src("https://github.com/facebook/hermes/tarball/${hermesVersion}")
+      src(
+          providers.provider {
+            "https://github.com/facebook/hermes/tarball/${hermesVersionProvider.get()}"
+          }
+      )
       onlyIfModified(true)
       overwrite(true)
       quiet(true)
@@ -124,14 +140,16 @@ val unzipHermes by
 // NOTE: ideally, we would like CMake to be installed automatically by the `externalNativeBuild`
 // below. To do that, we would need the various `ConfigureCMake*` tasks to run *before*
 // `configureBuildForHermes` and `buildHermesC` so that CMake is available for their run. But the
-// `ConfigureCMake*` tasks depend upon the `ImportHermesc.cmake` file which is actually generated by
+// `ConfigureCMake*` tasks depend upon the `ImportHostCompilers.cmake` file which is actually
+// generated by
 // the two tasks mentioned before, so we install CMake manually to break the circular dependency.
 
 val installCMake by
     tasks.registering(CustomExecTask::class) {
       onlyIfProvidedPathDoesNotExists.set(cmakePath)
       commandLine(
-          windowsAwareCommandLine(getSDKManagerPath(), "--install", "cmake;${cmakeVersion}"))
+          windowsAwareCommandLine(getSDKManagerPath(), "--install", "cmake;${cmakeVersion}")
+      )
     }
 
 val configureBuildForHermes by
@@ -151,6 +169,7 @@ val configureBuildForHermes by
               "-B",
               hermesBuildDir.toString(),
               "-DJSI_DIR=" + jsiDir.absolutePath,
+              "-DCMAKE_BUILD_TYPE=Release",
           )
       if (Os.isFamily(Os.FAMILY_WINDOWS)) {
         cmakeCommandLine = cmakeCommandLine + "-GNMake Makefiles"
@@ -198,7 +217,7 @@ val buildHermesLib by
           "--build",
           hermesBuildDir.toString(),
           "--target",
-          "libhermes",
+          "hermesvm",
           "-j",
           ndkBuildJobs,
       )
@@ -259,16 +278,17 @@ android {
             "-DANDROID_STL=c++_shared",
             "-DANDROID_PIE=True",
             "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON",
-            "-DIMPORT_HERMESC=${File(hermesBuildDir, "ImportHermesc.cmake").toString()}",
+            "-DIMPORT_HOST_COMPILERS=${File(hermesBuildDir, "ImportHostCompilers.cmake").toString()}",
             "-DJSI_DIR=${jsiDir}",
             "-DHERMES_BUILD_SHARED_JSI=True",
             "-DHERMES_RELEASE_VERSION=for RNTV ${version}",
             "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=True",
             // We intentionally build Hermes with Intl support only. This is to simplify
             // the build setup and to avoid overcomplicating the build-type matrix.
-            "-DHERMES_ENABLE_INTL=True")
+            "-DHERMES_ENABLE_INTL=True",
+        )
 
-        targets("libhermes")
+        targets("hermesvm")
       }
     }
     ndk { abiFilters.addAll(reactNativeArchitectures()) }
@@ -294,7 +314,11 @@ android {
           // Therefore we're passing as build type Release, to provide a faster build.
           // This has the (unlucky) side effect of letting AGP call the build
           // tasks `configureCMakeRelease` while is actually building the debug flavor.
-          arguments("-DCMAKE_BUILD_TYPE=Release")
+          arguments(
+              "-DCMAKE_BUILD_TYPE=Release",
+              // For debug builds, explicitly enable the Hermes Debugger.
+              "-DHERMES_ENABLE_DEBUGGER=True",
+          )
         }
       }
     }
@@ -304,7 +328,8 @@ android {
           arguments(
               "-DCMAKE_BUILD_TYPE=MinSizeRel",
               // For release builds, we don't want to enable the Hermes Debugger.
-              "-DHERMES_ENABLE_DEBUGGER=False")
+              "-DHERMES_ENABLE_DEBUGGER=False",
+          )
         }
       }
     }
@@ -345,12 +370,7 @@ android {
     }
   }
 
-  prefab {
-    create("libhermes") {
-      headers = prefabHeadersDir.absolutePath
-      libraryName = "libhermes"
-    }
-  }
+  prefab { create("hermesvm") { headers = prefabHeadersDir.absolutePath } }
 }
 
 afterEvaluate {

package/ReactAndroid/src/main/java/com/facebook/debug/tags/ReactDebugOverlayTags.kt

@@ -32,5 +32,6 @@ internal object ReactDebugOverlayTags {
       DebugOverlayTag(
           "UI Manager",
           "UI Manager View Operations (requires restart\nwarning: this is spammy)",
-          Color.CYAN)
+          Color.CYAN,
+      )
 }

package/ReactAndroid/src/main/java/com/facebook/hermes/reactexecutor/HermesExecutor.kt

@@ -29,8 +29,8 @@ public class HermesExecutor internal constructor(enableDebugger: Boolean, debugg
     @Throws(UnsatisfiedLinkError::class)
     public fun loadLibrary() {
       if (mode == null) {
-        // libhermes must be loaded explicitly to invoke its JNI_OnLoad.
-        SoLoader.loadLibrary("hermes")
+        // libhermesvm must be loaded explicitly to invoke its JNI_OnLoad.
+        SoLoader.loadLibrary("hermesvm")
         SoLoader.loadLibrary("hermes_executor")
         // libhermes_executor is built differently for Debug & Release so we load the proper mode.
         mode = if (ReactBuildConfig.DEBUG) "Debug" else "Release"
@@ -41,7 +41,7 @@ public class HermesExecutor internal constructor(enableDebugger: Boolean, debugg
     @JvmStatic
     private external fun initHybridDefaultConfig(
         enableDebugger: Boolean,
-        debuggerName: String
+        debuggerName: String,
     ): HybridData
 
     @DoNotStrip
@@ -49,7 +49,7 @@ public class HermesExecutor internal constructor(enableDebugger: Boolean, debugg
     private external fun initHybrid(
         enableDebugger: Boolean,
         debuggerName: String,
-        heapSizeMB: Long
+        heapSizeMB: Long,
     ): HybridData
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/BaseReactPackage.kt

@@ -25,7 +25,8 @@ public abstract class BaseReactPackage : ReactPackage {
   @Deprecated("Migrate to [BaseReactPackage] and implement [getModule] instead.")
   override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
     throw UnsupportedOperationException(
-        "createNativeModules method is not supported. Use getModule() method instead.")
+        "createNativeModules method is not supported. Use getModule() method instead."
+    )
   }
 
   /**
@@ -37,7 +38,7 @@ public abstract class BaseReactPackage : ReactPackage {
    */
   abstract override fun getModule(
       name: String,
-      reactContext: ReactApplicationContext
+      reactContext: ReactApplicationContext,
   ): NativeModule?
 
   /**
@@ -66,8 +67,10 @@ public abstract class BaseReactPackage : ReactPackage {
             // This Iterator is used to create the NativeModule registry. The NativeModule
             // registry must not have TurboModules. Therefore, if TurboModules are enabled, and
             // the current NativeModule is a TurboModule, we need to skip iterating over it.
-            if (ReactNativeNewArchitectureFeatureFlags.useTurboModules() &&
-                reactModuleInfo.isTurboModule) {
+            if (
+                ReactNativeNewArchitectureFeatureFlags.useTurboModules() &&
+                    reactModuleInfo.isTurboModule
+            ) {
               continue
             }
 
@@ -126,7 +129,7 @@ public abstract class BaseReactPackage : ReactPackage {
 
   private inner class ModuleHolderProvider(
       private val name: String,
-      private val reactContext: ReactApplicationContext
+      private val reactContext: ReactApplicationContext,
   ) : Provider<NativeModule?> {
     override fun get(): NativeModule? = getModule(name, reactContext)
   }

package/ReactAndroid/src/main/java/com/facebook/react/CoreModulesPackage.kt

@@ -30,7 +30,6 @@ import com.facebook.react.modules.debug.DevSettingsModule
 import com.facebook.react.modules.debug.SourceCodeModule
 import com.facebook.react.modules.deviceinfo.DeviceInfoModule
 import com.facebook.react.modules.systeminfo.AndroidInfoModule
-import com.facebook.react.uimanager.UIManagerModule
 import com.facebook.react.uimanager.ViewManager
 import com.facebook.react.uimanager.ViewManagerResolver
 import com.facebook.systrace.Systrace
@@ -38,6 +37,7 @@ import com.facebook.systrace.Systrace
 /**
  * This is the basic module to support React Native. The debug modules are now in DebugCorePackage.
  */
+@Suppress("DEPRECATION")
 @ReactModuleList(
     // WARNING: If you modify this list, ensure that the list below in method
     // getReactModuleInfoByInitialization is also updated
@@ -53,14 +53,20 @@ import com.facebook.systrace.Systrace
             HeadlessJsTaskSupportModule::class,
             SourceCodeModule::class,
             TimingModule::class,
-            UIManagerModule::class])
+            com.facebook.react.uimanager.UIManagerModule::class,
+        ]
+)
 @LegacyArchitecture(logLevel = LegacyArchitectureLogLevel.ERROR)
+@Deprecated(
+    message = "This class is part of Legacy Architecture and will be removed in a future release",
+    level = DeprecationLevel.WARNING,
+)
 internal class CoreModulesPackage(
     private val reactInstanceManager: ReactInstanceManager,
     private val hardwareBackBtnHandler: DefaultHardwareBackBtnHandler,
     private val lazyViewManagersEnabled: Boolean,
-    private val minTimeLeftInFrameForNonBatchedOperationMs: Int
-) : BaseReactPackage(), ReactPackageLogger {
+    private val minTimeLeftInFrameForNonBatchedOperationMs: Int,
+) : BaseReactPackage() {
   /**
    * This method is overridden, since OSS does not run the annotation processor to generate
    * [CoreModulesPackage.ReactModuleInfoProvider] class. Here we check if it exists with the method
@@ -81,10 +87,14 @@ internal class CoreModulesPackage(
       return fallbackForMissingClass()
     } catch (e: InstantiationException) {
       throw RuntimeException(
-          "No ReactModuleInfoProvider for CoreModulesPackage$\$ReactModuleInfoProvider", e)
+          "No ReactModuleInfoProvider for CoreModulesPackage$\$ReactModuleInfoProvider",
+          e,
+      )
     } catch (e: IllegalAccessException) {
       throw RuntimeException(
-          "No ReactModuleInfoProvider for CoreModulesPackage$\$ReactModuleInfoProvider", e)
+          "No ReactModuleInfoProvider for CoreModulesPackage$\$ReactModuleInfoProvider",
+          e,
+      )
     }
   }
 
@@ -102,7 +112,7 @@ internal class CoreModulesPackage(
             HeadlessJsTaskSupportModule::class.java,
             SourceCodeModule::class.java,
             TimingModule::class.java,
-            UIManagerModule::class.java,
+            com.facebook.react.uimanager.UIManagerModule::class.java,
         )
 
     val reactModuleInfoMap: MutableMap<String, ReactModuleInfo> = HashMap<String, ReactModuleInfo>()
@@ -118,7 +128,8 @@ internal class CoreModulesPackage(
                 reactModule.canOverrideExistingModule,
                 reactModule.needsEagerInit,
                 reactModule.isCxxModule,
-                ReactModuleInfo.classIsTurboModule(moduleClass))
+                ReactModuleInfo.classIsTurboModule(moduleClass),
+            )
       }
     }
 
@@ -139,15 +150,18 @@ internal class CoreModulesPackage(
       HeadlessJsTaskSupportModule.NAME -> HeadlessJsTaskSupportModule(reactContext)
       SourceCodeModule.NAME -> SourceCodeModule(reactContext)
       TimingModule.NAME -> TimingModule(reactContext, reactInstanceManager.devSupportManager)
-      UIManagerModule.NAME -> createUIManager(reactContext)
+      com.facebook.react.uimanager.UIManagerModule.NAME -> createUIManager(reactContext)
       DeviceInfoModule.NAME -> DeviceInfoModule(reactContext)
       else ->
           throw IllegalArgumentException(
-              "In CoreModulesPackage, could not find Native module for $name")
+              "In CoreModulesPackage, could not find Native module for $name"
+          )
     }
   }
 
-  private fun createUIManager(reactContext: ReactApplicationContext): UIManagerModule {
+  private fun createUIManager(
+      reactContext: ReactApplicationContext
+  ): com.facebook.react.uimanager.UIManagerModule {
     ReactMarker.logMarker(ReactMarkerConstants.CREATE_UI_MANAGER_MODULE_START)
     Systrace.beginSection(Systrace.TRACE_TAG_REACT, "createUIManagerModule")
 
@@ -164,12 +178,17 @@ internal class CoreModulesPackage(
               }
             }
 
-        return UIManagerModule(reactContext, resolver, minTimeLeftInFrameForNonBatchedOperationMs)
+        return com.facebook.react.uimanager.UIManagerModule(
+            reactContext,
+            resolver,
+            minTimeLeftInFrameForNonBatchedOperationMs,
+        )
       } else {
-        return UIManagerModule(
+        return com.facebook.react.uimanager.UIManagerModule(
             reactContext,
             reactInstanceManager.getOrCreateViewManagers(reactContext),
-            minTimeLeftInFrameForNonBatchedOperationMs)
+            minTimeLeftInFrameForNonBatchedOperationMs,
+        )
       }
     } finally {
       Systrace.endSection(Systrace.TRACE_TAG_REACT)
@@ -177,18 +196,12 @@ internal class CoreModulesPackage(
     }
   }
 
-  override fun startProcessPackage() {
-    ReactMarker.logMarker(ReactMarkerConstants.PROCESS_CORE_REACT_PACKAGE_START)
-  }
-
-  override fun endProcessPackage() {
-    ReactMarker.logMarker(ReactMarkerConstants.PROCESS_CORE_REACT_PACKAGE_END)
-  }
-
   private companion object {
     init {
       LegacyArchitectureLogger.assertLegacyArchitecture(
-          "CoreModulesPackage", LegacyArchitectureLogLevel.ERROR)
+          "CoreModulesPackage",
+          LegacyArchitectureLogLevel.ERROR,
+      )
     }
   }
 }