From 13091948ea1e69b74088b2cd036f3dafd1218a35 Mon Sep 17 00:00:00 2001 From: birdbird <6892457-tzugen@users.noreply.gitlab.com> Date: Thu, 18 May 2023 10:54:16 +0000 Subject: [PATCH] Use default locations for Detekt config and baseline. --- detekt-config.yml => config/detekt/detekt.yml | 0 gradle_scripts/code_quality.gradle | 2 -- detekt-baseline.xml => ultrasonic/detekt-baseline.xml | 6 +++--- .../moire/ultrasonic/receiver/UltrasonicIntentReceiver.java | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) rename detekt-config.yml => config/detekt/detekt.yml (100%) rename detekt-baseline.xml => ultrasonic/detekt-baseline.xml (86%) diff --git a/detekt-config.yml b/config/detekt/detekt.yml similarity index 100% rename from detekt-config.yml rename to config/detekt/detekt.yml diff --git a/gradle_scripts/code_quality.gradle b/gradle_scripts/code_quality.gradle index 8738567e..f5880485 100644 --- a/gradle_scripts/code_quality.gradle +++ b/gradle_scripts/code_quality.gradle @@ -25,8 +25,6 @@ if (isCodeQualityEnabled) { // Builds the AST in parallel. Rules are always executed in parallel. // Can lead to speedups in larger projects. parallel = true - baseline = file("${rootProject.projectDir}/detekt-baseline.xml") - config = files("${rootProject.projectDir}/detekt-config.yml") } } tasks.detekt.jvmTarget = "17" diff --git a/detekt-baseline.xml b/ultrasonic/detekt-baseline.xml similarity index 86% rename from detekt-baseline.xml rename to ultrasonic/detekt-baseline.xml index 3acd3952..a8789e05 100644 --- a/detekt-baseline.xml +++ b/ultrasonic/detekt-baseline.xml @@ -1,9 +1,9 @@ - + TooManyFunctions:PlaybackService.kt$PlaybackService : MediaLibraryServiceKoinComponentCoroutineScope UnusedPrivateMember:UApp.kt$private fun VmPolicy.Builder.detectAllExceptSocket(): VmPolicy.Builder - ImplicitDefaultLocale:EditServerFragment.kt$EditServerFragment.<no name provided>$String.format( "%s %s", resources.getString(R.string.settings_connection_failure), getErrorMessage(error) ) + ImplicitDefaultLocale:EditServerFragment.kt$EditServerFragment.<no name provided>$String.format( "%s %s", resources.getString(R.string.settings_connection_failure), getErrorMessage(error) ) ImplicitDefaultLocale:FileLoggerTree.kt$FileLoggerTree$String.format("Failed to write log to %s", file) ImplicitDefaultLocale:FileLoggerTree.kt$FileLoggerTree$String.format("Log file rotated, logging into file %s", file?.name) ImplicitDefaultLocale:FileLoggerTree.kt$FileLoggerTree$String.format("Logging into file %s", file?.name) @@ -13,7 +13,7 @@ LongMethod:PlaylistsFragment.kt$PlaylistsFragment$override fun onContextItemSelected(menuItem: MenuItem): Boolean LongMethod:ShareHandler.kt$ShareHandler$private fun showDialog( fragment: Fragment, shareDetails: ShareDetails, swipe: SwipeRefreshLayout?, cancellationToken: CancellationToken, additionalId: String? ) LongMethod:SharesFragment.kt$SharesFragment$override fun onContextItemSelected(menuItem: MenuItem): Boolean - LongParameterList:ServerRowAdapter.kt$ServerRowAdapter$( private var context: Context, passedData: Array<ServerSetting>, private val model: ServerSettingsModel, private val activeServerProvider: ActiveServerProvider, private val manageMode: Boolean, private val serverDeletedCallback: ((Int) -> Unit), private val serverEditRequestedCallback: ((Int) -> Unit) ) + LongParameterList:ServerRowAdapter.kt$ServerRowAdapter$( private var context: Context, passedData: Array<ServerSetting>, private val model: ServerSettingsModel, private val activeServerProvider: ActiveServerProvider, private val manageMode: Boolean, private val serverDeletedCallback: ((Int) -> Unit), private val serverEditRequestedCallback: ((Int) -> Unit) ) MagicNumber:ActiveServerProvider.kt$ActiveServerProvider$8192 MagicNumber:JukeboxMediaPlayer.kt$JukeboxMediaPlayer$0.05f MagicNumber:JukeboxMediaPlayer.kt$JukeboxMediaPlayer$50 diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/receiver/UltrasonicIntentReceiver.java b/ultrasonic/src/main/java/org/moire/ultrasonic/receiver/UltrasonicIntentReceiver.java index 5eb8e214..9297b5d8 100644 --- a/ultrasonic/src/main/java/org/moire/ultrasonic/receiver/UltrasonicIntentReceiver.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/receiver/UltrasonicIntentReceiver.java @@ -13,7 +13,7 @@ import static org.koin.java.KoinJavaComponent.inject; public class UltrasonicIntentReceiver extends BroadcastReceiver { - private Lazy lifecycleSupport = inject(MediaPlayerLifecycleSupport.class); + private final Lazy lifecycleSupport = inject(MediaPlayerLifecycleSupport.class); @Override public void onReceive(Context context, Intent intent)