Skip to content

Commit 6c87991

Browse files
naveensinghnaveensingh
authored
chore: update lint rules and baselines (#218)
1 parent 467021f commit 6c87991

6 files changed

Lines changed: 302 additions & 208 deletions

File tree

‎.github/workflows/update-lint-baselines.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: Update lint baselines
2+
3+
on:
4+
workflow_dispatch:
5+
schedule:
6+
- cron: "0 0 1 * *"
7+
8+
jobs:
9+
update-lint-baselines:
10+
uses: FossifyOrg/.github/.github/workflows/update-lint-baselines.yml@main
11+
secrets: inherit

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ keystore.jks
1010
keystore.properties
1111
fastlane/fastlane.json
1212
fastlane/report.xml
13+
.kotlin/

‎app/build.gradle.kts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
12
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
23
import org.jetbrains.kotlin.konan.properties.Properties
34
import java.io.FileInputStream
@@ -98,16 +99,19 @@ android {
9899
}
99100

100101
tasks.withType<KotlinCompile> {
101-
kotlinOptions.jvmTarget = project.libs.versions.app.build.kotlinJVMTarget.get()
102+
compilerOptions.jvmTarget.set(
103+
JvmTarget.fromTarget(project.libs.versions.app.build.kotlinJVMTarget.get())
104+
)
102105
}
103106

104107
namespace = project.property("APP_ID").toString()
105108

106109
lint {
107110
checkReleaseBuilds = false
108111
abortOnError = true
109-
warningsAsErrors = true
112+
warningsAsErrors = false
110113
baseline = file("lint-baseline.xml")
114+
lintConfig = rootProject.file("lint.xml")
111115
}
112116

113117
bundle {

‎app/detekt-baseline.xml‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" ?>
22
<SmellBaseline>
3-
<ManuallySuppressedIssues></ManuallySuppressedIssues>
3+
<ManuallySuppressedIssues/>
44
<CurrentIssues>
55
<ID>ComplexCondition:Activity.kt$(hide &amp;&amp; filename.startsWith('.')) || (!hide &amp;&amp; !filename.startsWith('.'))</ID>
66
<ID>ComplexCondition:ItemsAdapter.kt$ItemsAdapter$activity.getDoesFilePathExist(source) &amp;&amp; activity.getIsPathDirectory(source) &amp;&amp; sourceFile.list()?.isEmpty() == true &amp;&amp; sourceFile.getProperSize(true) == 0L &amp;&amp; sourceFile.getFileCount(true) == 0</ID>
@@ -9,7 +9,6 @@
99
<ID>ComplexCondition:MimeTypesActivity.kt$MimeTypesActivity$mimetype != "image" &amp;&amp; mimetype != "video" &amp;&amp; mimetype != "audio" &amp;&amp; mimetype != "text" &amp;&amp; !extraAudioMimeTypes.contains(fullMimetype) &amp;&amp; !extraDocumentMimeTypes.contains(fullMimetype) &amp;&amp; !archiveMimeTypes.contains(fullMimetype)</ID>
1010
<ID>ComplexCondition:ReadTextActivity.kt$ReadTextActivity$requestCode == SELECT_SAVE_FILE_INTENT &amp;&amp; resultCode == Activity.RESULT_OK &amp;&amp; resultData != null &amp;&amp; resultData.data != null</ID>
1111
<ID>CyclomaticComplexMethod:DecompressActivity.kt$DecompressActivity$private fun decompressTo(destination: String)</ID>
12-
<ID>CyclomaticComplexMethod:DecompressActivity.kt$DecompressActivity$private fun fillAllListItems(uri: Uri, callback: () -&gt; Unit)</ID>
1312
<ID>CyclomaticComplexMethod:ItemsAdapter.kt$ItemsAdapter$@SuppressLint("NewApi") private fun compressPaths(sourcePaths: List&lt;String&gt;, targetPath: String, password: String? = null): Boolean</ID>
1413
<ID>CyclomaticComplexMethod:ItemsAdapter.kt$ItemsAdapter$override fun actionItemPressed(id: Int)</ID>
1514
<ID>CyclomaticComplexMethod:MainActivity.kt$MainActivity$private fun setupOptionsMenu()</ID>
@@ -23,7 +22,6 @@
2322
<ID>EmptyFunctionBlock:MimeTypesActivity.kt$MimeTypesActivity${}</ID>
2423
<ID>EmptyFunctionBlock:StorageFragment.kt$StorageFragment${}</ID>
2524
<ID>LargeClass:ItemsAdapter.kt$ItemsAdapter : MyRecyclerViewAdapterOnPopupTextUpdate</ID>
26-
<ID>LargeClass:MainActivity.kt$MainActivity : SimpleActivity</ID>
2725
<ID>LongMethod:DecompressActivity.kt$DecompressActivity$private fun fillAllListItems(uri: Uri, callback: () -&gt; Unit)</ID>
2826
<ID>LongMethod:ItemsAdapter.kt$ItemsAdapter$@SuppressLint("NewApi") private fun compressPaths(sourcePaths: List&lt;String&gt;, targetPath: String, password: String? = null): Boolean</ID>
2927
<ID>LongMethod:MimeTypesActivity.kt$MimeTypesActivity$private fun getProperFileDirItems(callback: (ArrayList&lt;FileDirItem&gt;) -&gt; Unit)</ID>
@@ -62,7 +60,6 @@
6260
<ID>MaxLineLength:CompressAsDialog.kt$CompressAsDialog$val indexOfDot = if (filename.contains('.') &amp;&amp; !activity.getIsPathDirectory(path)) filename.lastIndexOf(".") else filename.length</ID>
6361
<ID>MaxLineLength:Config.kt$Config$set(wasStorageAnalysisTabAdded) = prefs.edit().putBoolean(WAS_STORAGE_ANALYSIS_TAB_ADDED, wasStorageAnalysisTabAdded).apply()</ID>
6462
<ID>MaxLineLength:Context.kt$fun Context.isPathOnRoot(path: String)</ID>
65-
<ID>MaxLineLength:DecompressActivity.kt$DecompressActivity$binding.decompressToolbar.title = realPath?.getFilenameFromPath() ?: Uri.decode(uri.toString().getFilenameFromPath())</ID>
6663
<ID>MaxLineLength:DecompressActivity.kt$DecompressActivity$updateMaterialActivityViews(decompressCoordinator, decompressList, useTransparentNavigation = true, useTopSearchMenu = false)</ID>
6764
<ID>MaxLineLength:DecompressItemsAdapter.kt$DecompressItemsAdapter$class</ID>
6865
<ID>MaxLineLength:DecompressItemsAdapter.kt$DecompressItemsAdapter$val drawable = fileDrawables.getOrElse(fileName.substringAfterLast(".").lowercase(Locale.getDefault()), { fileDrawable })</ID>
@@ -188,35 +185,20 @@
188185
<ID>VariableNaming:ItemsAdapter.kt$ItemsAdapter$val SAFPath = getFirstSelectedItemPath()</ID>
189186
<ID>VariableNaming:RecentsFragment.kt$RecentsFragment$private val RECENTS_LIMIT = 50</ID>
190187
<ID>VariableNaming:StorageFragment.kt$StorageFragment$private val SIZE_DIVIDER = 100000</ID>
191-
<ID>WildcardImport:Activity.kt$import org.fossify.commons.extensions.*</ID>
192-
<ID>WildcardImport:Activity.kt$import org.fossify.filemanager.helpers.*</ID>
193188
<ID>WildcardImport:ChangeSortingDialog.kt$import org.fossify.commons.helpers.*</ID>
194189
<ID>WildcardImport:CompressAsDialog.kt$import org.fossify.commons.extensions.*</ID>
195190
<ID>WildcardImport:CreateNewItemDialog.kt$import org.fossify.commons.extensions.*</ID>
196-
<ID>WildcardImport:DecompressActivity.kt$import org.fossify.commons.extensions.*</ID>
197191
<ID>WildcardImport:InsertFilenameDialog.kt$import org.fossify.commons.extensions.*</ID>
198-
<ID>WildcardImport:ItemsAdapter.kt$import org.fossify.commons.dialogs.*</ID>
199-
<ID>WildcardImport:ItemsAdapter.kt$import org.fossify.commons.extensions.*</ID>
200-
<ID>WildcardImport:ItemsAdapter.kt$import org.fossify.commons.helpers.*</ID>
201-
<ID>WildcardImport:ItemsAdapter.kt$import org.fossify.filemanager.databinding.*</ID>
202-
<ID>WildcardImport:ItemsAdapter.kt$import org.fossify.filemanager.extensions.*</ID>
203-
<ID>WildcardImport:ItemsAdapter.kt$import org.fossify.filemanager.helpers.*</ID>
204192
<ID>WildcardImport:ItemsFragment.kt$import org.fossify.commons.extensions.*</ID>
205193
<ID>WildcardImport:ItemsFragment.kt$import org.fossify.commons.helpers.*</ID>
206-
<ID>WildcardImport:MainActivity.kt$import org.fossify.commons.extensions.*</ID>
207-
<ID>WildcardImport:MainActivity.kt$import org.fossify.commons.helpers.*</ID>
208194
<ID>WildcardImport:ManageFavoritesAdapter.kt$import android.view.*</ID>
209195
<ID>WildcardImport:MimeTypesActivity.kt$import org.fossify.commons.extensions.*</ID>
210196
<ID>WildcardImport:MimeTypesActivity.kt$import org.fossify.filemanager.helpers.*</ID>
211197
<ID>WildcardImport:MyViewPagerFragment.kt$import org.fossify.commons.extensions.*</ID>
212198
<ID>WildcardImport:ReadTextActivity.kt$import org.fossify.commons.extensions.*</ID>
213-
<ID>WildcardImport:RecentsFragment.kt$import org.fossify.commons.extensions.*</ID>
214199
<ID>WildcardImport:SaveAsActivity.kt$import org.fossify.commons.extensions.*</ID>
215200
<ID>WildcardImport:SaveAsDialog.kt$import org.fossify.commons.extensions.*</ID>
216201
<ID>WildcardImport:SettingsActivity.kt$import org.fossify.commons.extensions.*</ID>
217202
<ID>WildcardImport:SettingsActivity.kt$import org.fossify.commons.helpers.*</ID>
218-
<ID>WildcardImport:StorageFragment.kt$import org.fossify.commons.extensions.*</ID>
219-
<ID>WildcardImport:StorageFragment.kt$import org.fossify.commons.helpers.*</ID>
220-
<ID>WildcardImport:StorageFragment.kt$import org.fossify.filemanager.helpers.*</ID>
221203
</CurrentIssues>
222204
</SmellBaseline>

0 commit comments

Comments
 (0)