Skip to content

Commit 616237d

Browse files
rinekririnekri
committed
Fix ktlint and detekt issues
1 parent b943ae3 commit 616237d

File tree

26 files changed

+2515
-2081
lines changed

26 files changed

+2515
-2081
lines changed

‎build-conventions/src/main/groovy/kotlin-convention.gradle‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,16 @@ ktlint {
3636
disabledRules = ["import-ordering"]
3737
filter {
3838
include("**/kotlin/**")
39-
exclude { it.file.path.contains("generated") }
39+
exclude { it.file.path.contains("/generated/") }
40+
exclude { it.file.path.contains("/test/") }
4041
}
4142
}
4243

4344
detekt {
45+
source = files(
46+
"src/main/java",
47+
"src/main/kotlin"
48+
)
4449
config = files(rootProject.file("../config/detekt/detekt.yml"))
4550
ignoredBuildTypes = [ "release" ]
4651
}

‎plugin-build/plugin-foundation/src/main/java/ru/kode/android/build/publish/plugin/foundation/BuildPublishFoundationPlugin.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import ru.kode.android.build.publish.plugin.core.util.getCommon
2020
import ru.kode.android.build.publish.plugin.foundation.extension.BuildPublishFoundationExtension
2121
import ru.kode.android.build.publish.plugin.foundation.service.git.GitExecutorServicePlugin
2222
import ru.kode.android.build.publish.plugin.foundation.task.ChangelogTasksRegistrar
23+
import ru.kode.android.build.publish.plugin.foundation.task.DEFAULT_TAG_PATTERN
2324
import ru.kode.android.build.publish.plugin.foundation.task.DEFAULT_VERSION_CODE
2425
import ru.kode.android.build.publish.plugin.foundation.task.DEFAULT_VERSION_NAME
25-
import ru.kode.android.build.publish.plugin.foundation.task.DEFAULT_TAG_PATTERN
2626
import ru.kode.android.build.publish.plugin.foundation.task.GenerateChangelogTaskParams
2727
import ru.kode.android.build.publish.plugin.foundation.task.LastTagTaskParams
2828
import ru.kode.android.build.publish.plugin.foundation.task.PrintLastIncreasedTagTaskParams

‎plugin-build/plugin-foundation/src/main/java/ru/kode/android/build/publish/plugin/foundation/config/BuildTagPatternBuilder.kt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package ru.kode.android.build.publish.plugin.foundation.config
22

3-
import java.util.regex.Pattern
43
import org.gradle.api.GradleException
4+
import java.util.regex.Pattern
55

