Skip to content

Commit bf0a864

Browse files
naveensinghnaveensingh
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 293e195 commit bf0a864

6 files changed

Lines changed: 88 additions & 18 deletions

File tree

‎app/build.gradle.kts‎

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

130130
detekt {
131131
baseline = file("detekt-baseline.xml")
132+
config.setFrom("$rootDir/detekt.yml")
133+
buildUponDefaultConfig = true
134+
allRules = false
132135
}
133136

134137
dependencies {
@@ -140,4 +143,5 @@ dependencies {
140143
implementation(libs.androidx.constraintlayout)
141144
implementation(libs.tandroidlame)
142145
implementation(libs.autofittextview)
146+
detektPlugins(libs.compose.detekt)
143147
}

‎app/detekt-baseline.xml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,11 @@
88
<ID>EmptyFunctionBlock:TrashAdapter.kt$TrashAdapter${}</ID>
99
<ID>EmptyFunctionBlock:TrashFragment.kt$TrashFragment${}</ID>
1010
<ID>EmptyFunctionBlock:WidgetRecordDisplayConfigureActivity.kt$WidgetRecordDisplayConfigureActivity.&lt;no name provided&gt;${}</ID>
11-
<ID>MagicNumber:Activity.kt$1000</ID>
12-
<ID>MagicNumber:Activity.kt$1000L</ID>
1311
<ID>MagicNumber:Context.kt$60</ID>
1412
<ID>MagicNumber:Mp3Recorder.kt$Mp3Recorder$1.25</ID>
15-
<ID>MagicNumber:Mp3Recorder.kt$Mp3Recorder$1000</ID>
1613
<ID>MagicNumber:Mp3Recorder.kt$Mp3Recorder$7200</ID>
1714
<ID>MagicNumber:Mp3Recorder.kt$Mp3Recorder$8</ID>
18-
<ID>MagicNumber:PlayerFragment.kt$PlayerFragment$1000</ID>
19-
<ID>MagicNumber:PlayerFragment.kt$PlayerFragment.&lt;no name provided&gt;$1000</ID>
2015
<ID>MagicNumber:RecorderFragment.kt$RecorderFragment$500</ID>
21-
<ID>MagicNumber:RecorderService.kt$RecorderService$1000</ID>
22-
<ID>MagicNumber:SettingsActivity.kt$SettingsActivity$1000</ID>
2316
<ID>MagicNumber:ViewPagerAdapter.kt$ViewPagerAdapter$3</ID>
2417
<ID>MagicNumber:WidgetRecordDisplayConfigureActivity.kt$WidgetRecordDisplayConfigureActivity$100</ID>
2518
<ID>MaxLineLength:PlayerFragment.kt$PlayerFragment$if</ID>

‎app/lint-baseline.xml‎

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
errorLine1="app-build-targetSDK = &quot;34&quot;"
88
errorLine2=" ~~~~">
99
<location
10-
file="$HOME/work/Voice-Recorder/Voice-Recorder/gradle/libs.versions.toml"
11-
line="27"
10+
file="$HOME/Projects/Fossify/FossifyOrg/Voice-Recorder/gradle/libs.versions.toml"
11+
line="28"
1212
column="23"/>
1313
</issue>
1414

@@ -29,7 +29,7 @@
2929
errorLine1="distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip"
3030
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
3131
<location
32-
file="$HOME/work/Voice-Recorder/Voice-Recorder/gradle/wrapper/gradle-wrapper.properties"
32+
file="$HOME/Projects/Fossify/FossifyOrg/Voice-Recorder/gradle/wrapper/gradle-wrapper.properties"
3333
line="3"
3434
column="17"/>
3535
</issue>
@@ -40,34 +40,45 @@
4040
errorLine1="gradlePlugins-agp = &quot;8.10.1&quot;"
4141
errorLine2=" ~~~~~~~~">
4242
<location
43-
file="$HOME/work/Voice-Recorder/Voice-Recorder/gradle/libs.versions.toml"
44-
line="24"
43+
file="$HOME/Projects/Fossify/FossifyOrg/Voice-Recorder/gradle/libs.versions.toml"
44+
line="25"
4545
column="21"/>
4646
</issue>
4747

48+
<issue
49+
id="GradleDependency"
50+
message="A newer version of org.jetbrains.kotlin.android than 2.1.21 is available: 2.2.0"
51+
errorLine1="kotlin = &quot;2.1.21&quot;"
52+
errorLine2=" ~~~~~~~~">
53+
<location
54+
file="$HOME/Projects/Fossify/FossifyOrg/Voice-Recorder/gradle/libs.versions.toml"
55+
line="3"
56+
column="10"/>
57+
</issue>
58+
4859
<issue
4960
id="GradleDependency"
5061
message="A newer version of `compileSdkVersion` than 34 is available: 35"
5162
errorLine1="app-build-compileSDKVersion = &quot;34&quot;"
5263
errorLine2=" ~~~~">
5364
<location
54-
file="$HOME/work/Voice-Recorder/Voice-Recorder/gradle/libs.versions.toml"
55-
line="26"
65+
file="$HOME/Projects/Fossify/FossifyOrg/Voice-Recorder/gradle/libs.versions.toml"
66+
line="27"
5667
column="31"/>
5768
</issue>
5869

5970
<issue
6071
id="Aligned16KB"
6172
message="The native library `x86_64/libandroidlame.so` (from `com.github.naman14:TAndroidLame:1.1`) is not 16 KB aligned">
6273
<location
63-
file="$GRADLE_USER_HOME/caches/8.11.1/transforms/94a3a2f7bc4ddf8ffe0a8dbe891c7f45/transformed/jetified-TAndroidLame-1.1/jni/x86_64/libandroidlame.so"/>
74+
file="$GRADLE_USER_HOME/caches/8.11.1/transforms/865938d5cceb8e098c463c7b38a51bdf/transformed/jetified-TAndroidLame-1.1/jni/x86_64/libandroidlame.so"/>
6475
</issue>
6576

6677
<issue
6778
id="Aligned16KB"
6879
message="The native library `x86_64/libandroidlame.so` (from `com.github.naman14:TAndroidLame:1.1`) is not 16 KB aligned">
6980
<location
70-
file="$GRADLE_USER_HOME/caches/8.11.1/transforms/94a3a2f7bc4ddf8ffe0a8dbe891c7f45/transformed/jetified-TAndroidLame-1.1/jni/x86_64/libandroidlame.so"/>
81+
file="$GRADLE_USER_HOME/caches/8.11.1/transforms/865938d5cceb8e098c463c7b38a51bdf/transformed/jetified-TAndroidLame-1.1/jni/x86_64/libandroidlame.so"/>
7182
</issue>
7283

7384
<issue
@@ -76,8 +87,8 @@
7687
errorLine1="tandroidlame = { module = &quot;com.github.naman14:TAndroidLame&quot;, version.ref = &quot;tandroidlame&quot; }"
7788
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
7889
<location
79-
file="$HOME/work/Voice-Recorder/Voice-Recorder/gradle/libs.versions.toml"
80-
line="43"
90+
file="$HOME/Projects/Fossify/FossifyOrg/Voice-Recorder/gradle/libs.versions.toml"
91+
line="46"
8192
column="17"/>
8293
</issue>
8394

‎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
@@ -5,6 +5,7 @@ kotlin = "2.1.21"
55
ksp = "2.1.21-2.0.2"
66
#Detekt
77
detekt = "1.23.8"
8+
detektCompose = "0.4.22"
89
#AndroidX
910
androidx-constraintlayout = "2.2.1"
1011
androidx-documentfile = "1.1.0"
@@ -33,6 +34,8 @@ app-build-kotlinJVMTarget = "17"
3334
androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "androidx-constraintlayout" }
3435
androidx-documentfile = { module = "androidx.documentfile:documentfile", version.ref = "androidx-documentfile" }
3536
androidx-swiperefreshlayout = { module = "androidx.swiperefreshlayout:swiperefreshlayout", version.ref = "androidx-swiperefreshlayout" }
37+
#Compose
38+
compose-detekt = { module = "io.nlopez.compose.rules:detekt", version.ref = "detektCompose" }
3639
#Fossify
3740
fossify-commons = { module = "org.fossify:commons", version.ref = "commons" }
3841
#EventBus

‎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)