Fix detekt issues.

DataDog · Jan 31, 2024 · 8acb769 · 8acb769
1 parent 5d1ccbe
commit 8acb769
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/...-android-gradle-plugin/src/main/kotlin/com/datadog/gradle/plugin/DdAndroidGradlePlugin.kt b/...-android-gradle-plugin/src/main/kotlin/com/datadog/gradle/plugin/DdAndroidGradlePlugin.kt
@@ -96,7 +96,6 @@ class DdAndroidGradlePlugin @Inject constructor(
         }
         configureSymbolUploadTask(
             target,
-            androidExtension,
             datadogExtension,
             variant
         )
@@ -118,7 +117,6 @@ class DdAndroidGradlePlugin @Inject constructor(
 
     internal fun configureSymbolUploadTask(
         target: Project,
-        appException: AppExtension,
         extension: DdExtension,
         variant: ApplicationVariant
     ): TaskProvider<DdSymbolFileUploadTask>? {

diff --git a/...android-gradle-plugin/src/main/kotlin/com/datadog/gradle/plugin/DdSymbolFileUploadTask.kt b/...android-gradle-plugin/src/main/kotlin/com/datadog/gradle/plugin/DdSymbolFileUploadTask.kt
@@ -70,11 +70,12 @@ internal abstract class DdSymbolFileUploadTask @Inject constructor(
     }
 
     companion object {
-        internal val TASK_NAME = "ddUploadNdkSymbolFiles"
-        internal val KEY_NDK_SYMBOL_FILE = "ndk_symbol_file"
-        internal val TYPE_NDK_SYMBOL_FILE = "ndk_symbol_file"
-        internal val ENCODING = "application/octet-stream"
+        internal const val TASK_NAME = "ddUploadNdkSymbolFiles"
+        internal const val KEY_NDK_SYMBOL_FILE = "ndk_symbol_file"
+        internal const val TYPE_NDK_SYMBOL_FILE = "ndk_symbol_file"
+        internal const val ENCODING = "application/octet-stream"
         internal val SUPPORTED_ARCHS = setOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
+        internal const val MAX_DATADOG_CI_FILE_LOOKUP_LEVELS = 4
 
         internal val LOGGER = Logging.getLogger("DdSymbolFileUploadTask")
 
@@ -89,7 +90,7 @@ internal abstract class DdSymbolFileUploadTask @Inject constructor(
         internal fun findDatadogCiFile(projectDir: File): File? {
             var currentDir: File? = projectDir
             var levelsUp = 0
-            while (currentDir != null && levelsUp < 4) {
+            while (currentDir != null && levelsUp < MAX_DATADOG_CI_FILE_LOOKUP_LEVELS) {
                 val datadogCiFile = File(currentDir, "datadog-ci.json")
                 if (datadogCiFile.exists()) {
                     return datadogCiFile
@@ -100,7 +101,7 @@ internal abstract class DdSymbolFileUploadTask @Inject constructor(
             return null
         }
 
-        @Suppress("LongParameterList")
+        @Suppress("LongParameterList", "ReturnCount")
         fun register(
             project: Project,
             variant: ApplicationVariant,

diff --git a/samples/basic/src/main/java/com/datadog/example/basic/MainActivity.kt b/samples/basic/src/main/java/com/datadog/example/basic/MainActivity.kt
@@ -1,3 +1,5 @@
+@file:Suppress("UnusedImports")
+
 package com.datadog.example.basic
 
 import android.os.Bundle

diff --git a/samples/ndk/src/main/java/com/datadog/example/ndk/MainActivity.kt b/samples/ndk/src/main/java/com/datadog/example/ndk/MainActivity.kt
@@ -22,7 +22,7 @@ class MainActivity : AppCompatActivity() {
         toaster.toast(stringFromJNI())
     }
 
-    external fun stringFromJNI(): String
+    private external fun stringFromJNI(): String
 
     companion object {
         init {