66
private const val BUILD_VERSION_REGEX_PART = "(\\d+)"
77
private const val BUILD_VARIANT_NAME_REGEX_PART = "%s"
@@ -78,18 +78,19 @@ class BuildTagPatternBuilder {
7878
/**
7979
* Builds the final regex template with validation
8080
*/
81+
@Suppress("TooGenericExceptionCaught", "ThrowsCount") // Need to handle all exceptions
8182
fun build(): String {
8283
val template = parts.joinToString("")
8384

8485
if (!template.contains(BUILD_VERSION_REGEX_PART)) {
8586
throw GradleException(
86-
"Tag pattern must contain a build version group (e.g. $BUILD_VERSION_REGEX_PART)"
87+
"Tag pattern must contain a build version group (e.g. $BUILD_VERSION_REGEX_PART)",
8788
)
8889
}
8990

9091
if (!template.contains(BUILD_VARIANT_NAME_REGEX_PART)) {
9192
throw GradleException(
92-
"Tag pattern must contain a build variant name group $BUILD_VARIANT_NAME_REGEX_PART"
93+
"Tag pattern must contain a build variant name group $BUILD_VARIANT_NAME_REGEX_PART",
9394
)
9495
}
9596

‎plugin-build/plugin-foundation/src/main/java/ru/kode/android/build/publish/plugin/foundation/task/TagTasksRegistrar.kt‎

Lines changed: 39 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -68,43 +68,52 @@ internal object TagTasksRegistrar {
6868
params: LastTagTaskParams,
6969
): LastTagTaskOutput {
7070
val lastBuildTag = project.registerGetLastTagTask(params)
71-
val versionCode = params.useVersionsFromTag
72-
.zip(params.useDefaultsForVersionsAsFallback) { useVersionsFromTag, useDefaultVersionsAsFallback ->
73-
useVersionsFromTag to useDefaultVersionsAsFallback
74-
}.flatMap { (useVersionsFromTag, useDefaultVersionsAsFallback) ->
75-
when {
76-
useVersionsFromTag -> lastBuildTag.map { mapToVersionCode(it.asFile) }
77-
useDefaultVersionsAsFallback -> project.provider { DEFAULT_VERSION_CODE }
78-
else -> project.provider { null }
71+
val versionCode =
72+
params.useVersionsFromTag
73+
.zip(
74+
params.useDefaultsForVersionsAsFallback
75+
) { useVersionsFromTag, useDefaultVersionsAsFallback ->
76+
useVersionsFromTag to useDefaultVersionsAsFallback
7977
}
80-
}
81-
82-
val apkOutputFileName = params.useVersionsFromTag.flatMap { useVersionsFromTag ->
83-
if (useVersionsFromTag) {
84-
params.baseFileName.zip(lastBuildTag) { baseFileName, tagBuildFile ->
85-
mapToOutputApkFileName(tagBuildFile.asFile, params.apkOutputFileName, baseFileName)
78+
.flatMap { (useVersionsFromTag, useDefaultVersionsAsFallback) ->
79+
when {
80+
useVersionsFromTag -> lastBuildTag.map { mapToVersionCode(it.asFile) }
81+
useDefaultVersionsAsFallback -> project.provider { DEFAULT_VERSION_CODE }
82+
else -> project.provider { null }
83+
}
8684
}
87-
} else {
88-
params.baseFileName.map { baseFileName ->
89-
createDefaultOutputFileName(baseFileName, params.apkOutputFileName)
85+
86+
val apkOutputFileName =
87+
params.useVersionsFromTag.flatMap { useVersionsFromTag ->
88+
if (useVersionsFromTag) {
89+
params.baseFileName.zip(lastBuildTag) { baseFileName, tagBuildFile ->
90+
mapToOutputApkFileName(tagBuildFile.asFile, params.apkOutputFileName, baseFileName)
91+
}
92+
} else {
93+
params.baseFileName.map { baseFileName ->
94+
createDefaultOutputFileName(baseFileName, params.apkOutputFileName)
95+
}
9096
}
9197
}
92-
}
93-
val versionName = params.useVersionsFromTag
94-
.zip(params.useDefaultsForVersionsAsFallback) { useVersionsFromTag, useDefaultVersionsAsFallback ->
95-
useVersionsFromTag to useDefaultVersionsAsFallback
96-
}.flatMap { (useVersionsFromTag, useDefaultVersionsAsFallback) ->
97-
when {
98-
useVersionsFromTag -> {
99-
lastBuildTag.map { tagBuildFile ->
100-
mapToVersionName(tagBuildFile.asFile, params.buildVariant)
98+
val versionName =
99+
params.useVersionsFromTag
100+
.zip(
101+
params.useDefaultsForVersionsAsFallback
102+
) { useVersionsFromTag, useDefaultVersionsAsFallback ->
103+
useVersionsFromTag to useDefaultVersionsAsFallback
104+
}
105+
.flatMap { (useVersionsFromTag, useDefaultVersionsAsFallback) ->
106+
when {
107+
useVersionsFromTag -> {
108+
lastBuildTag.map { tagBuildFile ->
109+
mapToVersionName(tagBuildFile.asFile, params.buildVariant)
110+
}
101111
}
102-
}
103112

104-
useDefaultVersionsAsFallback -> project.provider { DEFAULT_VERSION_NAME }
105-
else -> project.provider { null }
113+
useDefaultVersionsAsFallback -> project.provider { DEFAULT_VERSION_NAME }
114+
else -> project.provider { null }
115+
}
106116
}
107-
}
108117

109118
return LastTagTaskOutput(
110119
versionName = versionName,

‎plugin-build/plugin-foundation/src/main/java/ru/kode/android/build/publish/plugin/foundation/task/tag/PrintLastIncreasedTag.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import org.gradle.api.tasks.TaskAction
88
import org.gradle.api.tasks.options.Option
99
import org.gradle.work.DisableCachingByDefault
1010
import ru.kode.android.build.publish.plugin.core.git.mapper.fromJson
11-
import ru.kode.android.build.publish.plugin.core.util.replaceLast
11+
import ru.kode.android.build.publish.plugin.core.util.replaceLast
1212

1313
/**
1414
* A Gradle task that prints the next incremented build tag based on the last build tag.

‎plugin-build/plugin-foundation/src/main/java/ru/kode/android/build/publish/plugin/foundation/task/tag/work/GenerateTagWork.kt‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import ru.kode.android.build.publish.plugin.core.enity.Tag
1010
import ru.kode.android.build.publish.plugin.core.git.mapper.toJson
1111
import ru.kode.android.build.publish.plugin.foundation.service.git.GitExecutorService
1212
import ru.kode.android.build.publish.plugin.foundation.task.DEFAULT_BUILD_VERSION
13-
import ru.kode.android.build.publish.plugin.foundation.task.DEFAULT_VERSION_CODE
14-
import ru.kode.android.build.publish.plugin.foundation.task.DEFAULT_TAG_COMMIT_SHA
1513
import ru.kode.android.build.publish.plugin.foundation.task.DEFAULT_TAG_COMMIT_MESSAGE
14+
import ru.kode.android.build.publish.plugin.foundation.task.DEFAULT_TAG_COMMIT_SHA
1615
import ru.kode.android.build.publish.plugin.foundation.task.DEFAULT_TAG_NAME
16+
import ru.kode.android.build.publish.plugin.foundation.task.DEFAULT_VERSION_CODE
1717
import javax.inject.Inject
1818

1919
/**
@@ -86,7 +86,7 @@ internal abstract class GenerateTagWork
8686
buildTag != null && isTagValid -> {
8787
logger.info(
8888
"Valid build tag '${buildTag.name}' found for '$buildVariant' " +
89-
"(build number: ${buildTag.buildNumber}). Generating tag build file..."
89+
"(build number: ${buildTag.buildNumber}). Generating tag build file...",
9090
)
9191
tagBuildOutput.writeText(buildTag.toJson())
9292
}
@@ -111,24 +111,25 @@ internal abstract class GenerateTagWork
111111

112112
logger.error(
113113
"Invalid build tag '${buildTag.name}' for '$buildVariant' — " +
114-
"build number (${buildTag.buildNumber}) < expected minimum ($DEFAULT_VERSION_CODE)."
114+
"build number (${buildTag.buildNumber}) < expected minimum ($DEFAULT_VERSION_CODE).",
115115
)
116116
throw GradleException(errorMessage)
117117
}
118118

119119
useStubsForTagAsFallback -> {
120-
val stubTag = Tag.Build(
121-
name = DEFAULT_TAG_NAME.format(buildVariant),
122-
commitSha = DEFAULT_TAG_COMMIT_SHA,
123-
message = DEFAULT_TAG_COMMIT_MESSAGE,
124-
buildVersion = DEFAULT_BUILD_VERSION,
125-
buildVariant = buildVariant,
126-
buildNumber = DEFAULT_VERSION_CODE,
127-
)
120+
val stubTag =
121+
Tag.Build(
122+
name = DEFAULT_TAG_NAME.format(buildVariant),
123+
commitSha = DEFAULT_TAG_COMMIT_SHA,
124+
message = DEFAULT_TAG_COMMIT_MESSAGE,
125+
buildVersion = DEFAULT_BUILD_VERSION,
126+
buildVariant = buildVariant,
127+
buildNumber = DEFAULT_VERSION_CODE,
128+
)
128129
tagBuildOutput.writeText(stubTag.toJson())
129130
logger.warn(
130131
"Using stub tag for build variant '$buildVariant' " +
131-
"because no valid tag was found using pattern '$buildTagPattern'."
132+
"because no valid tag was found using pattern '$buildTagPattern'.",
132133
)
133134
}
134135

@@ -156,7 +157,7 @@ internal abstract class GenerateTagWork
156157

157158
logger.error(
158159
"No build tag found for '$buildVariant' using pattern '$buildTagPattern'. " +
159-
"Stub tag generation disabled (`useStubsForTagAsFallback` = false)."
160+
"Stub tag generation disabled (`useStubsForTagAsFallback` = false).",
160161
)
161162
throw GradleException(errorMessage)
162163
}

0 commit comments

Comments
 (0)