Skip to content

Commit 510f258

Browse files
dconeybedconeybe
committed
ktlint format the code in dataconnect/buildSrc by running ./gradlew ktlintCheck
1 parent 1fce124 commit 510f258

File tree

7 files changed

+215
-215
lines changed

7 files changed

+215
-215
lines changed

‎dataconnect/buildSrc/src/main/kotlin/com/google/firebase/example/dataconnect/gradle/CodegenTask.kt

+34-34
Original file line numberDiff line numberDiff line change
@@ -28,48 +28,48 @@ import org.gradle.api.tasks.TaskAction
2828

2929
abstract class CodegenTask : DefaultTask() {
3030

31-
@get:InputDirectory abstract val dataConnectConfigDir: DirectoryProperty
31+
@get:InputDirectory abstract val dataConnectConfigDir: DirectoryProperty
3232

33-
@get:InputFile abstract val firebaseExecutable: RegularFileProperty
33+
@get:InputFile abstract val firebaseExecutable: RegularFileProperty
3434

35-
@get:OutputDirectory abstract val outputDirectory: DirectoryProperty
35+
@get:OutputDirectory abstract val outputDirectory: DirectoryProperty
3636

37-
@get:Internal abstract val tweakedDataConnectConfigDir: DirectoryProperty
37+
@get:Internal abstract val tweakedDataConnectConfigDir: DirectoryProperty
3838

39-
@TaskAction
40-
fun run() {
41-
val dataConnectConfigDir = dataConnectConfigDir.get().asFile
42-
val firebaseExecutable = firebaseExecutable.get().asFile
43-
val outputDirectory = outputDirectory.get().asFile
44-
val tweakedDataConnectConfigDir = tweakedDataConnectConfigDir.get().asFile
39+
@TaskAction
40+
fun run() {
41+
val dataConnectConfigDir = dataConnectConfigDir.get().asFile
42+
val firebaseExecutable = firebaseExecutable.get().asFile
43+
val outputDirectory = outputDirectory.get().asFile
44+
val tweakedDataConnectConfigDir = tweakedDataConnectConfigDir.get().asFile
4545

46-
logger.info("dataConnectConfigDir: {}", dataConnectConfigDir)
47-
logger.info("firebaseExecutable: {}", firebaseExecutable)
48-
logger.info("outputDirectory: {}", outputDirectory)
49-
logger.info("tweakedDataConnectConfigDir: {}", tweakedDataConnectConfigDir)
46+
logger.info("dataConnectConfigDir: {}", dataConnectConfigDir)
47+
logger.info("firebaseExecutable: {}", firebaseExecutable)
48+
logger.info("outputDirectory: {}", outputDirectory)
49+
logger.info("tweakedDataConnectConfigDir: {}", tweakedDataConnectConfigDir)
5050

51-
project.delete(outputDirectory)
52-
project.delete(tweakedDataConnectConfigDir)
53-
project.mkdir(tweakedDataConnectConfigDir)
51+
project.delete(outputDirectory)
52+
project.delete(tweakedDataConnectConfigDir)
53+
project.mkdir(tweakedDataConnectConfigDir)
5454

55-
project.copy {
56-
from(dataConnectConfigDir)
57-
into(tweakedDataConnectConfigDir)
58-
}
59-
tweakConnectorYamlFiles(tweakedDataConnectConfigDir, outputDirectory.absolutePath)
55+
project.copy {
56+
from(dataConnectConfigDir)
57+
into(tweakedDataConnectConfigDir)
58+
}
59+
tweakConnectorYamlFiles(tweakedDataConnectConfigDir, outputDirectory.absolutePath)
6060

61-
runCommand(File(tweakedDataConnectConfigDir, "generate.log.txt")) {
62-
commandLine(firebaseExecutable.absolutePath, "--debug", "dataconnect:sdk:generate")
63-
// Specify a fake project because dataconnect:sdk:generate unnecessarily
64-
// requires one. The actual value does not matter.
65-
args("--project", "zzyzx")
66-
workingDir(tweakedDataConnectConfigDir)
61+
runCommand(File(tweakedDataConnectConfigDir, "generate.log.txt")) {
62+
commandLine(firebaseExecutable.absolutePath, "--debug", "dataconnect:sdk:generate")
63+
// Specify a fake project because dataconnect:sdk:generate unnecessarily
64+
// requires one. The actual value does not matter.
65+
args("--project", "zzyzx")
66+
workingDir(tweakedDataConnectConfigDir)
67+
}
6768
}
68-
}
6969

70-
internal fun configureFrom(providers: MyVariantProviders) {
71-
dataConnectConfigDir.set(providers.dataConnectConfigDir)
72-
firebaseExecutable.set(providers.firebaseExecutable)
73-
tweakedDataConnectConfigDir.set(providers.buildDirectory.map { it.dir("config") })
74-
}
70+
internal fun configureFrom(providers: MyVariantProviders) {
71+
dataConnectConfigDir.set(providers.dataConnectConfigDir)
72+
firebaseExecutable.set(providers.firebaseExecutable)
73+
tweakedDataConnectConfigDir.set(providers.buildDirectory.map { it.dir("config") })
74+
}
7575
}

‎dataconnect/buildSrc/src/main/kotlin/com/google/firebase/example/dataconnect/gradle/Commands.kt

+16-16
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,22 @@ import org.gradle.api.Task
2121
import org.gradle.process.ExecSpec
2222

2323
internal fun Task.runCommand(logFile: File, configure: ExecSpec.() -> Unit) {
24-
val effectiveLogFile = if (logger.isInfoEnabled) null else logFile
25-
val result =
26-
effectiveLogFile?.outputStream().use { logStream ->
27-
project.runCatching {
28-
exec {
29-
isIgnoreExitValue = false
30-
if (logStream !== null) {
31-
standardOutput = logStream
32-
errorOutput = logStream
33-
}
34-
configure(this)
24+
val effectiveLogFile = if (logger.isInfoEnabled) null else logFile
25+
val result =
26+
effectiveLogFile?.outputStream().use { logStream ->
27+
project.runCatching {
28+
exec {
29+
isIgnoreExitValue = false
30+
if (logStream !== null) {
31+
standardOutput = logStream
32+
errorOutput = logStream
33+
}
34+
configure(this)
35+
}
36+
}
3537
}
36-
}
38+
result.onFailure { exception ->
39+
effectiveLogFile?.let { logger.warn("{}", it.readText()) }
40+
throw exception
3741
}
38-
result.onFailure { exception ->
39-
effectiveLogFile?.let { logger.warn("{}", it.readText()) }
40-
throw exception
41-
}
4242
}

‎dataconnect/buildSrc/src/main/kotlin/com/google/firebase/example/dataconnect/gradle/ConnectorYamlTweaking.kt

+52-52
Original file line numberDiff line numberDiff line change
@@ -22,68 +22,68 @@ import org.gradle.api.Task
2222
import org.yaml.snakeyaml.Yaml
2323

2424
internal fun Task.tweakConnectorYamlFiles(dir: File, newOutputDir: String) {
25-
logger.info("Tweaking connector.yaml files in {}", dir.absolutePath)
26-
dir.walk().forEach { file ->
27-
if (file.isFile && file.name == "connector.yaml") {
28-
tweakConnectorYamlFile(file, newOutputDir)
29-
} else {
30-
logger.debug("skipping file: {}", file.absolutePath)
25+
logger.info("Tweaking connector.yaml files in {}", dir.absolutePath)
26+
dir.walk().forEach { file ->
27+
if (file.isFile && file.name == "connector.yaml") {
28+
tweakConnectorYamlFile(file, newOutputDir)
29+
} else {
30+
logger.debug("skipping file: {}", file.absolutePath)
31+
}
3132
}
32-
}
3333
}
3434

3535
internal fun Task.tweakConnectorYamlFile(file: File, newOutputDir: String) {
36-
logger.info("Tweaking connector.yaml file: {}", file.absolutePath)
36+
logger.info("Tweaking connector.yaml file: {}", file.absolutePath)
3737

38-
fun Map<*, *>.withTweakedKotlinSdk() =
39-
filterKeys { it == "kotlinSdk" }
40-
.mapValues { (_, value) ->
41-
val kotlinSdkMap =
42-
value as? Map<*, *>
43-
?: throw GradleException(
44-
"Parsing ${file.absolutePath} failed: \"kotlinSdk\" is " +
45-
(if (value === null) "null" else value::class.qualifiedName) +
46-
", but expected ${Map::class.qualifiedName} " +
47-
"(error code m697s27yxn)"
48-
)
49-
kotlinSdkMap.mapValues { (key, value) ->
50-
if (key == "outputDir") {
51-
newOutputDir
52-
} else {
38+
fun Map<*, *>.withTweakedKotlinSdk() =
39+
filterKeys { it == "kotlinSdk" }
40+
.mapValues { (_, value) ->
41+
val kotlinSdkMap =
42+
value as? Map<*, *>
43+
?: throw GradleException(
44+
"Parsing ${file.absolutePath} failed: \"kotlinSdk\" is " +
45+
(if (value === null) "null" else value::class.qualifiedName) +
46+
", but expected ${Map::class.qualifiedName} " +
47+
"(error code m697s27yxn)"
48+
)
49+
kotlinSdkMap.mapValues { (key, value) ->
50+
if (key == "outputDir") {
51+
newOutputDir
52+
} else {
53+
value
54+
}
55+
}
56+
}
57+
58+
fun Map<*, *>.withTweakedGenerateNode() = mapValues { (key, value) ->
59+
if (key != "generate") {
5360
value
54-
}
61+
} else {
62+
val generateMap =
63+
value as? Map<*, *>
64+
?: throw GradleException(
65+
"Parsing ${file.absolutePath} failed: \"generate\" is " +
66+
(if (value === null) "null" else value::class.qualifiedName) +
67+
", but expected ${Map::class.qualifiedName} " +
68+
"(error code 9c2p857gq6)"
69+
)
70+
generateMap.withTweakedKotlinSdk()
5571
}
56-
}
57-
58-
fun Map<*, *>.withTweakedGenerateNode() = mapValues { (key, value) ->
59-
if (key != "generate") {
60-
value
61-
} else {
62-
val generateMap =
63-
value as? Map<*, *>
64-
?: throw GradleException(
65-
"Parsing ${file.absolutePath} failed: \"generate\" is " +
66-
(if (value === null) "null" else value::class.qualifiedName) +
67-
", but expected ${Map::class.qualifiedName} " +
68-
"(error code 9c2p857gq6)"
69-
)
70-
generateMap.withTweakedKotlinSdk()
7172
}
72-
}
7373

74-
val yaml = Yaml()
75-
val rootObject = file.reader(Charsets.UTF_8).use { reader -> yaml.load<Any?>(reader) }
74+
val yaml = Yaml()
75+
val rootObject = file.reader(Charsets.UTF_8).use { reader -> yaml.load<Any?>(reader) }
7676

77-
val rootMap =
78-
rootObject as? Map<*, *>
79-
?: throw GradleException(
80-
"Parsing ${file.absolutePath} failed: root is " +
81-
(if (rootObject === null) "null" else rootObject::class.qualifiedName) +
82-
", but expected ${Map::class.qualifiedName} " +
83-
"(error code 45dw8jx8jd)"
84-
)
77+
val rootMap =
78+
rootObject as? Map<*, *>
79+
?: throw GradleException(
80+
"Parsing ${file.absolutePath} failed: root is " +
81+
(if (rootObject === null) "null" else rootObject::class.qualifiedName) +
82+
", but expected ${Map::class.qualifiedName} " +
83+
"(error code 45dw8jx8jd)"
84+
)
8585

86-
val newRootMap = rootMap.withTweakedGenerateNode()
86+
val newRootMap = rootMap.withTweakedGenerateNode()
8787

88-
file.writer(Charsets.UTF_8).use { writer -> yaml.dump(newRootMap, writer) }
88+
file.writer(Charsets.UTF_8).use { writer -> yaml.dump(newRootMap, writer) }
8989
}

‎dataconnect/buildSrc/src/main/kotlin/com/google/firebase/example/dataconnect/gradle/DataConnectExtension.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ package com.google.firebase.example.dataconnect.gradle
1919
import java.io.File
2020

2121
interface DataConnectExtension {
22-
var firebaseToolsVersion: String?
23-
var dataConnectConfigDir: File?
22+
var firebaseToolsVersion: String?
23+
var dataConnectConfigDir: File?
2424
}

‎dataconnect/buildSrc/src/main/kotlin/com/google/firebase/example/dataconnect/gradle/DataConnectGradlePlugin.kt

+29-29
Original file line numberDiff line numberDiff line change
@@ -28,36 +28,36 @@ import org.gradle.kotlin.dsl.register
2828
@Suppress("unused")
2929
abstract class DataConnectGradlePlugin : Plugin<Project> {
3030

31-
override fun apply(project: Project) {
32-
project.extensions.create("dataconnect", DataConnectExtension::class.java)
33-
val providers = project.objects.newInstance<MyProjectProviders>()
34-
35-
project.tasks.register<FirebaseToolsSetupTask>("setupFirebaseToolsForDataConnect") {
36-
configureFrom(providers)
31+
override fun apply(project: Project) {
32+
project.extensions.create("dataconnect", DataConnectExtension::class.java)
33+
val providers = project.objects.newInstance<MyProjectProviders>()
34+
35+
project.tasks.register<FirebaseToolsSetupTask>("setupFirebaseToolsForDataConnect") {
36+
configureFrom(providers)
37+
}
38+
39+
val androidComponents = project.extensions.getByType<ApplicationAndroidComponentsExtension>()
40+
androidComponents.onVariants { variant ->
41+
val variantProviders = project.objects.newInstance<MyVariantProviders>(variant)
42+
registerVariantTasks(project, variant, variantProviders)
43+
}
3744
}
3845

39-
val androidComponents = project.extensions.getByType<ApplicationAndroidComponentsExtension>()
40-
androidComponents.onVariants { variant ->
41-
val variantProviders = project.objects.newInstance<MyVariantProviders>(variant)
42-
registerVariantTasks(project, variant, variantProviders)
46+
private fun registerVariantTasks(
47+
project: Project,
48+
variant: ApplicationVariant,
49+
providers: MyVariantProviders
50+
) {
51+
val variantNameTitleCase = variant.name.replaceFirstChar { it.titlecase(Locale.US) }
52+
53+
val generateCodeTask =
54+
project.tasks.register<CodegenTask>("generate${variantNameTitleCase}DataConnectSources") {
55+
configureFrom(providers)
56+
}
57+
58+
variant.sources.java!!.addGeneratedSourceDirectory(
59+
generateCodeTask,
60+
CodegenTask::outputDirectory
61+
)
4362
}
44-
}
45-
46-
private fun registerVariantTasks(
47-
project: Project,
48-
variant: ApplicationVariant,
49-
providers: MyVariantProviders,
50-
) {
51-
val variantNameTitleCase = variant.name.replaceFirstChar { it.titlecase(Locale.US) }
52-
53-
val generateCodeTask =
54-
project.tasks.register<CodegenTask>("generate${variantNameTitleCase}DataConnectSources") {
55-
configureFrom(providers)
56-
}
57-
58-
variant.sources.java!!.addGeneratedSourceDirectory(
59-
generateCodeTask,
60-
CodegenTask::outputDirectory,
61-
)
62-
}
6363
}

‎dataconnect/buildSrc/src/main/kotlin/com/google/firebase/example/dataconnect/gradle/FirebaseToolsSetupTask.kt

+23-23
Original file line numberDiff line numberDiff line change
@@ -29,36 +29,36 @@ import org.gradle.api.tasks.TaskAction
2929

3030
abstract class FirebaseToolsSetupTask : DefaultTask() {
3131

32-
@get:Input abstract val version: Property<String>
32+
@get:Input abstract val version: Property<String>
3333

34-
@get:OutputDirectory abstract val outputDirectory: DirectoryProperty
34+
@get:OutputDirectory abstract val outputDirectory: DirectoryProperty
3535

36-
@get:Internal
37-
val firebaseExecutable: Provider<RegularFile>
38-
get() = outputDirectory.map { it.file("node_modules/.bin/firebase") }
36+
@get:Internal
37+
val firebaseExecutable: Provider<RegularFile>
38+
get() = outputDirectory.map { it.file("node_modules/.bin/firebase") }
3939

40-
@TaskAction
41-
fun run() {
42-
val version: String = version.get()
43-
val outputDirectory: File = outputDirectory.get().asFile
40+
@TaskAction
41+
fun run() {
42+
val version: String = version.get()
43+
val outputDirectory: File = outputDirectory.get().asFile
4444

45-
logger.info("version: {}", version)
46-
logger.info("outputDirectory: {}", outputDirectory.absolutePath)
45+
logger.info("version: {}", version)
46+
logger.info("outputDirectory: {}", outputDirectory.absolutePath)
4747

48-
project.delete(outputDirectory)
49-
project.mkdir(outputDirectory)
48+
project.delete(outputDirectory)
49+
project.mkdir(outputDirectory)
5050

51-
val packageJsonFile = File(outputDirectory, "package.json")
52-
packageJsonFile.writeText("{}", Charsets.UTF_8)
51+
val packageJsonFile = File(outputDirectory, "package.json")
52+
packageJsonFile.writeText("{}", Charsets.UTF_8)
5353

54-
runCommand(File(outputDirectory, "install.log.txt")) {
55-
commandLine("npm", "install", "firebase-tools@$version")
56-
workingDir(outputDirectory)
54+
runCommand(File(outputDirectory, "install.log.txt")) {
55+
commandLine("npm", "install", "firebase-tools@$version")
56+
workingDir(outputDirectory)
57+
}
5758
}
58-
}
5959

60-
internal fun configureFrom(providers: MyProjectProviders) {
61-
version.set(providers.firebaseToolsVersion)
62-
outputDirectory.set(providers.buildDirectory.map { it.dir("firebase-tools") })
63-
}
60+
internal fun configureFrom(providers: MyProjectProviders) {
61+
version.set(providers.firebaseToolsVersion)
62+
outputDirectory.set(providers.buildDirectory.map { it.dir("firebase-tools") })
63+
}
6464
}

0 commit comments

Comments
 (0)