Reapply "Codemod format for trailing commas change"

This reverts commit 40d64a2.

Author: cipolleschi

build.gradle.kts

@@ -26,19 +26,22 @@ fun getListReactAndroidProperty(name: String) = reactAndroidProperties.getProper
 
 apiValidation {
   ignoredPackages.addAll(
-      getListReactAndroidProperty("binaryCompatibilityValidator.ignoredPackages"))
+      getListReactAndroidProperty("binaryCompatibilityValidator.ignoredPackages")
+  )
   ignoredClasses.addAll(getListReactAndroidProperty("binaryCompatibilityValidator.ignoredClasses"))
   nonPublicMarkers.addAll(
-      getListReactAndroidProperty("binaryCompatibilityValidator.nonPublicMarkers"))
+      getListReactAndroidProperty("binaryCompatibilityValidator.nonPublicMarkers")
+  )
   validationDisabled =
       reactAndroidProperties
           .getProperty("binaryCompatibilityValidator.validationDisabled")
           ?.toBoolean() == true
 }
 
 version =
-    if (project.hasProperty("isSnapshot") &&
-        (project.property("isSnapshot") as? String).toBoolean()) {
+    if (
+        project.hasProperty("isSnapshot") && (project.property("isSnapshot") as? String).toBoolean()
+    ) {
       "${reactAndroidProperties.getProperty("VERSION_NAME")}-SNAPSHOT"
     } else {
       reactAndroidProperties.getProperty("VERSION_NAME")
@@ -66,8 +69,10 @@ tasks.register("clean", Delete::class.java) {
   description = "Remove all the build files and intermediate build outputs"
   dependsOn(gradle.includedBuild("gradle-plugin").task(":clean"))
   subprojects.forEach {
-    if (it.project.plugins.hasPlugin("com.android.library") ||
-        it.project.plugins.hasPlugin("com.android.application")) {
+    if (
+        it.project.plugins.hasPlugin("com.android.library") ||
+            it.project.plugins.hasPlugin("com.android.application")
+    ) {
       dependsOn(it.tasks.named("clean"))
     }
   }
@@ -77,10 +82,13 @@ tasks.register("clean", Delete::class.java) {
   delete(rootProject.file("./packages/react-native/sdks/download/"))
   delete(rootProject.file("./packages/react-native/sdks/hermes/"))
   delete(
-      rootProject.file("./packages/react-native/ReactAndroid/src/main/jni/prebuilt/lib/arm64-v8a/"))
+      rootProject.file("./packages/react-native/ReactAndroid/src/main/jni/prebuilt/lib/arm64-v8a/")
+  )
   delete(
       rootProject.file(
-          "./packages/react-native/ReactAndroid/src/main/jni/prebuilt/lib/armeabi-v7a/"))
+          "./packages/react-native/ReactAndroid/src/main/jni/prebuilt/lib/armeabi-v7a/"
+      )
+  )
   delete(rootProject.file("./packages/react-native/ReactAndroid/src/main/jni/prebuilt/lib/x86/"))
   delete(rootProject.file("./packages/react-native/ReactAndroid/src/main/jni/prebuilt/lib/x86_64/"))
   delete(rootProject.file("./packages/react-native-codegen/lib"))
@@ -98,7 +106,8 @@ tasks.register("publishAllToMavenTempLocal") {
   dependsOn(":packages:react-native:ReactAndroid:publishAllPublicationsToMavenTempLocalRepository")
   // We don't publish the external-artifacts to Maven Local as ci is using it via workspace.
   dependsOn(
-      ":packages:react-native:ReactAndroid:hermes-engine:publishAllPublicationsToMavenTempLocalRepository")
+      ":packages:react-native:ReactAndroid:hermes-engine:publishAllPublicationsToMavenTempLocalRepository"
+  )
 }
 
 tasks.register("publishAndroidToSonatype") {
@@ -120,7 +129,8 @@ if (project.findProperty("react.internal.useHermesNightly")?.toString()?.toBoole
       That's fine for local development, but you should not commit this change.
       ********************************************************************************
   """
-          .trimIndent())
+          .trimIndent()
+  )
   allprojects {
     configurations.all {
       resolutionStrategy.dependencySubstitution {
@@ -152,10 +162,12 @@ allprojects {
           "**/build/**",
           "**/hermes-engine/**",
           "**/internal/featureflags/**",
-          "**/systeminfo/ReactNativeVersion.kt")
+          "**/systeminfo/ReactNativeVersion.kt",
+      )
   listOf(
           com.ncorti.ktfmt.gradle.tasks.KtfmtCheckTask::class,
-          com.ncorti.ktfmt.gradle.tasks.KtfmtFormatTask::class)
+          com.ncorti.ktfmt.gradle.tasks.KtfmtFormatTask::class,
+      )
       .forEach { tasks.withType(it) { exclude(excludePatterns) } }
 
   // Disable the problematic ktfmt script tasks due to symbolic link issues in subprojects

packages/gradle-plugin/react-native-gradle-plugin/build.gradle.kts

@@ -68,7 +68,8 @@ tasks.withType<KotlinCompile>().configureEach {
     // See comment above on JDK 11 support
     jvmTarget.set(JvmTarget.JVM_11)
     allWarningsAsErrors.set(
-        project.properties["enableWarningsAsErrors"]?.toString()?.toBoolean() ?: false)
+        project.properties["enableWarningsAsErrors"]?.toString()?.toBoolean() ?: false
+    )
   }
 }
 

packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactExtension.kt

@@ -208,7 +208,8 @@ abstract class ReactExtension @Inject constructor(val project: Project) {
             } else {
               buildTypes.forEach { buildType ->
                 result.add(
-                    (dependencyConfiguration ?: "${buildType}Implementation") to ":$nameCleansed")
+                    (dependencyConfiguration ?: "${buildType}Implementation") to ":$nameCleansed"
+                )
               }
             }
           }

packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactPlugin.kt

@@ -112,7 +112,8 @@ class ReactPlugin : Plugin<Project> {
       ********************************************************************************
 
       """
-              .trimIndent())
+              .trimIndent()
+      )
       exitProcess(1)
     }
   }
