Skip to content

Commit 1f9eb4a

Browse files
naveensinghnaveensingh
committed
chore: update lint rules and baselines
1 parent b7f9b4b commit 1f9eb4a

6 files changed

Lines changed: 538 additions & 389 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: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
import java.io.FileInputStream
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
22
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
33
import org.jetbrains.kotlin.konan.properties.Properties
4+
import java.io.FileInputStream
45

56
plugins {
67
alias(libs.plugins.android)
@@ -101,16 +102,19 @@ android {
101102
}
102103

103104
tasks.withType<KotlinCompile> {
104-
kotlinOptions.jvmTarget = project.libs.versions.app.build.kotlinJVMTarget.get()
105+
compilerOptions.jvmTarget.set(
106+
JvmTarget.fromTarget(project.libs.versions.app.build.kotlinJVMTarget.get())
107+
)
105108
}
106109

107110
namespace = project.property("APP_ID").toString()
108111

109112
lint {
110113
checkReleaseBuilds = false
111114
abortOnError = true
112-
warningsAsErrors = true
115+
warningsAsErrors = false
113116
baseline = file("lint-baseline.xml")
117+
lintConfig = rootProject.file("lint.xml")
114118
}
115119

116120
bundle {

‎app/detekt-baseline.xml‎

Lines changed: 1 addition & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
<?xml version="1.0" ?>
22
<SmellBaseline>
3-
<ManuallySuppressedIssues></ManuallySuppressedIssues>
3+
<ManuallySuppressedIssues/>
44
<CurrentIssues>
5-
<ID>ComplexCondition:MainActivity.kt$MainActivity$config.showNotePicker &amp;&amp; savedInstanceState == null &amp;&amp; hasNoIntent &amp;&amp; !mIsPasswordProtectionPending</ID>
6-
<ID>ComplexCondition:MainActivity.kt$MainActivity$requestCode == PICK_EXPORT_FILE_INTENT &amp;&amp; resultCode == Activity.RESULT_OK &amp;&amp; resultData != null &amp;&amp; resultData.data != null &amp;&amp; mNotes.isNotEmpty()</ID>
7-
<ID>ComplexCondition:MainActivity.kt$MainActivity$requestCode == PICK_OPEN_FILE_INTENT &amp;&amp; resultCode == RESULT_OK &amp;&amp; resultData != null &amp;&amp; resultData.data != null</ID>
85
<ID>ComplexCondition:TextFragment.kt$TextFragment$config.showKeyboard &amp;&amp; isMenuVisible &amp;&amp; (!note!!.isLocked() || shouldShowLockedContent)</ID>
96
<ID>CyclomaticComplexMethod:MainActivity.kt$MainActivity$private fun refreshMenuItems()</ID>
107
<ID>CyclomaticComplexMethod:MainActivity.kt$MainActivity$private fun setupOptionsMenu()</ID>
@@ -47,28 +44,8 @@
4744
<ID>MaxLineLength:ExportNotesDialog.kt$ExportNotesDialog$activity.getAlertDialogBuilder().setPositiveButton(org.fossify.commons.R.string.ok, null).setNegativeButton(org.fossify.commons.R.string.cancel, null)</ID>
4845
<ID>MaxLineLength:ImportFolderDialog.kt$ImportFolderDialog$class</ID>
4946
<ID>MaxLineLength:MainActivity.kt$MainActivity$!config.autosaveNotes &amp;&amp; showSaveButton &amp;&amp; (::mCurrentNote.isInitialized &amp;&amp; mCurrentNote.type == NoteType.TYPE_TEXT)</ID>
50-
<ID>MaxLineLength:MainActivity.kt$MainActivity$(drawable as LayerDrawable).findDrawableByLayerId(R.id.shortcut_plus_background).applyColorFilter(appIconColor)</ID>
5147
<ID>MaxLineLength:MainActivity.kt$MainActivity$// if we got here by some other app invoking the file open intent, we have no permission for updating the original file itself</ID>
52-
<ID>MaxLineLength:MainActivity.kt$MainActivity$ConfirmationDialog</ID>
53-
<ID>MaxLineLength:MainActivity.kt$MainActivity$Note(null, title.substringBeforeLast('.'), fileText, NoteType.TYPE_CHECKLIST, "", PROTECTION_NONE, "")</ID>
54-
<ID>MaxLineLength:MainActivity.kt$MainActivity$displayNewNoteDialog(note.value, title = it.title, it.path, setChecklistAsDefault = true)</ID>
55-
<ID>MaxLineLength:MainActivity.kt$MainActivity$faqItems.add(FAQItem(org.fossify.commons.R.string.faq_10_title_commons, org.fossify.commons.R.string.faq_10_text_commons))</ID>
56-
<ID>MaxLineLength:MainActivity.kt$MainActivity$faqItems.add(FAQItem(org.fossify.commons.R.string.faq_2_title_commons, org.fossify.commons.R.string.faq_2_text_commons))</ID>
57-
<ID>MaxLineLength:MainActivity.kt$MainActivity$faqItems.add(FAQItem(org.fossify.commons.R.string.faq_6_title_commons, org.fossify.commons.R.string.faq_6_text_commons))</ID>
58-
<ID>MaxLineLength:MainActivity.kt$MainActivity$faqItems.add(FAQItem(org.fossify.commons.R.string.faq_7_title_commons, org.fossify.commons.R.string.faq_7_text_commons))</ID>
59-
<ID>MaxLineLength:MainActivity.kt$MainActivity$findItem(R.id.lock_note).isVisible = mNotes.isNotEmpty() &amp;&amp; (::mCurrentNote.isInitialized &amp;&amp; !mCurrentNote.isLocked())</ID>
60-
<ID>MaxLineLength:MainActivity.kt$MainActivity$findItem(R.id.more_apps_from_us).isVisible = !resources.getBoolean(org.fossify.commons.R.bool.hide_google_relations)</ID>
61-
<ID>MaxLineLength:MainActivity.kt$MainActivity$findItem(R.id.unlock_note).isVisible = mNotes.isNotEmpty() &amp;&amp; (::mCurrentNote.isInitialized &amp;&amp; mCurrentNote.isLocked())</ID>
62-
<ID>MaxLineLength:MainActivity.kt$MainActivity$fun</ID>
63-
<ID>MaxLineLength:MainActivity.kt$MainActivity$getPagerAdapter().updateCurrentNoteData(binding.viewPager.currentItem, mCurrentNote.path, mCurrentNote.value)</ID>
6448
<ID>MaxLineLength:MainActivity.kt$MainActivity$if</ID>
65-
<ID>MaxLineLength:MainActivity.kt$MainActivity$intent.flags = intent.flags or Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NO_HISTORY</ID>
66-
<ID>MaxLineLength:MainActivity.kt$MainActivity$private</ID>
67-
<ID>MaxLineLength:MainActivity.kt$MainActivity$private fun isCurrentItemChecklist()</ID>
68-
<ID>MaxLineLength:MainActivity.kt$MainActivity$updateMaterialActivityViews(binding.mainCoordinator, null, useTransparentNavigation = false, useTopSearchMenu = false)</ID>
69-
<ID>MaxLineLength:MainActivity.kt$MainActivity$val newChecklist = Note(null, getCurrentFormattedDateTime(), "", NoteType.TYPE_CHECKLIST, "", PROTECTION_NONE, "")</ID>
70-
<ID>MaxLineLength:MainActivity.kt$MainActivity$val newTextNote = Note(null, getCurrentFormattedDateTime(), "", NoteType.TYPE_TEXT, "", PROTECTION_NONE, "")</ID>
71-
<ID>MaxLineLength:MainActivity.kt$MainActivity$}</ID>
7249
<ID>MaxLineLength:MyWidgetProvider.kt$MyWidgetProvider$PendingIntent.getActivity(context, widgetId, startActivityIntent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)</ID>
7350
<ID>MaxLineLength:MyWidgetProvider.kt$MyWidgetProvider$val pendingIntent = PendingIntent.getActivity(context, widget.widgetId, intent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)</ID>
7451
<ID>MaxLineLength:NewChecklistItemDialog.kt$NewChecklistItemDialog$if</ID>
@@ -87,12 +64,6 @@
8764
<ID>MaxLineLength:RenameNoteDialog.kt$RenameNoteDialog$class</ID>
8865
<ID>MaxLineLength:SettingsActivity.kt$SettingsActivity$NotesHelper.ImportResult.IMPORT_PARTIAL -&gt; toast(org.fossify.commons.R.string.importing_some_entries_failed)</ID>
8966
<ID>MaxLineLength:SettingsActivity.kt$SettingsActivity$binding.settingsUseEnglishHolder.beVisibleIf((config.wasUseEnglishToggled || Locale.getDefault().language != "en") &amp;&amp; !isTiramisuPlus())</ID>
90-
<ID>MaxLineLength:SettingsActivity.kt$SettingsActivity$org.fossify.commons.R.string.fingerprint_setup_successfully</ID>
91-
<ID>MaxLineLength:SettingsActivity.kt$SettingsActivity$updateMaterialActivityViews(binding.settingsCoordinator, binding.settingsHolder, useTransparentNavigation = true, useTopSearchMenu = false)</ID>
92-
<ID>MaxLineLength:SettingsActivity.kt$SettingsActivity$val items = listOf(GRAVITY_START, GRAVITY_CENTER, GRAVITY_END).map { RadioItem(it, getGravityOptionLabel(it)) }</ID>
93-
<ID>MaxLineLength:SettingsActivity.kt$SettingsActivity$val leftToRightDirection = TextUtilsCompat.getLayoutDirectionFromLocale(Locale.getDefault()) == ViewCompat.LAYOUT_DIRECTION_LTR</ID>
94-
<ID>MaxLineLength:TasksAdapter.kt$TasksAdapter$menu.findItem(R.id.cab_move_to_bottom).isVisible = selectedItems.none { it.isDone } || !activity.config.moveDoneChecklistItems</ID>
95-
<ID>MaxLineLength:TasksAdapter.kt$TasksAdapter$menu.findItem(R.id.cab_move_to_top).isVisible = selectedItems.none { it.isDone } || !activity.config.moveDoneChecklistItems</ID>
9667
<ID>MaxLineLength:TasksAdapter.kt$TasksAdapter$private fun getSelectedItems()</ID>
9768
<ID>MaxLineLength:TasksAdapter.kt$TasksAdapter$text = resources.getQuantityString(R.plurals.num_checked_items, completedTasks.tasks.size, completedTasks.tasks.size)</ID>
9869
<ID>MaxLineLength:TasksFragment.kt$TasksFragment$note.getNoteStoredValue(requireActivity())?.split("\n")?.map { it.trim() }?.filter { it.isNotBlank() }</ID>
@@ -109,7 +80,6 @@
10980
<ID>MaxLineLength:WidgetConfigureActivity.kt$WidgetConfigureActivity$val sampleValue = if (note.value.isEmpty() || mIsCustomizingColors) getString(R.string.widget_config) else note.value</ID>
11081
<ID>NestedBlockDepth:MainActivity.kt$MainActivity$private fun checkIntents(intent: Intent)</ID>
11182
<ID>NestedBlockDepth:Note.kt$Note$fun getNoteStoredValue(context: Context): String?</ID>
112-
<ID>NestedBlockDepth:OpenNoteAdapter.kt$OpenNoteAdapter$private fun Note.getFormattedValue(context: Context): CharSequence?</ID>
11383
<ID>NestedBlockDepth:TasksFragment.kt$TasksFragment$private fun prepareTaskItems(): List&lt;NoteItem&gt;</ID>
11484
<ID>ReturnCount:TasksFragment.kt$TasksFragment$private fun saveNote(callback: () -&gt; Unit = {})</ID>
11585
<ID>ReturnCount:TextFragment.kt$TextFragment$fun saveText(force: Boolean, callback: ((note: Note) -&gt; Unit)? = null)</ID>
@@ -150,12 +120,6 @@
150120
<ID>WildcardImport:ExportFilesDialog.kt$import org.fossify.commons.extensions.*</ID>
151121
<ID>WildcardImport:ExportNotesDialog.kt$import org.fossify.commons.extensions.*</ID>
152122
<ID>WildcardImport:ImportFolderDialog.kt$import org.fossify.commons.extensions.*</ID>
153-
<ID>WildcardImport:MainActivity.kt$import org.fossify.commons.dialogs.*</ID>
154-
<ID>WildcardImport:MainActivity.kt$import org.fossify.commons.extensions.*</ID>
155-
<ID>WildcardImport:MainActivity.kt$import org.fossify.commons.helpers.*</ID>
156-
<ID>WildcardImport:MainActivity.kt$import org.fossify.notes.dialogs.*</ID>
157-
<ID>WildcardImport:MainActivity.kt$import org.fossify.notes.extensions.*</ID>
158-
<ID>WildcardImport:MainActivity.kt$import org.fossify.notes.helpers.*</ID>
159123
<ID>WildcardImport:ManageAutoBackupsDialog.kt$import org.fossify.commons.extensions.*</ID>
160124
<ID>WildcardImport:NewChecklistItemDialog.kt$import org.fossify.commons.extensions.*</ID>
161125
<ID>WildcardImport:NewNoteDialog.kt$import org.fossify.commons.extensions.*</ID>
@@ -164,10 +128,6 @@
164128
<ID>WildcardImport:NotesDao.kt$import androidx.room.*</ID>
165129
<ID>WildcardImport:OpenNoteAdapter.kt$import org.fossify.commons.extensions.*</ID>
166130
<ID>WildcardImport:RenameNoteDialog.kt$import org.fossify.commons.extensions.*</ID>
167-
<ID>WildcardImport:SettingsActivity.kt$import org.fossify.commons.extensions.*</ID>
168-
<ID>WildcardImport:SettingsActivity.kt$import org.fossify.commons.helpers.*</ID>
169-
<ID>WildcardImport:SettingsActivity.kt$import org.fossify.notes.extensions.*</ID>
170-
<ID>WildcardImport:SettingsActivity.kt$import org.fossify.notes.helpers.*</ID>
171131
<ID>WildcardImport:TasksFragment.kt$import org.fossify.commons.extensions.*</ID>
172132
<ID>WildcardImport:TextFragment.kt$import org.fossify.commons.extensions.*</ID>
173133
<ID>WildcardImport:UnlockNotesDialog.kt$import org.fossify.commons.extensions.*</ID>

0 commit comments

Comments
 (0)