react-native-tvos 0.74.3-0 → 0.75.2-0

package/ReactAndroid/build.gradle.kts

@@ -100,8 +100,6 @@ val preparePrefab by
                       "react/renderer/componentregistry/")),
               PrefabPreprocessingEntry(
                   "react_newarchdefaults", Pair("src/main/jni/react/newarchdefaults", "")),
-              PrefabPreprocessingEntry(
-                  "react_cxxreactpackage", Pair("src/main/jni/react/runtime/cxxreactpackage", "")),
               PrefabPreprocessingEntry(
                   "react_render_animations",
                   Pair("../ReactCommon/react/renderer/animations/", "react/renderer/animations/")),
@@ -114,6 +112,22 @@ val preparePrefab by
                       Pair("../ReactCommon/react/renderer/graphics/", "react/renderer/graphics/"),
                       Pair("../ReactCommon/react/renderer/graphics/platform/android/", ""),
                   )),
+              PrefabPreprocessingEntry(
+                  "react_render_consistency",
+                  Pair(
+                      "../ReactCommon/react/renderer/consistency/", "react/renderer/consistency/")),
+              PrefabPreprocessingEntry(
+                  "react_featureflags",
+                  Pair("../ReactCommon/react/featureflags/", "react/featureflags/")),
+              PrefabPreprocessingEntry(
+                  "react_performance_timeline",
+                  Pair(
+                      "../ReactCommon/react/performance/timeline/", "react/performance/timeline/")),
+              PrefabPreprocessingEntry(
+                  "react_render_observers_events",
+                  Pair(
+                      "../ReactCommon/react/renderer/observers/events/",
+                      "react/renderer/observers/events/")),
               PrefabPreprocessingEntry(
                   "rrc_root",
                   Pair(
@@ -157,6 +171,8 @@ val preparePrefab by
                   "glog", Pair(File(buildDir, "third-party-ndk/glog/exported/").absolutePath, "")),
               PrefabPreprocessingEntry(
                   "fabricjni", Pair("src/main/jni/react/fabric", "react/fabric/")),
+              PrefabPreprocessingEntry(
+                  "mapbufferjni", Pair("src/main/jni/react/mapbuffer", "react/mapbuffer/")),
               PrefabPreprocessingEntry(
                   "react_render_mapbuffer",
                   Pair("../ReactCommon/react/renderer/mapbuffer/", "react/renderer/mapbuffer/")),
@@ -189,7 +205,6 @@ val preparePrefab by
                       Pair(File(buildDir, "third-party-ndk/fmt/include/").absolutePath, ""),
                       Pair(File(buildDir, "third-party-ndk/folly/").absolutePath, ""),
                       Pair(File(buildDir, "third-party-ndk/glog/exported/").absolutePath, ""),
-                      Pair("../ReactCommon/butter/", "butter/"),
                       Pair("../ReactCommon/callinvoker/", ""),
                       Pair("../ReactCommon/cxxreact/", "cxxreact/"),
                       Pair("../ReactCommon/react/bridging/", "react/bridging/"),
@@ -218,6 +233,8 @@ val preparePrefab by
                       Pair("../ReactCommon/react/debug/", "react/debug/"),
                       Pair("../ReactCommon/react/utils/", "react/utils/"),
                       Pair("src/main/jni/react/jni", "react/jni/"),
+                      // From: react_cxxreactpackage
+                      Pair("src/main/jni/react/runtime/cxxreactpackage", ""),
                   )),
               PrefabPreprocessingEntry(
                   "react_utils",
@@ -544,7 +561,6 @@ android {
         targets(
             "jsijniprofiler",
             "reactnativeblob",
-            "reactperfloggerjni",
             "bridgeless",
             "rninstance",
             "hermesinstancejni",
@@ -560,13 +576,16 @@ android {
             "react_codegen_rncore",
             "react_debug",
             "react_featureflags",
+            "react_performance_timeline",
             "react_utils",
             "react_render_componentregistry",
             "react_newarchdefaults",
-            "react_cxxreactpackage",
             "react_render_animations",
             "react_render_core",
+            "react_render_consistency",
+            "react_render_dom",
             "react_render_graphics",
+            "react_render_observers_events",
             "rrc_image",
             "rrc_root",
             "rrc_view",
@@ -576,6 +595,7 @@ android {
             "jsi",
             "glog",
             "fabricjni",
+            "mapbufferjni",
             "react_render_mapbuffer",
             "react_render_textlayoutmanager",
             "yoga",
@@ -583,6 +603,7 @@ android {
             "react_nativemodule_core",
             "react_render_imagemanager",
             "react_render_uimanager",
+            "react_render_uimanager_consistency",
             "react_render_scheduler",
             "react_render_mounting",
             "hermes_executor",
@@ -682,9 +703,6 @@ android {
     create("react_newarchdefaults") {
       headers = File(prefabHeadersDir, "react_newarchdefaults").absolutePath
     }
-    create("react_cxxreactpackage") {
-      headers = File(prefabHeadersDir, "react_cxxreactpackage").absolutePath
-    }
     create("react_render_animations") {
       headers = File(prefabHeadersDir, "react_render_animations").absolutePath
     }
@@ -694,6 +712,18 @@ android {
     create("react_render_graphics") {
       headers = File(prefabHeadersDir, "react_render_graphics").absolutePath
     }
+    create("react_render_consistency") {
+      headers = File(prefabHeadersDir, "react_render_consistency").absolutePath
+    }
+    create("react_featureflags") {
+      headers = File(prefabHeadersDir, "react_featureflags").absolutePath
+    }
+    create("react_performance_timeline") {
+      headers = File(prefabHeadersDir, "react_performance_timeline").absolutePath
+    }
+    create("react_render_observers_events") {
+      headers = File(prefabHeadersDir, "react_render_observers_events").absolutePath
+    }
     create("rrc_image") { headers = File(prefabHeadersDir, "rrc_image").absolutePath }
     create("rrc_root") { headers = File(prefabHeadersDir, "rrc_root").absolutePath }
     create("rrc_view") { headers = File(prefabHeadersDir, "rrc_view").absolutePath }
@@ -705,6 +735,7 @@ android {
     create("jsi") { headers = File(prefabHeadersDir, "jsi").absolutePath }
     create("glog") { headers = File(prefabHeadersDir, "glog").absolutePath }
     create("fabricjni") { headers = File(prefabHeadersDir, "fabricjni").absolutePath }
+    create("mapbufferjni") { headers = File(prefabHeadersDir, "mapbufferjni").absolutePath }
     create("react_render_mapbuffer") {
       headers = File(prefabHeadersDir, "react_render_mapbuffer").absolutePath
     }
@@ -793,7 +824,15 @@ react {
 // module to apply the plugin to, so it's codegenDir and reactNativeDir won't be evaluated.
 if (rootProject.name == "react-native-build-from-source") {
   rootProject.extensions.getByType(PrivateReactExtension::class.java).apply {
-    codegenDir = file("$rootDir/../@react-native/codegen")
+    // We try to guess where codegen lives. Generally is inside
+    // node_modules/@react-native/codegen. If the file is not existing, we
+    // fallback to ../react-native-codegen (used for hello-world app).
+    codegenDir =
+        if (file("$rootDir/../@react-native/codegen").exists()) {
+          file("$rootDir/../@react-native/codegen")
+        } else {
+          file("$rootDir/../react-native-codegen")
+        }
     reactNativeDir = file("$rootDir")
   }
 }

package/ReactAndroid/cmake-utils/ReactNative-application.cmake

@@ -37,14 +37,14 @@ endif()
 
 file(GLOB input_SRC CONFIGURE_DEPENDS
         *.cpp
-        ${BUILD_DIR}/generated/rncli/src/main/jni/*.cpp)
+        ${BUILD_DIR}/generated/autolinking/src/main/jni/*.cpp)
 
 add_library(${CMAKE_PROJECT_NAME} SHARED ${input_SRC})
 
 target_include_directories(${CMAKE_PROJECT_NAME}
         PUBLIC
                 ${CMAKE_CURRENT_SOURCE_DIR}
-                ${PROJECT_BUILD_DIR}/generated/rncli/src/main/jni)
+                ${PROJECT_BUILD_DIR}/generated/autolinking/src/main/jni)
 
 target_compile_options(${CMAKE_PROJECT_NAME}
         PRIVATE
@@ -70,7 +70,6 @@ add_library(react_debug ALIAS ReactAndroid::react_debug)
 add_library(react_utils ALIAS ReactAndroid::react_utils)
 add_library(react_render_componentregistry ALIAS ReactAndroid::react_render_componentregistry)
 add_library(react_newarchdefaults ALIAS ReactAndroid::react_newarchdefaults)
-add_library(react_cxxreactpackage ALIAS ReactAndroid::react_cxxreactpackage)
 add_library(react_render_core ALIAS ReactAndroid::react_render_core)
 add_library(react_render_graphics ALIAS ReactAndroid::react_render_graphics)
 add_library(rrc_view ALIAS ReactAndroid::rrc_view)
@@ -79,6 +78,7 @@ add_library(rrc_textinput ALIAS ReactAndroid::rrc_textinput)
 add_library(jsi ALIAS ReactAndroid::jsi)
 add_library(glog ALIAS ReactAndroid::glog)
 add_library(fabricjni ALIAS ReactAndroid::fabricjni)
+add_library(mapbufferjni ALIAS ReactAndroid::mapbufferjni)
 add_library(react_render_mapbuffer ALIAS ReactAndroid::react_render_mapbuffer)
 add_library(react_render_textlayoutmanager ALIAS ReactAndroid::react_render_textlayoutmanager)
 add_library(yoga ALIAS ReactAndroid::yoga)
@@ -87,12 +87,18 @@ add_library(react_nativemodule_core ALIAS ReactAndroid::react_nativemodule_core)
 add_library(react_render_imagemanager ALIAS ReactAndroid::react_render_imagemanager)
 add_library(rrc_image ALIAS ReactAndroid::rrc_image)
 add_library(rrc_legacyviewmanagerinterop ALIAS ReactAndroid::rrc_legacyviewmanagerinterop)
+add_library(reactnativejni ALIAS ReactAndroid::reactnativejni)
+add_library(react_render_consistency ALIAS ReactAndroid::react_render_consistency)
+add_library(react_performance_timeline ALIAS ReactAndroid::react_performance_timeline)
+add_library(react_render_observers_events ALIAS ReactAndroid::react_render_observers_events)
+add_library(react_featureflags ALIAS ReactAndroid::react_featureflags)
 
 find_package(fbjni REQUIRED CONFIG)
 add_library(fbjni ALIAS fbjni::fbjni)
 
 target_link_libraries(${CMAKE_PROJECT_NAME}
         fabricjni                           # prefab ready
+        mapbufferjni                        # prefab ready
         fbjni                               # via 3rd party prefab
         folly_runtime                       # prefab ready
         glog                                # prefab ready
@@ -102,7 +108,6 @@ target_link_libraries(${CMAKE_PROJECT_NAME}
         react_utils                         # prefab ready
         react_nativemodule_core             # prefab ready
         react_newarchdefaults               # prefab ready
-        react_cxxreactpackage               # prefab ready
         react_render_componentregistry      # prefab ready
         react_render_core                   # prefab ready
         react_render_debug                  # prefab ready
@@ -126,8 +131,8 @@ target_compile_options(common_flags INTERFACE ${folly_FLAGS})
 target_link_libraries(ReactAndroid::react_codegen_rncore INTERFACE common_flags)
 
 # If project is on RN CLI v9, then we can use the following lines to link against the autolinked 3rd party libraries.
-if(EXISTS ${PROJECT_BUILD_DIR}/generated/rncli/src/main/jni/Android-rncli.cmake)
-        include(${PROJECT_BUILD_DIR}/generated/rncli/src/main/jni/Android-rncli.cmake)
+if(EXISTS ${PROJECT_BUILD_DIR}/generated/autolinking/src/main/jni/Android-autolinking.cmake)
+        include(${PROJECT_BUILD_DIR}/generated/autolinking/src/main/jni/Android-autolinking.cmake)
         target_link_libraries(${CMAKE_PROJECT_NAME} ${AUTOLINKED_LIBRARIES})
         foreach(autolinked_library ${AUTOLINKED_LIBRARIES})
             target_link_libraries(${autolinked_library} common_flags)

package/ReactAndroid/cmake-utils/default-app-setup/OnLoad.cpp

@@ -29,9 +29,10 @@
 
 #include <DefaultComponentsRegistry.h>
 #include <DefaultTurboModuleManagerDelegate.h>
+#include <autolinking.h>
 #include <fbjni/fbjni.h>
 #include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
-#include <rncli.h>
+#include <rncore.h>
 
 #ifdef REACT_NATIVE_APP_CODEGEN_HEADER
 #include REACT_NATIVE_APP_CODEGEN_HEADER
@@ -55,8 +56,8 @@ void registerComponents(
   REACT_NATIVE_APP_COMPONENT_REGISTRATION(registry);
 #endif
 
-  // And we fallback to the components autolinked by RN CLI
-  rncli_registerProviders(registry);
+  // And we fallback to the components autolinked
+  autolinking_registerProviders(registry);
 }
 
 std::shared_ptr<TurboModule> cxxModuleProvider(
@@ -70,8 +71,8 @@ std::shared_ptr<TurboModule> cxxModuleProvider(
   //   return std::make_shared<NativeCxxModuleExample>(jsInvoker);
   // }
 
-  // And we fallback to the CXX module providers autolinked by RN CLI
-  return rncli_cxxModuleProvider(name, jsInvoker);
+  // And we fallback to the CXX module providers autolinked
+  return autolinking_cxxModuleProvider(name, jsInvoker);
 }
 
 std::shared_ptr<TurboModule> javaModuleProvider(
@@ -95,8 +96,17 @@ std::shared_ptr<TurboModule> javaModuleProvider(
   }
 #endif
 
-  // And we fallback to the module providers autolinked by RN CLI
-  return rncli_ModuleProvider(name, params);
+  // We first try to look up core modules
+  if (auto module = rncore_ModuleProvider(name, params)) {
+    return module;
+  }
+
+  // And we fallback to the module providers autolinked
+  if (auto module = autolinking_ModuleProvider(name, params)) {
+    return module;
+  }
+
+  return nullptr;
 }
 
 } // namespace facebook::react

package/ReactAndroid/gradle.properties

@@ -1,10 +1,7 @@
-VERSION_NAME=0.74.3-0
-# react.internal.publishingGroup=com.facebook.react
-# For TV use this group
+VERSION_NAME=0.75.2-0
 react.internal.publishingGroup=io.github.react-native-tvos
 
 android.useAndroidX=true
-android.enableJetifier=true
 
 # We want to have more fine grained control on the Java version for
 # ReactAndroid, therefore we disable RGNP Java version alignment mechanism

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

@@ -22,22 +22,27 @@ group = "io.github.react-native-tvos"
 version = parent?.properties?.get("publishing_version")?.toString()!!
 
 val cmakeVersion = parent?.properties?.get("cmake_version")?.toString()!!
-
-/**
- * We use the bundled version of CMake in the Android SDK if available, to don't force Android users
- * to install CMake externally.
- */
-fun findCmakePath(cmakeVersion: String): String {
-  val cmakeRelativePath = "cmake/${cmakeVersion}/bin/cmake"
-  if (System.getenv("ANDROID_SDK_ROOT") != null &&
-      File("${System.getenv("ANDROID_SDK_ROOT")}/${cmakeRelativePath}").exists()) {
-    return "${System.getenv("ANDROID_SDK_ROOT")}/${cmakeRelativePath}"
+val cmakePath = "${getSDKPath()}/cmake/$cmakeVersion"
+val cmakeBinaryPath = "${cmakePath}/bin/cmake"
+
+fun getSDKPath(): String {
+  val androidSdkRoot = System.getenv("ANDROID_SDK_ROOT")
+  val androidHome = System.getenv("ANDROID_HOME")
+  return when {
+    !androidSdkRoot.isNullOrBlank() -> androidSdkRoot
+    !androidHome.isNullOrBlank() -> androidHome
+    else -> throw IllegalStateException("Neither ANDROID_SDK_ROOT nor ANDROID_HOME is set.")
   }
-  if (System.getenv("ANDROID_HOME") != null &&
-      File("${System.getenv("ANDROID_HOME")}/${cmakeRelativePath}").exists()) {
-    return "${System.getenv("ANDROID_HOME")}/${cmakeRelativePath}"
+}
+
+fun getSDKManagerPath(): String {
+  val metaSdkManagerPath = File("${getSDKPath()}/cmdline-tools/latest/bin/sdkmanager")
+  val ossSdkManagerPath = File("${getSDKPath()}/tools/bin/sdkmanager")
+  return when {
+    metaSdkManagerPath.exists() -> metaSdkManagerPath.absolutePath
+    ossSdkManagerPath.exists() -> ossSdkManagerPath.absolutePath
+    else -> throw GradleException("Could not find sdkmanager executable.")
   }
-  return "cmake"
 }
 
 val reactNativeRootDir = project(":packages:react-native:ReactAndroid").projectDir.parent
@@ -76,7 +81,7 @@ val hermesBuildOutputFileTree =
             "**/link.txt")
 
 var hermesVersion = "main"
-val hermesVersionFile = File(reactNativeRootDir, "../../node_modules/react-native-core/sdks/.hermesversion")
+val hermesVersionFile = File(reactNativeRootDir, "sdks/.hermesversion")
 
 if (hermesVersionFile.exists()) {
   hermesVersion = hermesVersionFile.readText()
@@ -113,14 +118,28 @@ val unzipHermes by
       into(hermesDir)
     }
 
+// 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
+// the two tasks mentioned before, so we install CMake manually to break the circular dependency.
+
+val installCMake by
+    tasks.registering(Exec::class) {
+      onlyIf { !File(cmakePath).exists() }
+      commandLine(
+          windowsAwareCommandLine(getSDKManagerPath(), "--install", "cmake;${cmakeVersion}"))
+    }
+
 val configureBuildForHermes by
     tasks.registering(Exec::class) {
+      dependsOn(installCMake)
       workingDir(hermesDir)
       inputs.dir(hermesDir)
       outputs.files(hermesBuildOutputFileTree)
       commandLine(
           windowsAwareCommandLine(
-              findCmakePath(cmakeVersion),
+              cmakeBinaryPath,
               if (Os.isFamily(Os.FAMILY_WINDOWS)) "-GNMake Makefiles" else "",
               "-S",
               ".",
@@ -137,7 +156,7 @@ val buildHermesC by
       outputs.file(hermesCOutputBinary)
       commandLine(
           windowsAwareCommandLine(
-              findCmakePath(cmakeVersion),
+              cmakeBinaryPath,
               "--build",
               hermesBuildDir.toString(),
               "--target",

package/ReactAndroid/publish.gradle

@@ -3,17 +3,25 @@
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
+ *
+ * This file is modified from the original Meta source to work in the
+ * `react-native-ci` project.
  */
+/* groovylint-disable CompileStatic, DuplicateStringLiteral, LineLength, NestedBlockDepth, NoDef, UnusedVariable, VariableTypeRequired */
 
 apply plugin: 'maven-publish'
 apply plugin: 'signing'
 
-def isSnapshot = findProperty("isSnapshot")?.toBoolean()
-def signingKey = findProperty("SIGNING_KEY")
-def signingPwd = findProperty("SIGNING_PWD")
+def isSnapshot = false
+// Rewritten when copying this to ReactAndroid/publish.gradle
+def signingKey = findProperty('SIGNING_KEY')
+def signingPwd = findProperty('SIGNING_PWD')
+def sonatypeUsername = findProperty('SONATYPE_USERNAME')
+def sonatypePassword = findProperty('SONATYPE_PASSWORD')
 
 def reactAndroidProjectDir = project(':packages:react-native:ReactAndroid').projectDir
-def mavenTempLocalUrl = "file:///tmp/maven-local"
+def mavenTempLocalUrl = 'file:///Users/expo/workingdir/build/maven_local'
+// Rewritten when copying this to ReactAndroid/publish.gradle
 
 publishing {
     publications {
@@ -21,7 +29,7 @@ publishing {
             afterEvaluate {
                 // We do a multi variant release, so for Android libraries
                 // we publish `components.release`
-                if (plugins.hasPlugin("com.android.library")) {
+                if (plugins.hasPlugin('com.android.library')) {
                     from components.default
                 }
             }
@@ -29,35 +37,35 @@ publishing {
             // We populate the publishing version using the project version,
             // appending -SNAPSHOT if on nightly or prerelase.
             if (isSnapshot) {
-                version = this.version + "-SNAPSHOT"
+                version = this.version + '-SNAPSHOT'
             } else {
                 version = this.version
             }
 
             pom {
-                name = "react-native"
-                description = "A framework for building native apps with React"
-                url = "https://github.com/facebook/react-native"
+                name = 'react-native'
+                description = 'A framework for building native apps with React'
+                url = 'https://github.com/facebook/react-native'
 
                 developers {
                     developer {
-                        id = "facebook"
-                        name = "Facebook"
+                        id = 'facebook'
+                        name = 'Facebook'
                     }
                 }
 
                 licenses {
                     license {
-                        name = "MIT License"
-                        url = "https://github.com/facebook/react-native/blob/HEAD/LICENSE"
-                        distribution = "repo"
+                        name = 'MIT License'
+                        url = 'https://github.com/facebook/react-native/blob/HEAD/LICENSE'
+                        distribution = 'repo'
                     }
                 }
 
                 scm {
-                    url = "https://github.com/facebook/react-native.git"
-                    connection = "scm:git:https://github.com/facebook/react-native.git"
-                    developerConnection = "scm:git:git@github.com:facebook/react-native.git"
+                    url = 'https://github.com/facebook/react-native.git'
+                    connection = 'scm:git:https://github.com/facebook/react-native.git'
+                    developerConnection = 'scm:git:git@github.com:facebook/react-native.git'
                 }
             }
         }
@@ -65,31 +73,34 @@ publishing {
 
     repositories {
         maven {
-            name = "mavenTempLocal"
+            name = 'mavenTempLocal'
             url = mavenTempLocalUrl
         }
+        maven {
+            name = 'sonatypeRelease'
+            url = 'https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/'
+            credentials(PasswordCredentials) {
+                username = sonatypeUsername
+                password = sonatypePassword
+            }
+        }
+        maven {
+            name = 'sonatypeSnapshot'
+            url = 'https://s01.oss.sonatype.org/content/repositories/snapshots/'
+            credentials(PasswordCredentials) {
+                username = sonatypeUsername
+                password = sonatypePassword
+            }
+        }
     }
 
-//     if (signingKey && signingPwd) {
-//         logger.info("PGP Key found - Signing enabled")
-//         signing {
-//             useInMemoryPgpKeys(signingKey, signingPwd)
-//             sign(publishing.publications.release)
-//         }
-//     } else {
-//         logger.info("Signing disabled as the PGP key was not found")
-//     }
-
-// For the TV repo, we sign manually for now, using the gpg command line tool.
-// Properties that need to be set:
-//
-// signing.gnupg.executable=gpg
-// signing.gnupg.useLegacyGpg=true
-// signing.gnupg.keyName=(your key ID)
-// signing.keyId=(your key ID)
-// signing.secretKeyRingFile=(file with your exported secret keys)
-    signing {
-      useGpgCmd()
-      sign(publishing.publications.release)
+    if (signingKey && signingPwd) {
+        logger.info('PGP Key found - Signing enabled')
+        signing {
+            useInMemoryPgpKeys(signingKey, signingPwd)
+            sign(publishing.publications.release)
+        }
+    } else {
+        logger.info('Signing disabled as the PGP key was not found')
     }
 }

package/ReactAndroid/src/main/java/com/facebook/debug/holder/NoopPrinter.kt

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.debug.holder
+
+import com.facebook.debug.debugoverlay.model.DebugOverlayTag
+
+/** No-op implementation of [Printer]. */
+public object NoopPrinter : Printer {
+
+  public override fun logMessage(tag: DebugOverlayTag, message: String, vararg args: Any?): Unit =
+      Unit
+
+  public override fun logMessage(tag: DebugOverlayTag, message: String): Unit = Unit
+
+  public override fun shouldDisplayLogMessage(tag: DebugOverlayTag): Boolean = false
+}

package/ReactAndroid/src/main/java/com/facebook/debug/holder/Printer.kt

@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.debug.holder
+
+import com.facebook.debug.debugoverlay.model.DebugOverlayTag
+
+/** Interface to debugging tool. */
+public interface Printer {
+
+  public fun logMessage(tag: DebugOverlayTag, message: String, vararg args: Any?)
+
+  public fun logMessage(tag: DebugOverlayTag, message: String)
+
+  public fun shouldDisplayLogMessage(tag: DebugOverlayTag): Boolean
+}

package/ReactAndroid/src/main/java/com/facebook/debug/holder/PrinterHolder.kt

@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.debug.holder
+
+/** Holder for debugging tool instance. */
+public object PrinterHolder {
+  @JvmStatic public var printer: Printer = NoopPrinter
+}

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

@@ -34,7 +34,7 @@ public class HermesExecutor extends JavaScriptExecutor {
     super(
         config == null
             ? initHybridDefaultConfig(enableDebugger, debuggerName)
-            : initHybrid(enableDebugger, debuggerName, config.heapSizeMB));
+            : initHybrid(enableDebugger, debuggerName, config.getHeapSizeMB()));
   }
 
   @Override

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

@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.hermes.reactexecutor
+
+/** Holds runtime configuration for a Hermes VM instance (master or snapshot). */
+public class RuntimeConfig {
+  public var heapSizeMB: Long = 0L
+}