@@ -186,7 +187,8 @@ class ReactPlugin : Plugin<Project> {
                 // We want to exclude the build directory, to don't pick them up for execution
                 // avoidance.
                 tree.exclude("**/build/**/*")
-              })
+              }
+          )
 
           val needsCodegenFromPackageJson = project.needsCodegenFromPackageJson(rootExtension.root)
           it.onlyIf { (isLibrary || needsCodegenFromPackageJson) && !includesGeneratedCode }
@@ -303,7 +305,8 @@ class ReactPlugin : Plugin<Project> {
     project.extensions.getByType(ApplicationAndroidComponentsExtension::class.java).apply {
       onVariants(selector().all()) { variant ->
         variant.sources.java?.addStaticSourceDirectory(
-            generatedAutolinkingJavaDir.get().asFile.absolutePath)
+            generatedAutolinkingJavaDir.get().asFile.absolutePath
+        )
       }
     }
   }

packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/ReactRootProjectPlugin.kt

@@ -59,10 +59,12 @@ class ReactRootProjectPlugin : Plugin<Project> {
   }
 
   private fun checkLegacyArchProperty(project: Project) {
-    if ((project.hasProperty(PropertyUtils.NEW_ARCH_ENABLED) &&
-        !project.property(PropertyUtils.NEW_ARCH_ENABLED).toString().toBoolean()) ||
-        (project.hasProperty(PropertyUtils.SCOPED_NEW_ARCH_ENABLED) &&
-            !project.property(PropertyUtils.SCOPED_NEW_ARCH_ENABLED).toString().toBoolean())) {
+    if (
+        (project.hasProperty(PropertyUtils.NEW_ARCH_ENABLED) &&
+            !project.property(PropertyUtils.NEW_ARCH_ENABLED).toString().toBoolean()) ||
+            (project.hasProperty(PropertyUtils.SCOPED_NEW_ARCH_ENABLED) &&
+                !project.property(PropertyUtils.SCOPED_NEW_ARCH_ENABLED).toString().toBoolean())
+    ) {
       project.logger.error(
           """
       ********************************************************************************
@@ -77,7 +79,8 @@ class ReactRootProjectPlugin : Plugin<Project> {
       ********************************************************************************
 
       """
-              .trimIndent())
+              .trimIndent()
+      )
     }
   }
 }

packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/TaskConfiguration.kt

