Skip to content

Commit 7939ce5

Browse files
authored
chore: ignore extra translations and update detekt rules
* chore: ignore extra translations in lint Extra translations are removed automatically by Weblate * chore: update detekt rules More compose-friendly * chore: update lint baselines
1 parent b4a6f34 commit 7939ce5

6 files changed

Lines changed: 73 additions & 10 deletions

File tree

app/build.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,9 @@ android {
131131

132132
detekt {
133133
baseline = file("detekt-baseline.xml")
134+
config.setFrom("$rootDir/detekt.yml")
135+
buildUponDefaultConfig = true
136+
allRules = false
134137
}
135138

136139
dependencies {
@@ -141,4 +144,5 @@ dependencies {
141144

142145
implementation(libs.bundles.room)
143146
ksp(libs.androidx.room.compiler)
147+
detektPlugins(libs.compose.detekt)
144148
}

app/detekt-baseline.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,11 @@
1111
<ID>EmptyFunctionBlock:TasksAdapter.kt$TasksAdapter${}</ID>
1212
<ID>EmptyFunctionBlock:WidgetAdapter.kt$WidgetAdapter${}</ID>
1313
<ID>LargeClass:MainActivity.kt$MainActivity : SimpleActivity</ID>
14-
<ID>LongMethod:Context.kt$fun Context.backupNotes()</ID>
1514
<ID>MagicNumber:AutomaticBackupReceiver.kt$AutomaticBackupReceiver$3000</ID>
1615
<ID>MagicNumber:Config.kt$Config$100</ID>
1716
<ID>MagicNumber:Constants.kt$6</ID>
1817
<ID>MagicNumber:Context.kt$100f</ID>
19-
<ID>MagicNumber:ImportFolderDialog.kt$ImportFolderDialog$1000</ID>
2018
<ID>MagicNumber:MainActivity.kt$MainActivity$0.4f</ID>
21-
<ID>MagicNumber:MainActivity.kt$MainActivity$1000</ID>
2219
<ID>MagicNumber:MainActivity.kt$MainActivity$127</ID>
2320
<ID>MagicNumber:MainActivity.kt$MainActivity$250</ID>
2421
<ID>MagicNumber:MainActivity.kt$MainActivity$255</ID>

app/lint-baseline.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
errorLine1="app-build-targetSDK = &quot;34&quot;"
1515
errorLine2=" ~~~~">
1616
<location
17-
file="$HOME/work/Notes/Notes/gradle/libs.versions.toml"
18-
line="20"
17+
file="$HOME/Projects/Fossify/FossifyOrg/Notes/gradle/libs.versions.toml"
18+
line="21"
1919
column="23"/>
2020
</issue>
2121

@@ -80,7 +80,7 @@
8080
errorLine1="distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip"
8181
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
8282
<location
83-
file="$HOME/work/Notes/Notes/gradle/wrapper/gradle-wrapper.properties"
83+
file="$HOME/Projects/Fossify/FossifyOrg/Notes/gradle/wrapper/gradle-wrapper.properties"
8484
line="3"
8585
column="17"/>
8686
</issue>
@@ -91,8 +91,8 @@
9191
errorLine1="gradlePlugins-agp = &quot;8.10.1&quot;"
9292
errorLine2=" ~~~~~~~~">
9393
<location
94-
file="$HOME/work/Notes/Notes/gradle/libs.versions.toml"
95-
line="17"
94+
file="$HOME/Projects/Fossify/FossifyOrg/Notes/gradle/libs.versions.toml"
95+
line="18"
9696
column="21"/>
9797
</issue>
9898

@@ -102,8 +102,8 @@
102102
errorLine1="app-build-compileSDKVersion = &quot;34&quot;"
103103
errorLine2=" ~~~~">
104104
<location
105-
file="$HOME/work/Notes/Notes/gradle/libs.versions.toml"
106-
line="19"
105+
file="$HOME/Projects/Fossify/FossifyOrg/Notes/gradle/libs.versions.toml"
106+
line="20"
107107
column="31"/>
108108
</issue>
109109

detekt.yml

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
build:
2+
maxIssues: 0
3+
weights:
4+
complexity: 2
5+
LongParameterList: 2
6+
style: 1
7+
8+
processors:
9+
active: true
10+
exclude:
11+
- "FunctionCountProcessor"
12+
- "PropertyCountProcessor"
13+
14+
config:
15+
validation: true
16+
17+
complexity:
18+
LongParameterList:
19+
active: true
20+
functionThreshold: 10
21+
constructorThreshold: 8
22+
ignoreDefaultParameters: true
23+
ignoreAnnotated:
24+
- "Composable"
25+
LongMethod:
26+
active: true
27+
threshold: 120
28+
ignoreAnnotated:
29+
- "Composable"
30+
- "Preview"
31+
32+
style:
33+
MagicNumber:
34+
active: true
35+
ignoreAnnotated: ["Composable"]
36+
ignoreEnums: true
37+
ignoreNumbers: ["-1", "0", "1", "2", "42", "1000"]
38+
MaxLineLength:
39+
active: true
40+
maxLineLength: 120
41+
excludePackageStatements: true
42+
excludeImportStatements: true
43+
44+
naming:
45+
FunctionNaming:
46+
active: true
47+
ignoreAnnotated: ["Composable", "Preview"]
48+
functionPattern: "[a-z][A-Za-z0-9]*"
49+
50+
Compose: # io.nlopez.compose.rules
51+
ComposableParametersOrdering:
52+
active: true
53+
ModifierDefaultValue:
54+
active: true
55+
MissingModifierDefaultValue:
56+
active: true
57+
PublicComposablePreview:
58+
active: true

gradle/libs.versions.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ kotlinxSerializationJson = "1.8.1"
66
ksp = "2.1.21-2.0.2"
77
#Detekt
88
detekt = "1.23.8"
9+
detektCompose = "0.4.22"
910
#AndroidX
1011
androidx-constraintlayout = "2.2.1"
1112
androidx-documentfile = "1.1.0"
@@ -29,6 +30,8 @@ androidx-documentfile = { module = "androidx.documentfile:documentfile", version
2930
androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "room" }
3031
androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "room" }
3132
androidx-room-compiler = { module = "androidx.room:room-compiler", version.ref = "room" }
33+
#Compose
34+
compose-detekt = { module = "io.nlopez.compose.rules:detekt", version.ref = "detektCompose" }
3235
#Fossify
3336
fossify-commons = { module = "org.fossify:commons", version.ref = "commons" }
3437
#Kotlin

lint.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,5 @@
3131
<issue id="IconDensities" severity="warning" />
3232
<issue id="GradleDependency" severity="warning" />
3333
<issue id="Overdraw" severity="warning" />
34+
<issue id="ExtraTranslation" severity="warning" />
3435
</lint>

0 commit comments

Comments
 (0)