Skip to content

Commit 81972dd

Browse files
joshafeinbergjoshafeinberg
authored
Enable ktlint (#241)
1 parent ae16557 commit 81972dd

27 files changed

+138
-129
lines changed

‎affectedmoduledetector/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ plugins {
33
id 'kotlin'
44
id 'java-gradle-plugin'
55
id "com.vanniktech.maven.publish"
6+
id "org.jlleitschuh.gradle.ktlint"
67
}
78

89
apply from: rootProject.file("gradle/jacoco.gradle")

‎affectedmoduledetector/src/main/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleConfiguration.kt‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -82,23 +82,23 @@ class AffectedModuleConfiguration {
8282
var specifiedBranch: String? = null
8383

8484
var compareFrom: String = "PreviousCommit"
85-
set(value) {
86-
val commitShaProviders = listOf(
87-
"PreviousCommit",
88-
"ForkCommit",
89-
"SpecifiedBranchCommit",
90-
"SpecifiedBranchCommitMergeBase"
91-
)
92-
require(commitShaProviders.contains(value)) {
93-
"The property configuration compareFrom must be one of the following: ${commitShaProviders.joinToString(", ")}"
94-
}
95-
if (value == "SpecifiedBranchCommit" || value == "SpecifiedBranchCommitMergeBase") {
96-
requireNotNull(specifiedBranch) {
97-
"Specify a branch using the configuration specifiedBranch"
85+
set(value) {
86+
val commitShaProviders = listOf(
87+
"PreviousCommit",
88+
"ForkCommit",
89+
"SpecifiedBranchCommit",
90+
"SpecifiedBranchCommitMergeBase"
91+
)
92+
require(commitShaProviders.contains(value)) {
93+
"The property configuration compareFrom must be one of the following: ${commitShaProviders.joinToString(", ")}"
94+
}
95+
if (value == "SpecifiedBranchCommit" || value == "SpecifiedBranchCommitMergeBase") {
96+
requireNotNull(specifiedBranch) {
97+
"Specify a branch using the configuration specifiedBranch"
98+
}
9899
}
100+
field = value
99101
}
100-
field = value
101-
}
102102

103103
/**
104104
* A set of modules that will not be considered in the build process, even if changes are made in them.
@@ -130,4 +130,4 @@ class AffectedModuleConfiguration {
130130

131131
const val name = "affectedModuleDetector"
132132
}
133-
}
133+
}

‎affectedmoduledetector/src/main/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleDetector.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ abstract class AffectedModuleDetector {
119119
require(rootProject == rootProject.rootProject) {
120120
"Project provided must be root, project was ${rootProject.path}"
121121
}
122-
122+
123123
val enabled = isProjectEnabled(rootProject)
124124
if (!enabled) {
125125
setInstance(
@@ -380,7 +380,7 @@ class AffectedModuleDetectorImpl constructor(
380380
override fun hasAffectedProjects() = affectedProjects.isNotEmpty()
381381

382382
override fun isProjectProvided2(project: Project): Boolean {
383-
if(modules == null ) return true
383+
if (modules == null) return true
384384
return modules.contains(project.path)
385385
}
386386

‎affectedmoduledetector/src/main/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleDetectorPlugin.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ class AffectedModuleDetectorPlugin : Plugin<Project> {
178178
else -> AffectedModuleDetector.isProjectAffected(pathOrNull.project)
179179
}
180180

181-
if (onlyIf && AffectedModuleDetector.isProjectProvided(project) && !isExcludedModule(config, path)) {
181+
if (onlyIf && AffectedModuleDetector.isProjectProvided(project) && !isExcludedModule(config, path)) {
182182
task.dependsOn(path)
183183
}
184184
pathOrNull?.onlyIf { onlyIf }
@@ -223,7 +223,7 @@ class AffectedModuleDetectorPlugin : Plugin<Project> {
223223
}
224224

225225
private fun getPathAndTask(project: Project, task: String?): String? {
226-
return if (task.isNullOrBlank()) null else "${project.path}:${task}"
226+
return if (task.isNullOrBlank()) null else "${project.path}:$task"
227227
}
228228

229229
private fun filterAndroidTests(project: Project) {

‎affectedmoduledetector/src/main/kotlin/com/dropbox/affectedmoduledetector/AffectedTestConfiguration.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ package com.dropbox.affectedmoduledetector
88
*/
99
open class AffectedTestConfiguration {
1010

11-
var assembleAndroidTestTask : String? = DEFAULT_ASSEMBLE_ANDROID_TEST_TASK
12-
var runAndroidTestTask : String? = DEFAULT_ANDROID_TEST_TASK
13-
var jvmTestTask : String? = DEFAULT_JVM_TEST_TASK
11+
var assembleAndroidTestTask: String? = DEFAULT_ASSEMBLE_ANDROID_TEST_TASK
12+
var runAndroidTestTask: String? = DEFAULT_ANDROID_TEST_TASK
13+
var jvmTestTask: String? = DEFAULT_JVM_TEST_TASK
1414

1515
companion object {
1616
const val name = "affectedTestConfiguration"
@@ -20,4 +20,4 @@ open class AffectedTestConfiguration {
2020
internal const val DEFAULT_ASSEMBLE_ANDROID_TEST_TASK = "assembleDebugAndroidTest"
2121
internal const val DEFAULT_ANDROID_TEST_TASK = "connectedDebugAndroidTest"
2222
}
23-
}
23+
}

‎affectedmoduledetector/src/main/kotlin/com/dropbox/affectedmoduledetector/DependencyTracker.kt‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,16 @@ class DependencyTracker constructor(
3939
project.configurations.forEach { config ->
4040
logger?.info("checking config ${project.path}/$config for dependencies")
4141
config
42-
.dependencies
43-
.filterIsInstance(ProjectDependency::class.java)
44-
.forEach {
45-
logger?.info("there is a dependency from ${project.path} to " +
46-
it.dependencyProject.path)
47-
result.getOrPut(it.dependencyProject) { mutableSetOf() }
48-
.add(project)
49-
}
42+
.dependencies
43+
.filterIsInstance(ProjectDependency::class.java)
44+
.forEach {
45+
logger?.info(
46+
"there is a dependency from ${project.path} to " +
47+
it.dependencyProject.path
48+
)
49+
result.getOrPut(it.dependencyProject) { mutableSetOf() }
50+
.add(project)
51+
}
5052
}
5153
}
5254
result
@@ -61,9 +63,11 @@ class DependencyTracker constructor(
6163
}
6264
}
6365
addAllDependents(project)
64-
logger?.info("dependents of ${project.path} is ${result.map {
65-
it.path
66-
}}")
66+
logger?.info(
67+
"dependents of ${project.path} is ${result.map {
68+
it.path
69+
}}"
70+
)
6771
// the project isn't a dependent of itself
6872
return result.minus(project)
6973
}