@@ -54,9 +54,11 @@ internal fun Project.configureReactTasks(variant: Variant, config: ReactExtensio
 
   configureNewArchPackagingOptions(project, config, variant)
   configureJsEnginePackagingOptions(config, variant, isHermesEnabledInThisVariant, useThirdPartyJSC)
-  if (!isHermesEnabledInThisVariant &&
-      !useThirdPartyJSC &&
-      rootProject.name != "react-native-github") {
+  if (
+      !isHermesEnabledInThisVariant &&
+          !useThirdPartyJSC &&
+          rootProject.name != "react-native-github"
+  ) {
     showJSCRemovalMessage(project)
   }
 

packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/internal/PrivateReactExtension.kt

@@ -39,12 +39,15 @@ abstract class PrivateReactExtension @Inject constructor(project: Project) {
               //   - We're inside a user project, so inside the ./android folder. Default should be
               // ../
               // User can always override this default by setting a `root =` inside the template.
-              if (project.rootProject.name == "react-native-github" ||
-                  project.rootProject.name == "react-native-build-from-source") {
+              if (
+                  project.rootProject.name == "react-native-github" ||
+                      project.rootProject.name == "react-native-build-from-source"
+              ) {
                 project.rootProject.layout.projectDirectory.dir("../../")
               } else {
                 project.rootProject.layout.projectDirectory.dir("../")
-              })
+              }
+          )
 
   val reactNativeDir: DirectoryProperty =
       objects.directoryProperty().convention(root.dir("node_modules/react-native"))

packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GenerateAutolinkingNewArchitecturesFileTask.kt

@@ -165,88 +165,88 @@ abstract class GenerateAutolinkingNewArchitecturesFileTask : DefaultTask() {
     // language=cmake
     val CMAKE_TEMPLATE =
         """
-      # This code was generated by [React Native](https://www.npmjs.com/package/@react-native/gradle-plugin)
-      cmake_minimum_required(VERSION 3.13)
-      set(CMAKE_VERBOSE_MAKEFILE on)
-      
-      # We set REACTNATIVE_MERGED_SO so libraries/apps can selectively decide to depend on either libreactnative.so
-      # or link against a old prefab target (this is needed for React Native 0.76 on).
-      set(REACTNATIVE_MERGED_SO true)
-      
-      {{ libraryIncludes }}
-      
-      set(AUTOLINKED_LIBRARIES
-        {{ libraryModules }}
-      )
-      """
+        # This code was generated by [React Native](https://www.npmjs.com/package/@react-native/gradle-plugin)
+        cmake_minimum_required(VERSION 3.13)
+        set(CMAKE_VERBOSE_MAKEFILE on)
+        
+        # We set REACTNATIVE_MERGED_SO so libraries/apps can selectively decide to depend on either libreactnative.so
+        # or link against a old prefab target (this is needed for React Native 0.76 on).
+        set(REACTNATIVE_MERGED_SO true)
+        
+        {{ libraryIncludes }}
+        
+        set(AUTOLINKED_LIBRARIES
+          {{ libraryModules }}
+        )
+        """
             .trimIndent()
 
     // language=cpp
     val CPP_TEMPLATE =
         """
-      /**
-       * This code was generated by [React Native](https://www.npmjs.com/package/@react-native/gradle-plugin).
-       *
-       * Do not edit this file as changes may cause incorrect behavior and will be lost
-       * once the code is regenerated.
-       *
-       */
-      
-      #include "autolinking.h"
-      {{ autolinkingCppIncludes }}
-      
-      namespace facebook {
-      namespace react {
-      
-      std::shared_ptr<TurboModule> autolinking_ModuleProvider(const std::string moduleName, const JavaTurboModule::InitParams &params) {
-      {{ autolinkingCppTurboModuleJavaProviders }}
-        return nullptr;
-      }
-      
-      std::shared_ptr<TurboModule> autolinking_cxxModuleProvider(const std::string moduleName, const std::shared_ptr<CallInvoker>& jsInvoker) {
-      {{ autolinkingCppTurboModuleCxxProviders }}
-        return nullptr;
-      }
-      
-      void autolinking_registerProviders(std::shared_ptr<ComponentDescriptorProviderRegistry const> providerRegistry) {
-      {{ autolinkingCppComponentDescriptors }}
-        return;
-      }
-      
-      } // namespace react
-      } // namespace facebook
-      """
+        /**
+         * This code was generated by [React Native](https://www.npmjs.com/package/@react-native/gradle-plugin).
+         *
+         * Do not edit this file as changes may cause incorrect behavior and will be lost
+         * once the code is regenerated.
+         *
+         */
+        
+        #include "autolinking.h"
+        {{ autolinkingCppIncludes }}
+        
+        namespace facebook {
+        namespace react {
+        
+        std::shared_ptr<TurboModule> autolinking_ModuleProvider(const std::string moduleName, const JavaTurboModule::InitParams &params) {
+        {{ autolinkingCppTurboModuleJavaProviders }}
+          return nullptr;
+        }
+        
+        std::shared_ptr<TurboModule> autolinking_cxxModuleProvider(const std::string moduleName, const std::shared_ptr<CallInvoker>& jsInvoker) {
+        {{ autolinkingCppTurboModuleCxxProviders }}
+          return nullptr;
+        }
+        
+        void autolinking_registerProviders(std::shared_ptr<ComponentDescriptorProviderRegistry const> providerRegistry) {
+        {{ autolinkingCppComponentDescriptors }}
+          return;
+        }
+        
+        } // namespace react
+        } // namespace facebook
+        """
             .trimIndent()
 
     // language=cpp
     val hTemplate =
         """
-      /**
-       * This code was generated by [React Native](https://www.npmjs.com/package/@react-native/gradle-plugin).
-       *
-       * Do not edit this file as changes may cause incorrect behavior and will be lost
-       * once the code is regenerated.
-       *
-       */
-      
-      #pragma once
-      
-      #include <ReactCommon/CallInvoker.h>
-      #include <ReactCommon/JavaTurboModule.h>
-      #include <ReactCommon/TurboModule.h>
-      #include <jsi/jsi.h>
-      #include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
-      
-      namespace facebook {
-      namespace react {
-      
-      std::shared_ptr<TurboModule> autolinking_ModuleProvider(const std::string moduleName, const JavaTurboModule::InitParams &params);
-      std::shared_ptr<TurboModule> autolinking_cxxModuleProvider(const std::string moduleName, const std::shared_ptr<CallInvoker>& jsInvoker);
-      void autolinking_registerProviders(std::shared_ptr<ComponentDescriptorProviderRegistry const> providerRegistry);
-      
-      } // namespace react
-      } // namespace facebook
-      """
+        /**
+         * This code was generated by [React Native](https://www.npmjs.com/package/@react-native/gradle-plugin).
+         *
+         * Do not edit this file as changes may cause incorrect behavior and will be lost
+         * once the code is regenerated.
+         *
+         */
+        
+        #pragma once
+        
+        #include <ReactCommon/CallInvoker.h>
+        #include <ReactCommon/JavaTurboModule.h>
+        #include <ReactCommon/TurboModule.h>
+        #include <jsi/jsi.h>
+        #include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+        
+        namespace facebook {
+        namespace react {
+        
+        std::shared_ptr<TurboModule> autolinking_ModuleProvider(const std::string moduleName, const JavaTurboModule::InitParams &params);
+        std::shared_ptr<TurboModule> autolinking_cxxModuleProvider(const std::string moduleName, const std::shared_ptr<CallInvoker>& jsInvoker);
+        void autolinking_registerProviders(std::shared_ptr<ComponentDescriptorProviderRegistry const> providerRegistry);
+        
+        } // namespace react
+        } // namespace facebook
+        """
             .trimIndent()
   }
 }

packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GenerateCodegenArtifactsTask.kt

@@ -82,6 +82,7 @@ abstract class GenerateCodegenArtifactsTask : Exec() {
             libraryName,
             "--javaPackageName",
             codegenJavaPackageName,
-        ))
+        )
+    )
   }
 }

packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GenerateCodegenSchemaTask.kt

@@ -69,6 +69,7 @@ abstract class GenerateCodegenSchemaTask : Exec() {
             "NativeSampleTurboModule",
             generatedSchemaFile.get().asFile.cliPath(workingDir),
             jsRootDir.asFile.get().cliPath(workingDir),
-        ))
+        )
+    )
   }
 }