From ac111d8db945a8de8a057990d4281a6a4c40fe0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Rychnovsk=C3=BD?= Date: Tue, 20 Jun 2023 11:27:44 +0200 Subject: [PATCH] [#194] Detekt enhancement * [#194] Detekt 1.23.0 * [#195] Detekt MaxLineLength rule turn on * Update dependency locks --- bip39-lib/build.gradle.kts | 2 + bip39-lib/gradle.lockfile | 12 +-- .../cash/z/ecc/android/bip39/MnemonicsTest.kt | 13 +-- .../z/ecc/android/bip39/utils/TestData.kt | 1 + .../z/ecc/android/crypto/PBEKeySpecCommon.kt | 7 +- .../android/crypto/SecretKeyFactoryCommon.kt | 3 +- build-conventions-bip39/gradle.lockfile | 11 +-- buildscript-gradle.lockfile | 7 +- gradle.lockfile | 84 +++++++++---------- gradle/libs.versions.toml | 3 +- tools/detekt-baseline.xml | 15 ---- tools/detekt.yml | 22 ++--- 12 files changed, 80 insertions(+), 100 deletions(-) diff --git a/bip39-lib/build.gradle.kts b/bip39-lib/build.gradle.kts index 4eeabb6..4ce89f8 100644 --- a/bip39-lib/build.gradle.kts +++ b/bip39-lib/build.gradle.kts @@ -49,10 +49,12 @@ kotlin { implementation(libs.kotest.property) } } + @Suppress("UnusedPrivateProperty") val jvmMain by getting { dependencies { } } + @Suppress("UnusedPrivateProperty") val jvmTest by getting { dependencies { implementation(libs.kotest.runner.junit5) diff --git a/bip39-lib/gradle.lockfile b/bip39-lib/gradle.lockfile index 432e17b..3037828 100644 --- a/bip39-lib/gradle.lockfile +++ b/bip39-lib/gradle.lockfile @@ -183,14 +183,14 @@ org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.21=kotlinCompilerPluginClasspathJv org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10=dokkaGfmPartialPlugin,dokkaGfmPartialRuntime,dokkaGfmPlugin,dokkaGfmRuntime,dokkaHtmlPartialPlugin,dokkaHtmlPartialRuntime,dokkaHtmlPlugin,dokkaHtmlRuntime,dokkaJavadocPartialPlugin,dokkaJavadocPartialRuntime,dokkaJavadocPlugin,dokkaJavadocRuntime,dokkaJekyllPartialPlugin,dokkaJekyllPartialRuntime,dokkaJekyllPlugin,dokkaJekyllRuntime,kotlinCompilerPluginClasspathMetadataNonJvmMain,kotlinCompilerPluginClasspathMetadataUnixMain org.jetbrains.kotlin:kotlin-stdlib-common:1.8.21=commonMainApiDependenciesMetadata,commonMainCompileOnlyDependenciesMetadata,commonMainImplementationDependenciesMetadata,commonMainResolvableDependenciesMetadata,commonTestApiDependenciesMetadata,commonTestCompileOnlyDependenciesMetadata,commonTestImplementationDependenciesMetadata,commonTestResolvableDependenciesMetadata,iosArm64CompilationApi,iosArm64MainResolvableDependenciesMetadata,iosArm64TestResolvableDependenciesMetadata,iosSimulatorArm64CompilationApi,iosSimulatorArm64MainResolvableDependenciesMetadata,iosSimulatorArm64TestResolvableDependenciesMetadata,iosX64CompilationApi,iosX64MainResolvableDependenciesMetadata,iosX64TestResolvableDependenciesMetadata,jvmMainResolvableDependenciesMetadata,jvmTestResolvableDependenciesMetadata,kotlinCompilerClasspath,kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinKlibCommonizerClasspath,linuxX64CompilationApi,linuxX64MainResolvableDependenciesMetadata,linuxX64TestResolvableDependenciesMetadata,macosArm64CompilationApi,macosArm64MainResolvableDependenciesMetadata,macosArm64TestResolvableDependenciesMetadata,macosX64CompilationApi,macosX64MainResolvableDependenciesMetadata,macosX64TestResolvableDependenciesMetadata,metadataCommonMainCompileClasspath,metadataCompileClasspath,metadataNonJvmMainCompileClasspath,metadataUnixMainCompileClasspath,mingwMainApiDependenciesMetadata,mingwMainCompileOnlyDependenciesMetadata,mingwMainImplementationDependenciesMetadata,mingwMainResolvableDependenciesMetadata,mingwX64CompilationApi,mingwX64MainResolvableDependenciesMetadata,mingwX64TestResolvableDependenciesMetadata,nonJvmMainApiDependenciesMetadata,nonJvmMainCompileOnlyDependenciesMetadata,nonJvmMainImplementationDependenciesMetadata,nonJvmMainResolvableDependenciesMetadata,tvosArm64CompilationApi,tvosArm64MainResolvableDependenciesMetadata,tvosArm64TestResolvableDependenciesMetadata,tvosSimulatorArm64CompilationApi,tvosSimulatorArm64MainResolvableDependenciesMetadata,tvosSimulatorArm64TestResolvableDependenciesMetadata,tvosX64CompilationApi,tvosX64MainResolvableDependenciesMetadata,tvosX64TestResolvableDependenciesMetadata,unixMainApiDependenciesMetadata,unixMainCompileOnlyDependenciesMetadata,unixMainImplementationDependenciesMetadata,unixMainResolvableDependenciesMetadata,watchosArm32CompilationApi,watchosArm32MainResolvableDependenciesMetadata,watchosArm32TestResolvableDependenciesMetadata,watchosArm64CompilationApi,watchosArm64MainResolvableDependenciesMetadata,watchosArm64TestResolvableDependenciesMetadata,watchosSimulatorArm64CompilationApi,watchosSimulatorArm64MainResolvableDependenciesMetadata,watchosSimulatorArm64TestResolvableDependenciesMetadata,watchosX64CompilationApi,watchosX64MainResolvableDependenciesMetadata,watchosX64TestResolvableDependenciesMetadata org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.10=dokkaGfmPartialPlugin,dokkaGfmPartialRuntime,dokkaGfmPlugin,dokkaGfmRuntime,dokkaHtmlPartialPlugin,dokkaHtmlPartialRuntime,dokkaHtmlPlugin,dokkaHtmlRuntime,dokkaJavadocPartialPlugin,dokkaJavadocPartialRuntime,dokkaJavadocPlugin,dokkaJavadocRuntime,dokkaJekyllPartialPlugin,dokkaJekyllPartialRuntime,dokkaJekyllPlugin,dokkaJekyllRuntime,kotlinCompilerPluginClasspathMetadataNonJvmMain,kotlinCompilerPluginClasspathMetadataUnixMain -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20=iosArm64TestCompilationDependenciesMetadata,iosArm64TestCompileKlibraries,iosArm64TestCompileKlibrariesCopy,iosArm64TestResolvableDependenciesMetadata,iosSimulatorArm64TestCompilationDependenciesMetadata,iosSimulatorArm64TestCompileKlibraries,iosSimulatorArm64TestCompileKlibrariesCopy,iosSimulatorArm64TestResolvableDependenciesMetadata,iosX64TestCompilationDependenciesMetadata,iosX64TestCompileKlibraries,iosX64TestCompileKlibrariesCopy,iosX64TestResolvableDependenciesMetadata,linuxX64TestCompilationDependenciesMetadata,linuxX64TestCompileKlibraries,linuxX64TestResolvableDependenciesMetadata,macosArm64TestCompilationDependenciesMetadata,macosArm64TestCompileKlibraries,macosArm64TestCompileKlibrariesCopy,macosArm64TestResolvableDependenciesMetadata,macosX64TestCompilationDependenciesMetadata,macosX64TestCompileKlibraries,macosX64TestCompileKlibrariesCopy,macosX64TestResolvableDependenciesMetadata,mingwX64TestCompilationDependenciesMetadata,mingwX64TestCompileKlibraries,mingwX64TestResolvableDependenciesMetadata,tvosArm64TestCompilationDependenciesMetadata,tvosArm64TestCompileKlibraries,tvosArm64TestCompileKlibrariesCopy,tvosArm64TestResolvableDependenciesMetadata,tvosSimulatorArm64TestCompilationDependenciesMetadata,tvosSimulatorArm64TestCompileKlibraries,tvosSimulatorArm64TestCompileKlibrariesCopy,tvosSimulatorArm64TestResolvableDependenciesMetadata,tvosX64TestCompilationDependenciesMetadata,tvosX64TestCompileKlibraries,tvosX64TestCompileKlibrariesCopy,tvosX64TestResolvableDependenciesMetadata,watchosArm32TestCompilationDependenciesMetadata,watchosArm32TestCompileKlibraries,watchosArm32TestCompileKlibrariesCopy,watchosArm32TestResolvableDependenciesMetadata,watchosArm64TestCompilationDependenciesMetadata,watchosArm64TestCompileKlibraries,watchosArm64TestCompileKlibrariesCopy,watchosArm64TestResolvableDependenciesMetadata,watchosSimulatorArm64TestCompilationDependenciesMetadata,watchosSimulatorArm64TestCompileKlibraries,watchosSimulatorArm64TestCompileKlibrariesCopy,watchosSimulatorArm64TestResolvableDependenciesMetadata,watchosX64TestCompilationDependenciesMetadata,watchosX64TestCompileKlibraries,watchosX64TestCompileKlibrariesCopy,watchosX64TestResolvableDependenciesMetadata -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.21=commonTestApiDependenciesMetadata,commonTestCompileOnlyDependenciesMetadata,commonTestImplementationDependenciesMetadata,commonTestResolvableDependenciesMetadata,jvmCompileClasspath,jvmMainApiDependenciesMetadata,jvmMainCompileOnlyDependenciesMetadata,jvmMainImplementationDependenciesMetadata,jvmMainResolvableDependenciesMetadata,jvmRuntimeClasspath,jvmTestApiDependenciesMetadata,jvmTestCompileClasspath,jvmTestCompileOnlyDependenciesMetadata,jvmTestImplementationDependenciesMetadata,jvmTestResolvableDependenciesMetadata,jvmTestRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20=commonTestApiDependenciesMetadata,commonTestCompileOnlyDependenciesMetadata,commonTestImplementationDependenciesMetadata,commonTestResolvableDependenciesMetadata,iosArm64TestCompilationDependenciesMetadata,iosArm64TestCompileKlibraries,iosArm64TestCompileKlibrariesCopy,iosArm64TestResolvableDependenciesMetadata,iosSimulatorArm64TestCompilationDependenciesMetadata,iosSimulatorArm64TestCompileKlibraries,iosSimulatorArm64TestCompileKlibrariesCopy,iosSimulatorArm64TestResolvableDependenciesMetadata,iosX64TestCompilationDependenciesMetadata,iosX64TestCompileKlibraries,iosX64TestCompileKlibrariesCopy,iosX64TestResolvableDependenciesMetadata,linuxX64TestCompilationDependenciesMetadata,linuxX64TestCompileKlibraries,linuxX64TestResolvableDependenciesMetadata,macosArm64TestCompilationDependenciesMetadata,macosArm64TestCompileKlibraries,macosArm64TestCompileKlibrariesCopy,macosArm64TestResolvableDependenciesMetadata,macosX64TestCompilationDependenciesMetadata,macosX64TestCompileKlibraries,macosX64TestCompileKlibrariesCopy,macosX64TestResolvableDependenciesMetadata,mingwX64TestCompilationDependenciesMetadata,mingwX64TestCompileKlibraries,mingwX64TestResolvableDependenciesMetadata,tvosArm64TestCompilationDependenciesMetadata,tvosArm64TestCompileKlibraries,tvosArm64TestCompileKlibrariesCopy,tvosArm64TestResolvableDependenciesMetadata,tvosSimulatorArm64TestCompilationDependenciesMetadata,tvosSimulatorArm64TestCompileKlibraries,tvosSimulatorArm64TestCompileKlibrariesCopy,tvosSimulatorArm64TestResolvableDependenciesMetadata,tvosX64TestCompilationDependenciesMetadata,tvosX64TestCompileKlibraries,tvosX64TestCompileKlibrariesCopy,tvosX64TestResolvableDependenciesMetadata,watchosArm32TestCompilationDependenciesMetadata,watchosArm32TestCompileKlibraries,watchosArm32TestCompileKlibrariesCopy,watchosArm32TestResolvableDependenciesMetadata,watchosArm64TestCompilationDependenciesMetadata,watchosArm64TestCompileKlibraries,watchosArm64TestCompileKlibrariesCopy,watchosArm64TestResolvableDependenciesMetadata,watchosSimulatorArm64TestCompilationDependenciesMetadata,watchosSimulatorArm64TestCompileKlibraries,watchosSimulatorArm64TestCompileKlibrariesCopy,watchosSimulatorArm64TestResolvableDependenciesMetadata,watchosX64TestCompilationDependenciesMetadata,watchosX64TestCompileKlibraries,watchosX64TestCompileKlibrariesCopy,watchosX64TestResolvableDependenciesMetadata +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.21=jvmCompileClasspath,jvmMainApiDependenciesMetadata,jvmMainCompileOnlyDependenciesMetadata,jvmMainImplementationDependenciesMetadata,jvmMainResolvableDependenciesMetadata,jvmRuntimeClasspath,jvmTestApiDependenciesMetadata,jvmTestCompileClasspath,jvmTestCompileOnlyDependenciesMetadata,jvmTestImplementationDependenciesMetadata,jvmTestResolvableDependenciesMetadata,jvmTestRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10=dokkaGfmPartialPlugin,dokkaGfmPartialRuntime,dokkaGfmPlugin,dokkaGfmRuntime,dokkaHtmlPartialPlugin,dokkaHtmlPartialRuntime,dokkaHtmlPlugin,dokkaHtmlRuntime,dokkaJavadocPartialPlugin,dokkaJavadocPartialRuntime,dokkaJavadocPlugin,dokkaJavadocRuntime,dokkaJekyllPartialPlugin,dokkaJekyllPartialRuntime,dokkaJekyllPlugin,dokkaJekyllRuntime,kotlinCompilerPluginClasspathMetadataNonJvmMain,kotlinCompilerPluginClasspathMetadataUnixMain -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20=iosArm64TestCompilationDependenciesMetadata,iosArm64TestCompileKlibraries,iosArm64TestCompileKlibrariesCopy,iosArm64TestResolvableDependenciesMetadata,iosSimulatorArm64TestCompilationDependenciesMetadata,iosSimulatorArm64TestCompileKlibraries,iosSimulatorArm64TestCompileKlibrariesCopy,iosSimulatorArm64TestResolvableDependenciesMetadata,iosX64TestCompilationDependenciesMetadata,iosX64TestCompileKlibraries,iosX64TestCompileKlibrariesCopy,iosX64TestResolvableDependenciesMetadata,linuxX64TestCompilationDependenciesMetadata,linuxX64TestCompileKlibraries,linuxX64TestResolvableDependenciesMetadata,macosArm64TestCompilationDependenciesMetadata,macosArm64TestCompileKlibraries,macosArm64TestCompileKlibrariesCopy,macosArm64TestResolvableDependenciesMetadata,macosX64TestCompilationDependenciesMetadata,macosX64TestCompileKlibraries,macosX64TestCompileKlibrariesCopy,macosX64TestResolvableDependenciesMetadata,mingwX64TestCompilationDependenciesMetadata,mingwX64TestCompileKlibraries,mingwX64TestResolvableDependenciesMetadata,tvosArm64TestCompilationDependenciesMetadata,tvosArm64TestCompileKlibraries,tvosArm64TestCompileKlibrariesCopy,tvosArm64TestResolvableDependenciesMetadata,tvosSimulatorArm64TestCompilationDependenciesMetadata,tvosSimulatorArm64TestCompileKlibraries,tvosSimulatorArm64TestCompileKlibrariesCopy,tvosSimulatorArm64TestResolvableDependenciesMetadata,tvosX64TestCompilationDependenciesMetadata,tvosX64TestCompileKlibraries,tvosX64TestCompileKlibrariesCopy,tvosX64TestResolvableDependenciesMetadata,watchosArm32TestCompilationDependenciesMetadata,watchosArm32TestCompileKlibraries,watchosArm32TestCompileKlibrariesCopy,watchosArm32TestResolvableDependenciesMetadata,watchosArm64TestCompilationDependenciesMetadata,watchosArm64TestCompileKlibraries,watchosArm64TestCompileKlibrariesCopy,watchosArm64TestResolvableDependenciesMetadata,watchosSimulatorArm64TestCompilationDependenciesMetadata,watchosSimulatorArm64TestCompileKlibraries,watchosSimulatorArm64TestCompileKlibrariesCopy,watchosSimulatorArm64TestResolvableDependenciesMetadata,watchosX64TestCompilationDependenciesMetadata,watchosX64TestCompileKlibraries,watchosX64TestCompileKlibrariesCopy,watchosX64TestResolvableDependenciesMetadata -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21=commonTestApiDependenciesMetadata,commonTestCompileOnlyDependenciesMetadata,commonTestImplementationDependenciesMetadata,commonTestResolvableDependenciesMetadata,jvmCompileClasspath,jvmMainApiDependenciesMetadata,jvmMainCompileOnlyDependenciesMetadata,jvmMainImplementationDependenciesMetadata,jvmMainResolvableDependenciesMetadata,jvmRuntimeClasspath,jvmTestApiDependenciesMetadata,jvmTestCompileClasspath,jvmTestCompileOnlyDependenciesMetadata,jvmTestImplementationDependenciesMetadata,jvmTestResolvableDependenciesMetadata,jvmTestRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20=commonTestApiDependenciesMetadata,commonTestCompileOnlyDependenciesMetadata,commonTestImplementationDependenciesMetadata,commonTestResolvableDependenciesMetadata,iosArm64TestCompilationDependenciesMetadata,iosArm64TestCompileKlibraries,iosArm64TestCompileKlibrariesCopy,iosArm64TestResolvableDependenciesMetadata,iosSimulatorArm64TestCompilationDependenciesMetadata,iosSimulatorArm64TestCompileKlibraries,iosSimulatorArm64TestCompileKlibrariesCopy,iosSimulatorArm64TestResolvableDependenciesMetadata,iosX64TestCompilationDependenciesMetadata,iosX64TestCompileKlibraries,iosX64TestCompileKlibrariesCopy,iosX64TestResolvableDependenciesMetadata,linuxX64TestCompilationDependenciesMetadata,linuxX64TestCompileKlibraries,linuxX64TestResolvableDependenciesMetadata,macosArm64TestCompilationDependenciesMetadata,macosArm64TestCompileKlibraries,macosArm64TestCompileKlibrariesCopy,macosArm64TestResolvableDependenciesMetadata,macosX64TestCompilationDependenciesMetadata,macosX64TestCompileKlibraries,macosX64TestCompileKlibrariesCopy,macosX64TestResolvableDependenciesMetadata,mingwX64TestCompilationDependenciesMetadata,mingwX64TestCompileKlibraries,mingwX64TestResolvableDependenciesMetadata,tvosArm64TestCompilationDependenciesMetadata,tvosArm64TestCompileKlibraries,tvosArm64TestCompileKlibrariesCopy,tvosArm64TestResolvableDependenciesMetadata,tvosSimulatorArm64TestCompilationDependenciesMetadata,tvosSimulatorArm64TestCompileKlibraries,tvosSimulatorArm64TestCompileKlibrariesCopy,tvosSimulatorArm64TestResolvableDependenciesMetadata,tvosX64TestCompilationDependenciesMetadata,tvosX64TestCompileKlibraries,tvosX64TestCompileKlibrariesCopy,tvosX64TestResolvableDependenciesMetadata,watchosArm32TestCompilationDependenciesMetadata,watchosArm32TestCompileKlibraries,watchosArm32TestCompileKlibrariesCopy,watchosArm32TestResolvableDependenciesMetadata,watchosArm64TestCompilationDependenciesMetadata,watchosArm64TestCompileKlibraries,watchosArm64TestCompileKlibrariesCopy,watchosArm64TestResolvableDependenciesMetadata,watchosSimulatorArm64TestCompilationDependenciesMetadata,watchosSimulatorArm64TestCompileKlibraries,watchosSimulatorArm64TestCompileKlibrariesCopy,watchosSimulatorArm64TestResolvableDependenciesMetadata,watchosX64TestCompilationDependenciesMetadata,watchosX64TestCompileKlibraries,watchosX64TestCompileKlibrariesCopy,watchosX64TestResolvableDependenciesMetadata +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21=jvmCompileClasspath,jvmMainApiDependenciesMetadata,jvmMainCompileOnlyDependenciesMetadata,jvmMainImplementationDependenciesMetadata,jvmMainResolvableDependenciesMetadata,jvmRuntimeClasspath,jvmTestApiDependenciesMetadata,jvmTestCompileClasspath,jvmTestCompileOnlyDependenciesMetadata,jvmTestImplementationDependenciesMetadata,jvmTestResolvableDependenciesMetadata,jvmTestRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib:1.8.10=dokkaGfmPartialPlugin,dokkaGfmPartialRuntime,dokkaGfmPlugin,dokkaGfmRuntime,dokkaHtmlPartialPlugin,dokkaHtmlPartialRuntime,dokkaHtmlPlugin,dokkaHtmlRuntime,dokkaJavadocPartialPlugin,dokkaJavadocPartialRuntime,dokkaJavadocPlugin,dokkaJavadocRuntime,dokkaJekyllPartialPlugin,dokkaJekyllPartialRuntime,dokkaJekyllPlugin,dokkaJekyllRuntime,kotlinCompilerPluginClasspathMetadataNonJvmMain,kotlinCompilerPluginClasspathMetadataUnixMain -org.jetbrains.kotlin:kotlin-stdlib:1.8.20=iosArm64TestCompilationDependenciesMetadata,iosArm64TestCompileKlibraries,iosArm64TestCompileKlibrariesCopy,iosArm64TestResolvableDependenciesMetadata,iosSimulatorArm64TestCompilationDependenciesMetadata,iosSimulatorArm64TestCompileKlibraries,iosSimulatorArm64TestCompileKlibrariesCopy,iosSimulatorArm64TestResolvableDependenciesMetadata,iosX64TestCompilationDependenciesMetadata,iosX64TestCompileKlibraries,iosX64TestCompileKlibrariesCopy,iosX64TestResolvableDependenciesMetadata,linuxX64TestCompilationDependenciesMetadata,linuxX64TestCompileKlibraries,linuxX64TestResolvableDependenciesMetadata,macosArm64TestCompilationDependenciesMetadata,macosArm64TestCompileKlibraries,macosArm64TestCompileKlibrariesCopy,macosArm64TestResolvableDependenciesMetadata,macosX64TestCompilationDependenciesMetadata,macosX64TestCompileKlibraries,macosX64TestCompileKlibrariesCopy,macosX64TestResolvableDependenciesMetadata,mingwX64TestCompilationDependenciesMetadata,mingwX64TestCompileKlibraries,mingwX64TestResolvableDependenciesMetadata,tvosArm64TestCompilationDependenciesMetadata,tvosArm64TestCompileKlibraries,tvosArm64TestCompileKlibrariesCopy,tvosArm64TestResolvableDependenciesMetadata,tvosSimulatorArm64TestCompilationDependenciesMetadata,tvosSimulatorArm64TestCompileKlibraries,tvosSimulatorArm64TestCompileKlibrariesCopy,tvosSimulatorArm64TestResolvableDependenciesMetadata,tvosX64TestCompilationDependenciesMetadata,tvosX64TestCompileKlibraries,tvosX64TestCompileKlibrariesCopy,tvosX64TestResolvableDependenciesMetadata,watchosArm32TestCompilationDependenciesMetadata,watchosArm32TestCompileKlibraries,watchosArm32TestCompileKlibrariesCopy,watchosArm32TestResolvableDependenciesMetadata,watchosArm64TestCompilationDependenciesMetadata,watchosArm64TestCompileKlibraries,watchosArm64TestCompileKlibrariesCopy,watchosArm64TestResolvableDependenciesMetadata,watchosSimulatorArm64TestCompilationDependenciesMetadata,watchosSimulatorArm64TestCompileKlibraries,watchosSimulatorArm64TestCompileKlibrariesCopy,watchosSimulatorArm64TestResolvableDependenciesMetadata,watchosX64TestCompilationDependenciesMetadata,watchosX64TestCompileKlibraries,watchosX64TestCompileKlibrariesCopy,watchosX64TestResolvableDependenciesMetadata -org.jetbrains.kotlin:kotlin-stdlib:1.8.21=commonTestApiDependenciesMetadata,commonTestCompileOnlyDependenciesMetadata,commonTestImplementationDependenciesMetadata,commonTestResolvableDependenciesMetadata,jvmCompileClasspath,jvmMainApiDependenciesMetadata,jvmMainCompileOnlyDependenciesMetadata,jvmMainImplementationDependenciesMetadata,jvmMainResolvableDependenciesMetadata,jvmRuntimeClasspath,jvmTestApiDependenciesMetadata,jvmTestCompileClasspath,jvmTestCompileOnlyDependenciesMetadata,jvmTestImplementationDependenciesMetadata,jvmTestResolvableDependenciesMetadata,jvmTestRuntimeClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-stdlib:1.8.20=commonTestApiDependenciesMetadata,commonTestCompileOnlyDependenciesMetadata,commonTestImplementationDependenciesMetadata,commonTestResolvableDependenciesMetadata,iosArm64TestCompilationDependenciesMetadata,iosArm64TestCompileKlibraries,iosArm64TestCompileKlibrariesCopy,iosArm64TestResolvableDependenciesMetadata,iosSimulatorArm64TestCompilationDependenciesMetadata,iosSimulatorArm64TestCompileKlibraries,iosSimulatorArm64TestCompileKlibrariesCopy,iosSimulatorArm64TestResolvableDependenciesMetadata,iosX64TestCompilationDependenciesMetadata,iosX64TestCompileKlibraries,iosX64TestCompileKlibrariesCopy,iosX64TestResolvableDependenciesMetadata,linuxX64TestCompilationDependenciesMetadata,linuxX64TestCompileKlibraries,linuxX64TestResolvableDependenciesMetadata,macosArm64TestCompilationDependenciesMetadata,macosArm64TestCompileKlibraries,macosArm64TestCompileKlibrariesCopy,macosArm64TestResolvableDependenciesMetadata,macosX64TestCompilationDependenciesMetadata,macosX64TestCompileKlibraries,macosX64TestCompileKlibrariesCopy,macosX64TestResolvableDependenciesMetadata,mingwX64TestCompilationDependenciesMetadata,mingwX64TestCompileKlibraries,mingwX64TestResolvableDependenciesMetadata,tvosArm64TestCompilationDependenciesMetadata,tvosArm64TestCompileKlibraries,tvosArm64TestCompileKlibrariesCopy,tvosArm64TestResolvableDependenciesMetadata,tvosSimulatorArm64TestCompilationDependenciesMetadata,tvosSimulatorArm64TestCompileKlibraries,tvosSimulatorArm64TestCompileKlibrariesCopy,tvosSimulatorArm64TestResolvableDependenciesMetadata,tvosX64TestCompilationDependenciesMetadata,tvosX64TestCompileKlibraries,tvosX64TestCompileKlibrariesCopy,tvosX64TestResolvableDependenciesMetadata,watchosArm32TestCompilationDependenciesMetadata,watchosArm32TestCompileKlibraries,watchosArm32TestCompileKlibrariesCopy,watchosArm32TestResolvableDependenciesMetadata,watchosArm64TestCompilationDependenciesMetadata,watchosArm64TestCompileKlibraries,watchosArm64TestCompileKlibrariesCopy,watchosArm64TestResolvableDependenciesMetadata,watchosSimulatorArm64TestCompilationDependenciesMetadata,watchosSimulatorArm64TestCompileKlibraries,watchosSimulatorArm64TestCompileKlibrariesCopy,watchosSimulatorArm64TestResolvableDependenciesMetadata,watchosX64TestCompilationDependenciesMetadata,watchosX64TestCompileKlibraries,watchosX64TestCompileKlibrariesCopy,watchosX64TestResolvableDependenciesMetadata +org.jetbrains.kotlin:kotlin-stdlib:1.8.21=jvmCompileClasspath,jvmMainApiDependenciesMetadata,jvmMainCompileOnlyDependenciesMetadata,jvmMainImplementationDependenciesMetadata,jvmMainResolvableDependenciesMetadata,jvmRuntimeClasspath,jvmTestApiDependenciesMetadata,jvmTestCompileClasspath,jvmTestCompileOnlyDependenciesMetadata,jvmTestImplementationDependenciesMetadata,jvmTestResolvableDependenciesMetadata,jvmTestRuntimeClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathJvmMain,kotlinCompilerPluginClasspathJvmTest,kotlinCompilerPluginClasspathMetadataCommonMain,kotlinCompilerPluginClasspathMetadataMain,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-test-annotations-common:1.8.21=commonTestApiDependenciesMetadata,commonTestCompileOnlyDependenciesMetadata,commonTestImplementationDependenciesMetadata,commonTestResolvableDependenciesMetadata,iosArm64TestResolvableDependenciesMetadata,iosSimulatorArm64TestResolvableDependenciesMetadata,iosX64TestResolvableDependenciesMetadata,jvmTestResolvableDependenciesMetadata,linuxX64TestResolvableDependenciesMetadata,macosArm64TestResolvableDependenciesMetadata,macosX64TestResolvableDependenciesMetadata,mingwX64TestResolvableDependenciesMetadata,tvosArm64TestResolvableDependenciesMetadata,tvosSimulatorArm64TestResolvableDependenciesMetadata,tvosX64TestResolvableDependenciesMetadata,watchosArm32TestResolvableDependenciesMetadata,watchosArm64TestResolvableDependenciesMetadata,watchosSimulatorArm64TestResolvableDependenciesMetadata,watchosX64TestResolvableDependenciesMetadata org.jetbrains.kotlin:kotlin-test-common:1.8.21=commonTestApiDependenciesMetadata,commonTestCompileOnlyDependenciesMetadata,commonTestImplementationDependenciesMetadata,commonTestResolvableDependenciesMetadata,iosArm64TestResolvableDependenciesMetadata,iosSimulatorArm64TestResolvableDependenciesMetadata,iosX64TestResolvableDependenciesMetadata,jvmTestResolvableDependenciesMetadata,linuxX64TestResolvableDependenciesMetadata,macosArm64TestResolvableDependenciesMetadata,macosX64TestResolvableDependenciesMetadata,mingwX64TestResolvableDependenciesMetadata,tvosArm64TestResolvableDependenciesMetadata,tvosSimulatorArm64TestResolvableDependenciesMetadata,tvosX64TestResolvableDependenciesMetadata,watchosArm32TestResolvableDependenciesMetadata,watchosArm64TestResolvableDependenciesMetadata,watchosSimulatorArm64TestResolvableDependenciesMetadata,watchosX64TestResolvableDependenciesMetadata org.jetbrains.kotlin:kotlin-test-junit5:1.8.21=jvmTestCompileClasspath,jvmTestRuntimeClasspath diff --git a/bip39-lib/src/commonTest/kotlin/cash/z/ecc/android/bip39/MnemonicsTest.kt b/bip39-lib/src/commonTest/kotlin/cash/z/ecc/android/bip39/MnemonicsTest.kt index 62227d9..c5d13ec 100644 --- a/bip39-lib/src/commonTest/kotlin/cash/z/ecc/android/bip39/MnemonicsTest.kt +++ b/bip39-lib/src/commonTest/kotlin/cash/z/ecc/android/bip39/MnemonicsTest.kt @@ -18,8 +18,8 @@ import io.kotest.matchers.shouldNotBe private const val DEFAULT_LANGUAGE_CODE = "en" class MnemonicsTest : BehaviorSpec({ - val validPhrase = - "void come effort suffer camp survey warrior heavy shoot primary clutch crush open amazing screen patrol group space point ten exist slush involve unfold" + val validPhrase = "void come effort suffer camp survey warrior heavy shoot primary clutch crush open amazing" + + " screen patrol group space point ten exist slush involve unfold" Given("a valid, known mnemonic phrase") { When("it is converted into a seed") { @@ -99,17 +99,20 @@ class MnemonicsTest : BehaviorSpec({ row( 24, "b893a6b0da8fc9b73d709bda939e818a677aa376c266949378300b65a34b8e52", - "review outdoor promote relax wish swear volume beach surround ostrich parrot below jeans faculty swallow error nest orange army bitter focus place deer fat" + "review outdoor promote relax wish swear volume beach surround ostrich parrot below jeans" + + " faculty swallow error nest orange army bitter focus place deer fat" ), row( 18, "d5bcbf62dea1a07ab1abb0144b299300137168a7939f3071f112b557", - "stick tourist suffer run borrow diary shop invite begin flock gospel ability damage reform oxygen initial corn moon dwarf height image" + "stick tourist suffer run borrow diary shop invite begin flock gospel ability damage reform" + + " oxygen initial corn moon dwarf height image" ), row( 15, "e06ce21369dc09eb2bda66510a76f65ab3f947cce90fcb10", - "there grow luggage squirrel scene void quarter error extra father rural rely display physical crisp capable slam lumber" + "there grow luggage squirrel scene void quarter error extra father rural rely display" + + " physical crisp capable slam lumber" ), row( 12, diff --git a/bip39-lib/src/commonTest/kotlin/cash/z/ecc/android/bip39/utils/TestData.kt b/bip39-lib/src/commonTest/kotlin/cash/z/ecc/android/bip39/utils/TestData.kt index 8f3631d..e66b1af 100644 --- a/bip39-lib/src/commonTest/kotlin/cash/z/ecc/android/bip39/utils/TestData.kt +++ b/bip39-lib/src/commonTest/kotlin/cash/z/ecc/android/bip39/utils/TestData.kt @@ -1,5 +1,6 @@ package cash.z.ecc.android.bip39.utils +@Suppress("MaxLineLength") val englishTestData = listOf( listOf( "00000000000000000000000000000000", diff --git a/bip39-lib/src/jvmMain/kotlin/cash/z/ecc/android/crypto/PBEKeySpecCommon.kt b/bip39-lib/src/jvmMain/kotlin/cash/z/ecc/android/crypto/PBEKeySpecCommon.kt index 3260f9d..b898213 100644 --- a/bip39-lib/src/jvmMain/kotlin/cash/z/ecc/android/crypto/PBEKeySpecCommon.kt +++ b/bip39-lib/src/jvmMain/kotlin/cash/z/ecc/android/crypto/PBEKeySpecCommon.kt @@ -2,7 +2,12 @@ package cash.z.ecc.android.crypto import javax.crypto.spec.PBEKeySpec -internal actual class PBEKeySpecCommon actual constructor(password: CharArray?, salt: ByteArray, iterationCount: Int, keyLength: Int) { +internal actual class PBEKeySpecCommon actual constructor( + password: CharArray?, + salt: ByteArray, + iterationCount: Int, + keyLength: Int +) { val wrappedPbeKeySpec = PBEKeySpec(password, salt, iterationCount, keyLength) actual var password: CharArray? = null diff --git a/bip39-lib/src/nonJvmMain/kotlin/cash/z/ecc/android/crypto/SecretKeyFactoryCommon.kt b/bip39-lib/src/nonJvmMain/kotlin/cash/z/ecc/android/crypto/SecretKeyFactoryCommon.kt index baf3b6c..49d6016 100644 --- a/bip39-lib/src/nonJvmMain/kotlin/cash/z/ecc/android/crypto/SecretKeyFactoryCommon.kt +++ b/bip39-lib/src/nonJvmMain/kotlin/cash/z/ecc/android/crypto/SecretKeyFactoryCommon.kt @@ -12,6 +12,7 @@ internal actual class SecretKeyFactoryCommon() { actual companion object { actual fun getInstance(algorithm: String): SecretKeyFactoryCommon = SecretKeyFactoryCommon() - actual fun getInstance(algorithm: String, provider: FallbackProvider): SecretKeyFactoryCommon = SecretKeyFactoryCommon() + actual fun getInstance(algorithm: String, provider: FallbackProvider): SecretKeyFactoryCommon = + SecretKeyFactoryCommon() } } diff --git a/build-conventions-bip39/gradle.lockfile b/build-conventions-bip39/gradle.lockfile index c37ad07..f9529e0 100644 --- a/build-conventions-bip39/gradle.lockfile +++ b/build-conventions-bip39/gradle.lockfile @@ -1,8 +1,7 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -io.github.detekt.sarif4k:sarif4k:0.0.1=runtimeClasspath -io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.22.0=compileClasspath,runtimeClasspath +io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.0=compileClasspath,runtimeClasspath net.java.dev.jna:jna:5.6.0=kotlinCompilerClasspath,runtimeClasspath org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,runtimeClasspath org.jetbrains.kotlin:kotlin-android-extensions:1.8.21=runtimeClasspath @@ -39,11 +38,9 @@ org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.10=kotlinComp org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.21=runtimeClasspath org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.10=kotlinCompilerPluginClasspathMain org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.21=runtimeClasspath -org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31=runtimeClasspath org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.10=compileClasspath org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10=compileClasspath -org.jetbrains.kotlin:kotlin-stdlib:1.4.31=runtimeClasspath org.jetbrains.kotlin:kotlin-stdlib:1.8.10=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain org.jetbrains.kotlin:kotlin-tooling-core:1.8.10=kotlinCompilerPluginClasspathMain org.jetbrains.kotlin:kotlin-tooling-core:1.8.21=compileClasspath,runtimeClasspath @@ -52,10 +49,6 @@ org.jetbrains.kotlin:kotlin-util-io:1.8.21=compileClasspath,runtimeClasspath org.jetbrains.kotlin:kotlin-util-klib:1.8.21=runtimeClasspath org.jetbrains.kotlinx.kover:org.jetbrains.kotlinx.kover.gradle.plugin:0.7.0=compileClasspath,runtimeClasspath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=runtimeClasspath -org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.1.0=runtimeClasspath -org.jetbrains.kotlinx:kotlinx-serialization-core:1.1.0=runtimeClasspath -org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.1.0=runtimeClasspath -org.jetbrains.kotlinx:kotlinx-serialization-json:1.1.0=runtimeClasspath org.jetbrains.kotlinx:kover-gradle-plugin:0.7.0=compileClasspath,runtimeClasspath -org.jetbrains:annotations:13.0=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,runtimeClasspath +org.jetbrains:annotations:13.0=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain empty=annotationProcessor,kotlinScriptDefExtensions diff --git a/buildscript-gradle.lockfile b/buildscript-gradle.lockfile index 7b977ca..0672a9a 100644 --- a/buildscript-gradle.lockfile +++ b/buildscript-gradle.lockfile @@ -8,9 +8,8 @@ com.squareup.moshi:moshi:1.12.0=classpath com.squareup.okhttp3:okhttp:4.9.3=classpath com.squareup.okio:okio:2.10.0=classpath com.thoughtworks.xstream:xstream:1.4.19=classpath -io.github.detekt.sarif4k:sarif4k:0.0.1=classpath io.github.x-stream:mxparser:1.2.2=classpath -io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.22.0=classpath +io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.0=classpath net.java.dev.jna:jna:5.6.0=classpath org.jetbrains.intellij.deps:trove4j:1.0.20200330=classpath org.jetbrains.kotlin:kotlin-android-extensions:1.8.21=classpath @@ -43,10 +42,6 @@ org.jetbrains.kotlin:kotlin-util-io:1.8.21=classpath org.jetbrains.kotlin:kotlin-util-klib:1.8.21=classpath org.jetbrains.kotlinx.kover:org.jetbrains.kotlinx.kover.gradle.plugin:0.7.0=classpath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath -org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.1.0=classpath -org.jetbrains.kotlinx:kotlinx-serialization-core:1.1.0=classpath -org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.1.0=classpath -org.jetbrains.kotlinx:kotlinx-serialization-json:1.1.0=classpath org.jetbrains.kotlinx:kover-gradle-plugin:0.7.0=classpath org.jetbrains:annotations:13.0=classpath xmlpull:xmlpull:1.1.3.1=classpath diff --git a/gradle.lockfile b/gradle.lockfile index 08fc73a..ce2286e 100644 --- a/gradle.lockfile +++ b/gradle.lockfile @@ -22,32 +22,33 @@ com.pinterest.ktlint:ktlint-ruleset-standard:0.49.0=ktlint com.pinterest:ktlint:0.49.0=ktlint info.picocli:picocli:4.7.1=ktlint io.github.davidburstrom.contester:contester-breakpoint:0.2.0=detekt -io.github.detekt.sarif4k:sarif4k:0.0.1=detekt +io.github.detekt.sarif4k:sarif4k-jvm:0.4.0=detekt io.github.detekt.sarif4k:sarif4k:0.2.0=ktlint +io.github.detekt.sarif4k:sarif4k:0.4.0=detekt io.github.microutils:kotlin-logging-jvm:3.0.5=ktlint -io.gitlab.arturbosch.detekt:detekt-api:1.22.0=detekt -io.gitlab.arturbosch.detekt:detekt-cli:1.22.0=detekt -io.gitlab.arturbosch.detekt:detekt-core:1.22.0=detekt -io.gitlab.arturbosch.detekt:detekt-metrics:1.22.0=detekt -io.gitlab.arturbosch.detekt:detekt-parser:1.22.0=detekt -io.gitlab.arturbosch.detekt:detekt-psi-utils:1.22.0=detekt -io.gitlab.arturbosch.detekt:detekt-report-html:1.22.0=detekt -io.gitlab.arturbosch.detekt:detekt-report-md:1.22.0=detekt -io.gitlab.arturbosch.detekt:detekt-report-sarif:1.22.0=detekt -io.gitlab.arturbosch.detekt:detekt-report-txt:1.22.0=detekt -io.gitlab.arturbosch.detekt:detekt-report-xml:1.22.0=detekt -io.gitlab.arturbosch.detekt:detekt-rules-complexity:1.22.0=detekt -io.gitlab.arturbosch.detekt:detekt-rules-coroutines:1.22.0=detekt -io.gitlab.arturbosch.detekt:detekt-rules-documentation:1.22.0=detekt -io.gitlab.arturbosch.detekt:detekt-rules-empty:1.22.0=detekt -io.gitlab.arturbosch.detekt:detekt-rules-errorprone:1.22.0=detekt -io.gitlab.arturbosch.detekt:detekt-rules-exceptions:1.22.0=detekt -io.gitlab.arturbosch.detekt:detekt-rules-naming:1.22.0=detekt -io.gitlab.arturbosch.detekt:detekt-rules-performance:1.22.0=detekt -io.gitlab.arturbosch.detekt:detekt-rules-style:1.22.0=detekt -io.gitlab.arturbosch.detekt:detekt-rules:1.22.0=detekt -io.gitlab.arturbosch.detekt:detekt-tooling:1.22.0=detekt -io.gitlab.arturbosch.detekt:detekt-utils:1.22.0=detekt +io.gitlab.arturbosch.detekt:detekt-api:1.23.0=detekt +io.gitlab.arturbosch.detekt:detekt-cli:1.23.0=detekt +io.gitlab.arturbosch.detekt:detekt-core:1.23.0=detekt +io.gitlab.arturbosch.detekt:detekt-metrics:1.23.0=detekt +io.gitlab.arturbosch.detekt:detekt-parser:1.23.0=detekt +io.gitlab.arturbosch.detekt:detekt-psi-utils:1.23.0=detekt +io.gitlab.arturbosch.detekt:detekt-report-html:1.23.0=detekt +io.gitlab.arturbosch.detekt:detekt-report-md:1.23.0=detekt +io.gitlab.arturbosch.detekt:detekt-report-sarif:1.23.0=detekt +io.gitlab.arturbosch.detekt:detekt-report-txt:1.23.0=detekt +io.gitlab.arturbosch.detekt:detekt-report-xml:1.23.0=detekt +io.gitlab.arturbosch.detekt:detekt-rules-complexity:1.23.0=detekt +io.gitlab.arturbosch.detekt:detekt-rules-coroutines:1.23.0=detekt +io.gitlab.arturbosch.detekt:detekt-rules-documentation:1.23.0=detekt +io.gitlab.arturbosch.detekt:detekt-rules-empty:1.23.0=detekt +io.gitlab.arturbosch.detekt:detekt-rules-errorprone:1.23.0=detekt +io.gitlab.arturbosch.detekt:detekt-rules-exceptions:1.23.0=detekt +io.gitlab.arturbosch.detekt:detekt-rules-naming:1.23.0=detekt +io.gitlab.arturbosch.detekt:detekt-rules-performance:1.23.0=detekt +io.gitlab.arturbosch.detekt:detekt-rules-style:1.23.0=detekt +io.gitlab.arturbosch.detekt:detekt-rules:1.23.0=detekt +io.gitlab.arturbosch.detekt:detekt-tooling:1.23.0=detekt +io.gitlab.arturbosch.detekt:detekt-utils:1.23.0=detekt net.java.dev.jna:jna:5.6.0=detekt,kotlinKlibCommonizerClasspath,ktlint org.ec4j.core:ec4j-core:0.3.0=ktlint org.freemarker:freemarker:2.3.30=IntellijKoverConfig,koverJvmReporter @@ -66,35 +67,28 @@ org.jetbrains.intellij.deps:intellij-coverage-agent:1.0.690=koverJvmAgent,koverJ org.jetbrains.intellij.deps:intellij-coverage-reporter:1.0.668=IntellijKoverConfig org.jetbrains.intellij.deps:intellij-coverage-reporter:1.0.690=koverJvmReporter org.jetbrains.intellij.deps:trove4j:1.0.20200330=detekt,kotlinKlibCommonizerClasspath,ktlint -org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.21=detekt org.jetbrains.kotlin:kotlin-compiler-embeddable:1.8.20=ktlint -org.jetbrains.kotlin:kotlin-compiler-embeddable:1.8.21=kotlinKlibCommonizerClasspath -org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.21=detekt +org.jetbrains.kotlin:kotlin-compiler-embeddable:1.8.21=detekt,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-daemon-embeddable:1.8.20=ktlint -org.jetbrains.kotlin:kotlin-daemon-embeddable:1.8.21=kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-daemon-embeddable:1.8.21=detekt,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.8.21=kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinKlibCommonizerClasspath,ktlint -org.jetbrains.kotlin:kotlin-reflect:1.7.21=detekt -org.jetbrains.kotlin:kotlin-script-runtime:1.7.21=detekt +org.jetbrains.kotlin:kotlin-reflect:1.8.21=detekt org.jetbrains.kotlin:kotlin-script-runtime:1.8.20=ktlint -org.jetbrains.kotlin:kotlin-script-runtime:1.8.21=kotlinKlibCommonizerClasspath -org.jetbrains.kotlin:kotlin-stdlib-common:1.7.21=detekt +org.jetbrains.kotlin:kotlin-script-runtime:1.8.21=detekt,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20=ktlint -org.jetbrains.kotlin:kotlin-stdlib-common:1.8.21=kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-stdlib-common:1.8.21=detekt,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20=ktlint +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.21=detekt org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20=ktlint -org.jetbrains.kotlin:kotlin-stdlib:1.7.21=detekt +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21=detekt org.jetbrains.kotlin:kotlin-stdlib:1.8.20=ktlint -org.jetbrains.kotlin:kotlin-stdlib:1.8.21=kotlinKlibCommonizerClasspath -org.jetbrains.kotlinx:kotlinx-html-jvm:0.8.0=detekt -org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.1.0=detekt -org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.4.1=ktlint -org.jetbrains.kotlinx:kotlinx-serialization-core:1.1.0=detekt -org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.1=ktlint -org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.1.0=detekt -org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.4.1=ktlint -org.jetbrains.kotlinx:kotlinx-serialization-json:1.1.0=detekt -org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1=ktlint +org.jetbrains.kotlin:kotlin-stdlib:1.8.21=detekt,kotlinKlibCommonizerClasspath +org.jetbrains.kotlinx:kotlinx-html-jvm:0.8.1=detekt +org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.4.1=detekt,ktlint +org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.1=detekt,ktlint +org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.4.1=detekt,ktlint +org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1=detekt,ktlint org.jetbrains:annotations:13.0=detekt,kotlinKlibCommonizerClasspath,ktlint org.jetbrains:annotations:16.0.2=IntellijKoverConfig,koverJvmReporter org.json:json:20210307=IntellijKoverConfig,koverJvmReporter @@ -106,5 +100,5 @@ org.ow2.asm:asm-tree:9.5=KoverEngineConfig org.ow2.asm:asm:9.2=JacocoKoverConfig org.ow2.asm:asm:9.5=KoverEngineConfig org.slf4j:slf4j-api:2.0.4=ktlint -org.yaml:snakeyaml:1.33=detekt +org.snakeyaml:snakeyaml-engine:2.6=detekt empty=annotationProcessor,compileClasspath,detektPlugins,koverAggregatedSetup,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0429f7f..4278eab 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,4 +1,5 @@ [versions] +detekt = "1.23.0" kotest = "5.6.2" kotlin = "1.8.21" kotlinx-kover = "0.7.0" @@ -7,7 +8,7 @@ okio = "3.3.0" [libraries] com-squareup-okio = { module = "com.squareup.okio:okio", version.ref = "okio" } -detekt-gradle = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.22.0" +detekt-gradle = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" } kotest-framework-engine = { module = "io.kotest:kotest-framework-engine", version.ref = "kotest" } kotest-runner-junit5 = { module = "io.kotest:kotest-runner-junit5-jvm", version.ref = "kotest" } kotest-assertion = { module = "io.kotest:kotest-assertions-core", version.ref = "kotest" } diff --git a/tools/detekt-baseline.xml b/tools/detekt-baseline.xml index d707704..b387f17 100644 --- a/tools/detekt-baseline.xml +++ b/tools/detekt-baseline.xml @@ -3,11 +3,8 @@ ForEachOnRange:Mnemonics.kt$Mnemonics.MnemonicCode$forEach { i -> // isolate the next bit (starting from the big end) val bit = phraseIndex and (1 shl i) != 0 // if the bit is set, then update the corresponding bit in the nextByte if (bit) nextByte = nextByte or (1 shl 7 - (bitsProcessed).rem(8)).toByte() val entropyIndex = ((++bitsProcessed) - 1) / 8 // if we're at a byte boundary (excluding the extra checksum bits) if (bitsProcessed.rem(8) == 0 && entropyIndex < entropy.size) { // then set the byte and prepare to process the next byte entropy[entropyIndex] = nextByte nextByte = 0.toByte() // if we're now processing checksum bits, then track them for later } else if (entropyIndex >= entropy.size) { checksumBits.add(bit) } } - FunctionNaming:Pbkdf2Sha512.kt$Pbkdf2Sha512$private fun F(p: ByteArray, s: ByteArray, c: Int, i: Int): ByteArray - ImplicitDefaultLocale:MnemonicsTest.kt$String.format("%02x", b) IteratorNotThrowingNoSuchElementException:Mnemonics.kt$Mnemonics.MnemonicCode$<no name provided> : Iterator LargeClass:WordList.kt$WordList$Companion - LongMethod:WordList.kt$WordList.Companion$ private fun fetchWords(languageCode: String): List<String> MagicNumber:Mnemonics.kt$7 MagicNumber:Mnemonics.kt$8 MagicNumber:Mnemonics.kt$Mnemonics.MnemonicCode$10 @@ -31,11 +28,6 @@ MagicNumber:Pbkdf2Sha512.kt$Pbkdf2Sha512$4 MagicNumber:Pbkdf2Sha512.kt$Pbkdf2Sha512$8 MaxLineLength:MnemonicsTest.kt$MnemonicsTest$hex shouldBe "b873212f885ccffbf4692afcb84bc2e55886de2dfa07d90f5c3c239abc31c0a6ce047e30fd8bf6a281e71389aa82d73df74c7bbfb3b06b4639a5cee775cccd3c" - MaxLineLength:MnemonicsTest.kt$MnemonicsTest$row(12, "0b01c3c0b0590faf45fc171da17cfb22", "arch asthma usual gaze movie stumble blood load buffalo armor disagree earth") - MaxLineLength:MnemonicsTest.kt$MnemonicsTest$row(15, "e06ce21369dc09eb2bda66510a76f65ab3f947cce90fcb10", "there grow luggage squirrel scene void quarter error extra father rural rely display physical crisp capable slam lumber") - MaxLineLength:MnemonicsTest.kt$MnemonicsTest$row(18, "d5bcbf62dea1a07ab1abb0144b299300137168a7939f3071f112b557", "stick tourist suffer run borrow diary shop invite begin flock gospel ability damage reform oxygen initial corn moon dwarf height image") - MaxLineLength:MnemonicsTest.kt$MnemonicsTest$row(24, "b893a6b0da8fc9b73d709bda939e818a677aa376c266949378300b65a34b8e52", "review outdoor promote relax wish swear volume beach surround ostrich parrot below jeans faculty swallow error nest orange army bitter focus place deer fat") - MaxLineLength:MnemonicsTest.kt$MnemonicsTest$val validPhrase = "void come effort suffer camp survey warrior heavy shoot primary clutch crush open amazing screen patrol group space point ten exist slush involve unfold" MaxLineLength:Pbkdf2Sha512Test.kt$Pbkdf2Sha512Test$row("passDATAb00AB7YxDTT", "saltKEYbcTcXHCBxtjD", 1, 512, "cbe6088ad4359af42e603c2a33760ef9d4017a7b2aad10af46f992c660a0b461ecb0dc2a79c2570941bea6a08d15d6887e79f32b132e1c134e9525eeddd744fa") MaxLineLength:Pbkdf2Sha512Test.kt$Pbkdf2Sha512Test$row("passDATAb00AB7YxDTT", "saltKEYbcTcXHCBxtjD", 31, 504, "15530800da88a0776a812937eb2afeea4a2e7ecad633a918f1024688f73c5721d8bfcaa87f253cf50b9181ab3bb28043e13b1ce859f71d002674806bab0547") MaxLineLength:Pbkdf2Sha512Test.kt$Pbkdf2Sha512Test$row("passDATAb00AB7YxDTT", "saltKEYbcTcXHCBxtjD", 79, 520, "3b9359b5639de3f8ec4009491b5fafe764548794c87f44a9fd6a7b9364522bee36b6b71819b71e9130dc6df1db6eba29133393762d9d89f68dd2d5d9d61488937e") @@ -67,12 +59,5 @@ MaxLineLength:Pbkdf2Sha512Test.kt$Pbkdf2Sha512Test$row("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", 29, 512, "5edc3d6649fa05c07622dede976997afe683f8b489d996509e2bf9421cd81f49b7bd38e78ad7ccad0a2a9070710ad451da7b6f5b207a0ee17c14ad2054bf492a") MaxLineLength:Pbkdf2Sha512Test.kt$Pbkdf2Sha512Test$row("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", 73, 504, "d5ef8859566cabceb37b6f4a91e54a36067084bed91d9ccbb4d1e65942764cc5ff45304a4788f1a181e4415df2104f299aaadaed25392b74d5ecdf1af09c10") MaxLineLength:ReadmeExamplesTest.kt$ReadmeExamplesTest$"still champion voice habit trend flight survey between bitter process artefact blind carbon truly provide dizzy crush flush breeze blouse charge solid fish spread" - NestedBlockDepth:Mnemonics.kt$Mnemonics.MnemonicCode$ fun toEntropy(): ByteArray - ThrowsCount:Mnemonics.kt$Mnemonics.MnemonicCode$ fun toEntropy(): ByteArray - UnusedPrivateMember:build.gradle.kts$val commonMain by getting { dependencies { } } - UnusedPrivateMember:build.gradle.kts$val commonTest by getting { dependencies { implementation(kotlin("test")) } } - UnusedPrivateMember:build.gradle.kts$val detektProjectBaseline by registering(io.gitlab.arturbosch.detekt.DetektCreateBaselineTask::class) { description = "Overrides current baseline." buildUponDefaultConfig.set(true) ignoreFailures.set(true) parallel.set(true) setSource(files(rootDir)) config.setFrom(files("${rootProject.projectDir}/tools/detekt.yml")) baseline.set(file("$rootDir/tools/detekt-baseline.xml")) include("**/*.kt") include("**/*.kts") exclude("**/resources/**") exclude("**/build/**") } - UnusedPrivateMember:build.gradle.kts$val jvmMain by getting { dependencies { } } - UnusedPrivateMember:build.gradle.kts$val jvmTest by getting { dependencies { implementation(kotlin("test")) implementation(libs.kotest.runner) implementation(libs.kotest.assertion) implementation(libs.kotest.property) implementation(libs.moshi.core) implementation(libs.moshi.kotlin) } } diff --git a/tools/detekt.yml b/tools/detekt.yml index eb06ebe..76b862f 100644 --- a/tools/detekt.yml +++ b/tools/detekt.yml @@ -5,7 +5,6 @@ naming: excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/jsTest/**', '**/iosTest/**'] functionPattern: '[a-z][a-zA-Z0-9]*' excludeClassPattern: '$^' - ignoreOverridden: true ignoreAnnotated: - 'Composable' @@ -13,19 +12,20 @@ style: active: true ForbiddenComment: active: true - values: - - 'FIXME:' - - 'STOPSHIP:' - - 'TODO:' - allowedPatterns: '\[[^\]]\d+\]' - customMessage: 'Include issue number prefix for TODO comments, e.g. `TODO [#123]: Fix this later`' - MaxLineLength: - active: false + comments: + - reason: 'Forbidden FIXME todo marker in comment, please fix the problem. Or include issue number prefix for + FIXME comments, e.g. `FIXME [#123]: Fix this later`' + value: 'FIXME' + - reason: 'Forbidden STOPSHIP todo marker in comment, please address the problem before shipping the code. Or + include issue number prefix for STOPSHIP comments, e.g. `STOPSHIP [#123]: Fix this later`' + value: 'STOPSHIP' + - reason: 'Forbidden TODO todo marker in comment, please do the changes. Or include issue number prefix for TODO + comments, e.g. `TODO [#123]: Fix this later`' + value: 'TODO' + allowedPatterns: '[TODO|FIXME|STOPSHIP]+\s\[#\d+\]:\s.+' NewLineAtEndOfFile: active: false UnusedPrivateMember: active: true allowedNames: '(_|ignored|expected|serialVersionUID)' excludes: [ '**/*.kts' ] - WildcardImport: - active: false