diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 53b6b4872..266ad4318 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -72,7 +72,7 @@ jobs: ${{ runner.os }}-gradle- - name: Static Analysis - run: ./gradlew detekt + run: ./gradlew detektDebug detektCustomExampleDebug - name: Upload Lint Reports uses: actions/upload-artifact@v3 if: ${{ always() }} diff --git a/config/detekt/detekt.yml b/config/detekt/detekt.yml index 45ba1cf73..10e5a4851 100644 --- a/config/detekt/detekt.yml +++ b/config/detekt/detekt.yml @@ -79,7 +79,8 @@ complexity: threshold: 60 LongParameterList: active: true - threshold: 6 + functionThreshold: 6 + constructorThreshold: 6 ignoreDefaultParameters: false MethodOverloading: active: false @@ -294,7 +295,7 @@ performance: potential-bugs: active: true Deprecation: - active: false + active: true DuplicateCaseInWhenExpression: active: true EqualsAlwaysReturnsTrueOrFalse: @@ -316,7 +317,7 @@ potential-bugs: LateinitUsage: active: false excludes: "**/test/**,**/androidTest/**,**/*.Test.kt,**/*.Spec.kt,**/*.Spek.kt" - excludeAnnotatedProperties: "" + ignoreAnnotated: [] ignoreOnClassesPattern: "" MapGetWithNotNullAssertionOperator: active: false @@ -379,7 +380,7 @@ style: active: true ignoreOverridableFunction: true excludedFunctions: 'describeContents' - excludeAnnotatedFunction: "dagger.Provides" + ignoreAnnotated: ["dagger.Provides"] LibraryCodeMustSpecifyReturnType: active: true LoopWithTooManyJumpStatements: @@ -450,10 +451,10 @@ style: active: false UnderscoresInNumericLiterals: active: false - acceptableDecimalLength: 5 + acceptableLength: 5 UnnecessaryAbstractClass: active: true - excludeAnnotatedClasses: "dagger.Module" + ignoreAnnotated: ["dagger.Module"] UnnecessaryAnnotationUseSiteTarget: active: false UnnecessaryApply: @@ -479,7 +480,7 @@ style: active: false UseDataClass: active: false - excludeAnnotatedClasses: "" + ignoreAnnotated: [] allowVars: false UseIfInsteadOfWhen: active: false diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/compat/CompatV21.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/compat/CompatV21.kt index 78f9e8f2c..180b5f661 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/compat/CompatV21.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/compat/CompatV21.kt @@ -15,6 +15,7 @@ * along with this program. If not, see . * */ +@file:Suppress("DEPRECATION") package org.kiwix.kiwixmobile.core.compat @@ -26,7 +27,6 @@ import android.net.ConnectivityManager import android.net.ConnectivityManager.TYPE_WIFI import android.net.NetworkInfo.State.CONNECTED -@Suppress("Deprecation") open class CompatV21 : Compat { override fun queryIntentActivities( packageManager: PackageManager, diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/data/remote/KiwixService.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/data/remote/KiwixService.kt index a9a8c0fee..b948da3d4 100644 --- a/core/src/main/java/org/kiwix/kiwixmobile/core/data/remote/KiwixService.kt +++ b/core/src/main/java/org/kiwix/kiwixmobile/core/data/remote/KiwixService.kt @@ -15,6 +15,8 @@ * along with this program. If not, see . * */ +@file:Suppress("DEPRECATION") + package org.kiwix.kiwixmobile.core.data.remote import io.reactivex.Observable diff --git a/team-props/git-hooks/pre-commit.sh b/team-props/git-hooks/pre-commit.sh index 9c66d7b78..4f8eb37f1 100644 --- a/team-props/git-hooks/pre-commit.sh +++ b/team-props/git-hooks/pre-commit.sh @@ -2,7 +2,7 @@ echo "Running lint..." -./gradlew ktlintCheck detekt app:lintDebug custom:lintCustomexampleDebug --daemon +./gradlew ktlintCheck detektDebug detektCustomExampleDebug app:lintDebug custom:lintCustomexampleDebug --daemon status=$?