Add new linter config

Exodus-Privacy · Jan 3, 2024 · f6bd68e · f6bd68e
1 parent 6faa7d2
commit f6bd68e
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 5 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,6 @@
+# editorconfig.org
+
+root = true
+
+[*.{kt,kts}]
+ktlint_standard_package-name = disabled
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -8,6 +8,11 @@ plugins {
     id("org.jetbrains.kotlin.android")
 }
 
+configure<org.jlleitschuh.gradle.ktlint.KtlintExtension> {
+    version.set("0.50.0")
+    android.set(true)
+}
+
 android {
     namespace = "org.eu.exodus_privacy.exodusprivacy"
     compileSdk = 34
@@ -24,7 +29,7 @@ android {
 
         ksp {
             arg(
-                RoomSchemaArgProvider(File(projectDir, "schemas")),
+                RoomSchemaArgProvider(File(projectDir, "schemas"))
             )
         }
 
@@ -171,7 +176,7 @@ dependencies {
 class RoomSchemaArgProvider(
     @get:InputDirectory
     @get:PathSensitive(PathSensitivity.RELATIVE)
-    val schemaDir: File,
+    val schemaDir: File
 ) : CommandLineArgumentProvider {
     override fun asArguments() = listOf("room.schemaLocation=${schemaDir.path}")
 }
diff --git a/...rc/main/java/org/eu/exodus_privacy/exodusprivacy/fragments/appdetail/AppDetailFragment.kt b/...rc/main/java/org/eu/exodus_privacy/exodusprivacy/fragments/appdetail/AppDetailFragment.kt
@@ -69,7 +69,10 @@ class AppDetailFragment : Fragment(R.layout.fragment_app_detail) {
                     inflateMenu(R.menu.app_detail_menu)
                     if (app.exodusVersionCode == 0L) {
                         menu.findItem(R.id.openExodusPage)?.isVisible = false
-                    } else menu.findItem(R.id.submitApp)?.isVisible = app.exodusVersionCode != app.versionCode
+                    } else {
+                        menu.findItem(R.id.submitApp)?.isVisible =
+                            app.exodusVersionCode != app.versionCode
+                    }
                     setOnMenuItemClickListener {
                         when (it.itemId) {
                             R.id.openExodusPage -> {

diff --git a/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/manager/database/ExodusDatabase.kt b/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/manager/database/ExodusDatabase.kt
@@ -17,7 +17,7 @@ import org.eu.exodus_privacy.exodusprivacy.objects.Constants
     autoMigrations = [
         AutoMigration(
             from = Constants.previousDatabaseVersion,
-            to = Constants.currentDatabaseVersion,
+            to = Constants.currentDatabaseVersion
         )
     ]
 )

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 androidGradlePlugin = "8.1.4"
 kotlinPlugin = "1.9.22"
-gradleKtlint = "11.1.0"
+gradleKtlint = "12.0.3"
 activity-ktx = "1.8.1"
 androidx-core = "1.5.0"
 appcompat = "1.6.1"