Skip to content

Commit d302be5

Browse files
cortinicometa-codesync[bot]
authored andcommitted
Apply ktfmt 0.59.0 (#58468)
Summary: Pull Request resolved: #58468 Reformat the Kotlin and Kotlin Gradle sources with the npm-backed ktfmt 0.59.0 command after Arcanist formatting has been disabled for OSS-exported sources. Changelog: [Internal] Reviewed By: javache Differential Revision: D119504762 fbshipit-source-id: 8a594f04ad72bd2d42baa49e578a4b0fa926b6bf
1 parent 30b4c7e commit d302be5

113 files changed

Lines changed: 3173 additions & 2962 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

packages/gradle-plugin/build.gradle.kts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
plugins {
9-
alias(libs.plugins.kotlin.jvm).apply(false)
10-
}
8+
plugins { alias(libs.plugins.kotlin.jvm).apply(false) }
119

1210
tasks.register("build") {
1311
dependsOn(

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

Lines changed: 46 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -200,42 +200,44 @@ class ReactPlugin : Plugin<Project> {
200200
}
201201

202202
// We create the tasks to produce schema from JS files and generate artifacts from schema.
203-
val generateCodegenArtifactsTask = registerCodegenTasks(
204-
project = project,
205-
rootExtension = rootExtension,
206-
generatedSrcDir = generatedSrcDir,
207-
packageJsonFile = { findPackageJsonFile(project, rootExtension.root) },
208-
schemaTaskName = "generateCodegenSchemaFromJavaScript",
209-
artifactsTaskName = "generateCodegenArtifactsFromSchema",
210-
configureJsRoot = { task, packageJson ->
211-
// We're reading the package.json at configuration time to properly feed
212-
// the `jsRootDir` @Input property of this task & the onlyIf. Therefore, the
213-
// parsePackageJson should be invoked inside this lambda.
214-
val parsedPackageJson = packageJson?.let { JsonUtils.fromPackageJson(it) }
215-
val jsSrcsDirInPackageJson = parsedPackageJson?.codegenConfig?.jsSrcsDir
216-
217-
if (packageJson != null && jsSrcsDirInPackageJson != null) {
218-
task.jsRootDir.set(File(packageJson.parentFile, jsSrcsDirInPackageJson))
219-
} else {
220-
task.jsRootDir.set(localExtension.jsRootDir)
221-
}
222-
},
223-
configureCodegenArtifacts = { task, _ ->
224-
task.codegenJavaPackageName.set(localExtension.codegenJavaPackageName)
225-
task.libraryName.set(localExtension.libraryName)
226-
},
227-
onlyIf = { packageJson ->
228-
// Please note that needsCodegenFromPackageJson is triggering a read of the
229-
// package.json at configuration time as we need to feed the onlyIf condition of this
230-
// task. Therefore, needsCodegenFromPackageJson needs to be invoked inside this
231-
// lambda.
232-
val needsCodegenFromPackageJson = project.needsCodegenFromPackageJson(rootExtension.root)
233-
val parsedPackageJson = packageJson?.let { JsonUtils.fromPackageJson(it) }
234-
val includesGeneratedCode =
235-
parsedPackageJson?.codegenConfig?.includesGeneratedCode ?: false
236-
(isLibrary || needsCodegenFromPackageJson) && !includesGeneratedCode
237-
},
238-
)
203+
val generateCodegenArtifactsTask =
204+
registerCodegenTasks(
205+
project = project,
206+
rootExtension = rootExtension,
207+
generatedSrcDir = generatedSrcDir,
208+
packageJsonFile = { findPackageJsonFile(project, rootExtension.root) },
209+
schemaTaskName = "generateCodegenSchemaFromJavaScript",
210+
artifactsTaskName = "generateCodegenArtifactsFromSchema",
211+
configureJsRoot = { task, packageJson ->
212+
// We're reading the package.json at configuration time to properly feed
213+
// the `jsRootDir` @Input property of this task & the onlyIf. Therefore, the
214+
// parsePackageJson should be invoked inside this lambda.
215+
val parsedPackageJson = packageJson?.let { JsonUtils.fromPackageJson(it) }
216+
val jsSrcsDirInPackageJson = parsedPackageJson?.codegenConfig?.jsSrcsDir
217+
218+
if (packageJson != null && jsSrcsDirInPackageJson != null) {
219+
task.jsRootDir.set(File(packageJson.parentFile, jsSrcsDirInPackageJson))
220+
} else {
221+
task.jsRootDir.set(localExtension.jsRootDir)
222+
}
223+
},
224+
configureCodegenArtifacts = { task, _ ->
225+
task.codegenJavaPackageName.set(localExtension.codegenJavaPackageName)
226+
task.libraryName.set(localExtension.libraryName)
227+
},
228+
onlyIf = { packageJson ->
229+
// Please note that needsCodegenFromPackageJson is triggering a read of the
230+
// package.json at configuration time as we need to feed the onlyIf condition of this
231+
// task. Therefore, needsCodegenFromPackageJson needs to be invoked inside this
232+
// lambda.
233+
val needsCodegenFromPackageJson =
234+
project.needsCodegenFromPackageJson(rootExtension.root)
235+
val parsedPackageJson = packageJson?.let { JsonUtils.fromPackageJson(it) }
236+
val includesGeneratedCode =
237+
parsedPackageJson?.codegenConfig?.includesGeneratedCode ?: false
238+
(isLibrary || needsCodegenFromPackageJson) && !includesGeneratedCode
239+
},
240+
)
239241

240242
// We update the android configuration to include the generated sources.
241243
// This is equivalent to this DSL:
@@ -353,13 +355,14 @@ class ReactPlugin : Plugin<Project> {
353355
project.rootProject.layout.buildDirectory.file("generated/autolinking/autolinking.json")
354356
val pureCxxDependencies =
355357
getPureCxxCodegenDependencies(rootGeneratedAutolinkingFile.get().asFile)
356-
val pureCxxCodegenTasks = configurePureCxxDependenciesCodegen(
357-
project,
358-
extension,
359-
rootExtension,
360-
generatedPureCxxSourceDir,
361-
pureCxxDependencies,
362-
)
358+
val pureCxxCodegenTasks =
359+
configurePureCxxDependenciesCodegen(
360+
project,
361+
extension,
362+
rootExtension,
363+
generatedPureCxxSourceDir,
364+
pureCxxDependencies,
365+
)
363366

364367
// We add a task called generateAutolinkingPackageList to do not clash with the existing task
365368
// called generatePackageList. This can to be renamed once we unlink the rn <-> cli

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,13 @@ abstract class BundleHermesCTask : DefaultTask() {
109109

110110
val reactNativeDir = reactNativeDir.get().asFile
111111
val composeScriptFile = File(reactNativeDir, "scripts/compose-source-maps.js")
112-
val composeSourceMapsCommand = getComposeSourceMapsCommand(
113-
composeScriptFile,
114-
packagerSourceMap,
115-
compilerSourceMap,
116-
outputSourceMap,
117-
)
112+
val composeSourceMapsCommand =
113+
getComposeSourceMapsCommand(
114+
composeScriptFile,
115+
packagerSourceMap,
116+
compilerSourceMap,
117+
outputSourceMap,
118+
)
118119
runCommand(composeSourceMapsCommand)
119120
}
120121
}

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,7 @@ internal object AgpConfiguratorUtils {
122122
manifestFile
123123
.takeIf { it.exists() }
124124
?.let { file ->
125-
getPackageNameFromManifest(file)?.let { packageName ->
126-
ext.namespace = packageName
127-
}
125+
getPackageNameFromManifest(file)?.let { packageName -> ext.namespace = packageName }
128126
}
129127
}
130128
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,10 @@ internal object DependencyUtils {
145145
}
146146
if (!coordinates.hermesVersionString.isMavenArtifactVersionPublished()) {
147147
setOf(
148-
DEFAULT_INTERNAL_REACT_PUBLISHING_GROUP,
149-
DEFAULT_INTERNAL_HERMES_PUBLISHING_GROUP,
150-
coordinates.hermesGroupString,
151-
)
148+
DEFAULT_INTERNAL_REACT_PUBLISHING_GROUP,
149+
DEFAULT_INTERNAL_HERMES_PUBLISHING_GROUP,
150+
coordinates.hermesGroupString,
151+
)
152152
.forEach { group ->
153153
content.excludeVersion(group, "hermes-engine", UNPUBLISHED_MAVEN_VERSION)
154154
content.excludeVersion(group, "hermes-android", UNPUBLISHED_MAVEN_VERSION)

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,12 @@ import org.gradle.api.file.DirectoryProperty
2828
internal fun detectedEntryFile(
2929
config: ReactExtension,
3030
envVariableOverride: String? = null,
31-
): File = detectEntryFile(
32-
entryFile = config.entryFile.orNull?.asFile,
33-
reactRoot = config.root.get().asFile,
34-
envVariableOverride = envVariableOverride,
35-
)
31+
): File =
32+
detectEntryFile(
33+
entryFile = config.entryFile.orNull?.asFile,
34+
reactRoot = config.root.get().asFile,
35+
envVariableOverride = envVariableOverride,
36+
)
3637

3738
/**
3839
* Computes the CLI file for React Native. The Algo follows this order:
@@ -41,11 +42,12 @@ internal fun detectedEntryFile(
4142
* 3. The `node_modules/react-native/cli.js` file if exists
4243
* 4. Fails otherwise
4344
*/
44-
internal fun detectedCliFile(config: ReactExtension): File = detectCliFile(
45-
project = config.project,
46-
reactNativeRoot = config.root.get().asFile,
47-
preconfiguredCliFile = config.cliFile.asFile.orNull,
48-
)
45+
internal fun detectedCliFile(config: ReactExtension): File =
46+
detectCliFile(
47+
project = config.project,
48+
reactNativeRoot = config.root.get().asFile,
49+
preconfiguredCliFile = config.cliFile.asFile.orNull,
50+
)
4951

5052
/**
5153
* Computes the `hermesc` command location. The Algo follows this order:

0 commit comments

Comments
 (0)