From 4f855c8a2a549dd1056a892dde5e778f05399f62 Mon Sep 17 00:00:00 2001 From: Carmi Grushko Date: Mon, 25 Apr 2022 03:08:51 -0700 Subject: [PATCH] @allow-large-files [MSDK] Update ktfmt component on FBS:master Reviewed By: strulovich Differential Revision: D35774317 fbshipit-source-id: ce59de8c38e385827a9ee62473b57a1791f18d27 --- .../views/view/ReactMapBufferViewManager.kt | 3 +- .../com/facebook/react/TaskConfiguration.kt | 30 +++++++++---------- .../react/tasks/GenerateCodegenSchemaTask.kt | 3 +- .../com/facebook/react/utils/PathUtils.kt | 3 +- 4 files changed, 19 insertions(+), 20 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactMapBufferViewManager.kt b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactMapBufferViewManager.kt index fe7aa854808..e1a19fd9dd1 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactMapBufferViewManager.kt +++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactMapBufferViewManager.kt @@ -26,7 +26,8 @@ object ReactMapBufferViewManager : ReactViewManagerWrapper { stateWrapper: StateWrapper?, jsResponderHandler: JSResponderHandler ): View = - viewManager.createView( + viewManager + .createView( reactTag, reactContext, props as? ReactStylesDiffMap, diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/TaskConfiguration.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/TaskConfiguration.kt index 11446615d8e..aca77c8facd 100644 --- a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/TaskConfiguration.kt +++ b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/TaskConfiguration.kt @@ -224,23 +224,23 @@ private fun Project.cleanupVMFiles( // two separate HermesDebug and HermesRelease AARs, but until then we'll // kludge it by deleting the .so files out of the /transforms/ directory. fileTree(libDir) { - if (enableHermes) { - // For Hermes, delete all the libjsc* files - it.include("**/libjsc*.so") + if (enableHermes) { + // For Hermes, delete all the libjsc* files + it.include("**/libjsc*.so") - if (cleanup) { - // Reduce size by deleting the debugger/inspector - it.include("**/libhermes-executor-debug.so") - } else { - // Release libs take precedence and must be removed - // to allow debugging - it.include("**/libhermes-executor-release.so") + if (cleanup) { + // Reduce size by deleting the debugger/inspector + it.include("**/libhermes-executor-debug.so") + } else { + // Release libs take precedence and must be removed + // to allow debugging + it.include("**/libhermes-executor-release.so") + } + } else { + // For JSC, delete all the libhermes* files + it.include("**/libhermes*.so") + } } - } else { - // For JSC, delete all the libhermes* files - it.include("**/libhermes*.so") - } - } .visit { visit -> val path = visit.file.absolutePath.replace(File.separatorChar, '/') if (path.matches(targetVariant) && visit.file.isFile) { diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GenerateCodegenSchemaTask.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GenerateCodegenSchemaTask.kt index dea2d8e7dfc..7d372f07904 100644 --- a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GenerateCodegenSchemaTask.kt +++ b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GenerateCodegenSchemaTask.kt @@ -54,8 +54,7 @@ abstract class GenerateCodegenSchemaTask : Exec() { codegenDir .file("lib/cli/combine/combine-js-to-schema-cli.js") .get() - .asFile - .absolutePath, + .asFile.absolutePath, generatedSchemaFile.get().asFile.absolutePath, jsRootDir.asFile.get().absolutePath, )) diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/PathUtils.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/PathUtils.kt index cdf59d2109f..594bc267d2a 100644 --- a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/PathUtils.kt +++ b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/PathUtils.kt @@ -136,8 +136,7 @@ internal fun detectOSAwareHermesCommand(projectRoot: File, hermesCommand: String // 3. If the react-native contains a pre-built hermesc, use it. val prebuiltHermesPath = - HERMESC_IN_REACT_NATIVE_PATH - .replace("%OS-BIN%", getHermesOSBin()) + HERMESC_IN_REACT_NATIVE_PATH.replace("%OS-BIN%", getHermesOSBin()) // Execution on Windows fails with / as separator .replace('/', File.separatorChar)