‎affectedmoduledetector/src/main/kotlin/com/dropbox/affectedmoduledetector/GitClient.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ internal class GitClientImpl(
9797
return ignoredFiles
9898
.orEmpty()
9999
.map { it.toRegex() }
100-
.foldRight(changedFiles){ignoredFileRegex: Regex, fileList: List<String> ->
100+
.foldRight(changedFiles) { ignoredFileRegex: Regex, fileList: List<String> ->
101101
fileList.filterNot { it.matches(ignoredFileRegex) }
102102
}
103103
}
@@ -220,4 +220,4 @@ data class Commit(
220220
private val commitSHADelimiter: String = "_CommitSHA:",
221221
private val subjectDelimiter: String = "_Subject:",
222222
private val authorEmailDelimiter: String = "_Author:"
223-
)
223+
)

‎affectedmoduledetector/src/main/kotlin/com/dropbox/affectedmoduledetector/InternalTaskType.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ internal enum class InternalTaskType(
44
override val commandByImpact: String,
55
override val originalGradleCommand: String,
66
override val taskDescription: String
7-
): AffectedModuleTaskType {
7+
) : AffectedModuleTaskType {
88

99
ANDROID_TEST(
1010
commandByImpact = "runAffectedAndroidTests",

‎affectedmoduledetector/src/main/kotlin/com/dropbox/affectedmoduledetector/ToStringLogger.kt‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,12 @@ import org.gradle.api.services.BuildServiceParameters
3131
import org.gradle.internal.build.event.BuildEventListenerRegistryInternal
3232
import org.gradle.internal.logging.slf4j.OutputEventListenerBackedLogger
3333
import org.gradle.internal.logging.slf4j.OutputEventListenerBackedLoggerContext
34-
import org.gradle.internal.operations.*
34+
import org.gradle.internal.operations.BuildOperationDescriptor
35+
import org.gradle.internal.operations.BuildOperationListener
36+
import org.gradle.internal.operations.OperationFinishEvent
37+
import org.gradle.internal.operations.OperationIdentifier
38+
import org.gradle.internal.operations.OperationProgressEvent
39+
import org.gradle.internal.operations.OperationStartEvent
3540
import org.gradle.internal.time.Clock
3641
import org.gradle.invocation.DefaultGradle
3742
import java.io.File
@@ -42,26 +47,25 @@ import java.io.File
4247
internal open class ToStringLogger(
4348
private val loggerProvider: Provider<ToStringLoggerBuildService>?
4449
) : OutputEventListenerBackedLogger(
45-
"amd",
46-
OutputEventListenerBackedLoggerContext {
47-
System.currentTimeMillis()
48-
}.also {
49-
it.level = LogLevel.DEBUG
50-
it.setOutputEventListener { outputEvent ->
51-
loggerProvider?.get()?.parameters?.getStringBuilderProperty()?.get()?.appendLine(outputEvent.toString())
52-
}
53-
},
54-
Clock {
55-
System.currentTimeMillis()
50+
"amd",
51+
OutputEventListenerBackedLoggerContext {
52+
System.currentTimeMillis()
53+
}.also {
54+
it.level = LogLevel.DEBUG
55+
it.setOutputEventListener { outputEvent ->
56+
loggerProvider?.get()?.parameters?.getStringBuilderProperty()?.get()?.appendLine(outputEvent.toString())
5657
}
58+
},
59+
Clock {
60+
System.currentTimeMillis()
61+
}
5762
) {
5863

5964
/**
6065
* Returns the current log.
6166
*/
6267
fun buildString() = loggerProvider?.get()?.parameters?.getStringBuilderProperty()?.get()?.toString()
6368

64-
@Suppress("UnstableApiUsage") // BuildService is not yet stable
6569
companion object {
6670
internal abstract class ToStringLoggerBuildService : BuildService<ToStringLoggerBuildService.ToStringLoggerBuildServiceParameters>, BuildOperationListener, AutoCloseable {
6771
interface ToStringLoggerBuildServiceParameters : BuildServiceParameters {

‎affectedmoduledetector/src/main/kotlin/com/dropbox/affectedmoduledetector/commitshaproviders/ForkCommit.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package com.dropbox.affectedmoduledetector.commitshaproviders
33
import com.dropbox.affectedmoduledetector.GitClient
44
import com.dropbox.affectedmoduledetector.Sha
55

6-
class ForkCommit: CommitShaProvider {
6+
class ForkCommit : CommitShaProvider {
77
override fun get(commandRunner: GitClient.CommandRunner): Sha {
88
val currentBranch = commandRunner.executeAndParseFirst(CURRENT_BRANCH_CMD)
99

@@ -25,4 +25,4 @@ class ForkCommit: CommitShaProvider {
2525
const val CURRENT_BRANCH_CMD = "git rev-parse --abbrev-ref HEAD"
2626
const val SHOW_ALL_BRANCHES_CMD = "git show-branch -a"
2727
}
28-
}
28+
}

0 commit comments

Comments
 (0)