Skip to content

Commit 955cebf

Browse files
rainxchzedrainxchzed
authored
Merge pull request #322 from OpenHub-Store/ktlint-format
2 parents 2bac18d + fd2468f commit 955cebf

File tree

385 files changed

+10509
-8888
lines changed

Some content is hidden

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

385 files changed

+10509
-8888
lines changed

‎.editorconfig‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
root = true
2+
3+
[*.{kt,kts}]
4+
ktlint_standard_filename = disabled
5+
ktlint_standard_no-wildcard-imports = disabled
6+
ktlint_function_naming_ignore_when_annotated_with = Composable

‎build-logic/convention/build.gradle.kts‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ dependencies {
1616

1717
implementation(libs.buildkonfig.gradlePlugin)
1818
implementation(libs.buildkonfig.compiler)
19+
20+
implementation(libs.ktlint.gradlePlugin)
1921
}
2022

2123
java {
@@ -70,5 +72,9 @@ gradlePlugin {
7072
id = "zed.rainxch.convention.room"
7173
implementationClass = "RoomConventionPlugin"
7274
}
75+
register("ktlint") {
76+
id = "zed.rainxch.convention.ktlint"
77+
implementationClass = "KtlintConventionPlugin"
78+
}
7379
}
74-
}
80+
}

‎build-logic/convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@ class AndroidApplicationComposeConventionPlugin : Plugin<Project> {
1010
with(pluginManager) {
1111
apply("zed.rainxch.convention.android.application")
1212
apply("org.jetbrains.kotlin.plugin.compose")
13+
apply("zed.rainxch.convention.ktlint")
1314
}
1415

1516
val commonExtension = extensions.getByType<ApplicationExtension>()
1617
configureAndroidCompose(commonExtension)
1718
}
1819
}
19-
}
20+
}

‎build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt‎

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,33 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
1414

1515
extensions.configure<ApplicationExtension> {
1616
namespace = "zed.rainxch.githubstore"
17-
compileSdk = libs.findVersion("projectCompileSdkVersion").get().toString().toInt()
17+
compileSdk =
18+
libs
19+
.findVersion("projectCompileSdkVersion")
20+
.get()
21+
.toString()
22+
.toInt()
1823

1924
defaultConfig {
2025
applicationId = libs.findVersion("projectApplicationId").get().toString()
21-
minSdk = libs.findVersion("projectMinSdkVersion").get().toString().toInt()
22-
targetSdk = libs.findVersion("projectTargetSdkVersion").get().toString().toInt()
23-
versionCode = libs.findVersion("projectVersionCode").get().toString().toInt()
26+
minSdk =
27+
libs
28+
.findVersion("projectMinSdkVersion")
29+
.get()
30+
.toString()
31+
.toInt()
32+
targetSdk =
33+
libs
34+
.findVersion("projectTargetSdkVersion")
35+
.get()
36+
.toString()
37+
.toInt()
38+
versionCode =
39+
libs
40+
.findVersion("projectVersionCode")
41+
.get()
42+
.toString()
43+
.toInt()
2444
versionName = libs.findVersion("projectVersionName").get().toString()
2545
}
2646
packaging {
@@ -35,7 +55,7 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
3555

3656
proguardFiles(
3757
getDefaultProguardFile("proguard-android-optimize.txt"),
38-
"proguard-rules.pro"
58+
"proguard-rules.pro",
3959
)
4060
}
4161
}
@@ -44,5 +64,4 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
4464
}
4565
}
4666
}
47-
48-
}
67+
}

‎build-logic/convention/src/main/kotlin/BuildKonfigConventionPlugin.kt‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,17 @@ class BuildKonfigConventionPlugin : Plugin<Project> {
1818
packageName = target.pathToPackageName()
1919

2020
defaultConfigs {
21-
val localProps = Properties().apply {
22-
val file = rootProject.file("local.properties")
23-
if (file.exists()) file.inputStream().use { this.load(it) }
24-
}
21+
val localProps =
22+
Properties().apply {
23+
val file = rootProject.file("local.properties")
24+
if (file.exists()) file.inputStream().use { this.load(it) }
25+
}
2526

26-
val githubClientId = (localProps.getProperty("GITHUB_CLIENT_ID")
27-
?: "Ov23linTY28VFpFjFiI9").trim()
27+
val githubClientId =
28+
(
29+
localProps.getProperty("GITHUB_CLIENT_ID")
30+
?: "Ov23linTY28VFpFjFiI9"
31+
).trim()
2832

2933
val versionName = libs.findVersion("projectVersionName").get().toString()
3034

@@ -34,4 +38,4 @@ class BuildKonfigConventionPlugin : Plugin<Project> {
3438
}
3539
}
3640
}
37-
}
41+
}

‎build-logic/convention/src/main/kotlin/CmpApplicationConventionPlugin.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ class CmpApplicationConventionPlugin : Plugin<Project> {
1919
configureJvmTarget()
2020

2121
dependencies {
22-
"debugImplementation"(libs.findLibrary("androidx-compose-ui-tooling").get( ))
22+
"debugImplementation"(libs.findLibrary("androidx-compose-ui-tooling").get())
2323
}
2424
}
2525
}
26-
}
26+
}

‎build-logic/convention/src/main/kotlin/CmpFeatureConventionPlugin.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ class CmpFeatureConventionPlugin : Plugin<Project> {
3636
}
3737
}
3838
}
39-
}
39+
}

‎build-logic/convention/src/main/kotlin/CmpLibraryConventionPlugin.kt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,4 @@ class CmpLibraryConventionPlugin : Plugin<Project> {
2323
}
2424
}
2525
}
26-
27-
28-
}
26+
}

‎build-logic/convention/src/main/kotlin/KmpLibraryConventionPlugin.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import zed.rainxch.githubstore.convention.pathToResourcePrefix
1111
class KmpLibraryConventionPlugin : Plugin<Project> {
1212
override fun apply(target: Project) {
1313
with(target) {
14-
with(pluginManager) {
14+
with(pluginManager) {
1515
apply("com.android.library")
1616
apply("org.jetbrains.kotlin.multiplatform")
1717
apply("org.jetbrains.kotlin.plugin.serialization")
@@ -32,4 +32,4 @@ class KmpLibraryConventionPlugin : Plugin<Project> {
3232
}
3333
}
3434
}
35-
}
35+
}

‎build-logic/convention/src/main/kotlin/KtlintConventionPlugin.kt‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
import org.gradle.api.Plugin
2+
import org.gradle.api.Project
3+
import org.jlleitschuh.gradle.ktlint.KtlintExtension
4+
5+
class KtlintConventionPlugin : Plugin<Project> {
6+
override fun apply(target: Project) {
7+
with(target) {
8+
pluginManager.apply("org.jlleitschuh.gradle.ktlint")
9+
10+
extensions.configure(KtlintExtension::class.java) {
11+
version.set("1.8.0")
12+
outputToConsole.set(true)
13+
ignoreFailures.set(true)
14+
filter {
15+
exclude("**/generated/**")
16+
exclude("**/build/**")
17+
exclude("**/*.g.kt")
18+
exclude("**/schemas/**")
19+
}
20+
reporters {
21+
reporter(org.jlleitschuh.gradle.ktlint.reporter.ReporterType.PLAIN)
22+
reporter(org.jlleitschuh.gradle.ktlint.reporter.ReporterType.HTML)
23+
}
24+
}
25+
}
26+
}
27+
}

0 commit comments

Comments
 (0)