Remove wildcard imports (#416)

* Remove wildcard imports * Remove wildcard imports * Add missing import
hfhbd · Dec 8, 2024 · dc2c2f5 · dc2c2f5
1 parent e3585d0
commit dc2c2f5
Show file tree

Hide file tree

Showing 15 changed files with 56 additions and 50 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -24,38 +24,30 @@ dokka {
 }
 
 detekt {
-    source.from(files(rootProject.rootDir))
+    source.from(fileTree(rootProject.rootDir) {
+        include("**/*.kt")
+        exclude("**/*.kts")
+        exclude("**/resources/**")
+        exclude("**/generated/**")
+        exclude("**/build/**")
+    })
     parallel = true
     autoCorrect = true
-    buildUponDefaultConfig = true
 }
 
 dependencies {
     detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:${detekt.toolVersion}")
 }
 
 tasks {
-    fun SourceTask.config() {
-        include("**/*.kt")
-        exclude("**/*.kts")
-        exclude("**/resources/**")
-        exclude("**/generated/**")
-        exclude("**/build/**")
-    }
-    withType<DetektCreateBaselineTask>().configureEach {
-        config()
-    }
     withType<Detekt>().configureEach {
-        config()
-
         reports {
             sarif.required.set(true)
         }
     }
 }
 
 apiValidation {
-    @OptIn(kotlinx.validation.ExperimentalBCVApi::class)
     klib {
         enabled = true
     }

diff --git a/config/detekt/detekt.yml b/config/detekt/detekt.yml
diff --git a/detekt-baseline.xml b/detekt-baseline.xml
@@ -4,7 +4,6 @@
   <CurrentIssues>
     <ID>FunctionNaming:Dsl.kt$public fun Uuidv7(timeStamp: Instant = Clock.System.now(), random: Random): Uuid</ID>
     <ID>FunctionNaming:Uuidv7.kt$public fun Uuidv7(timeStamp: Long, random: Random): Uuid</ID>
-    <ID>MagicNumber:KotlinConfig.kt$8</ID>
     <ID>MagicNumber:NameBasedGenerator.kt$0x3f</ID>
     <ID>MagicNumber:NameBasedGenerator.kt$4</ID>
     <ID>MagicNumber:NameBasedGenerator.kt$6</ID>

diff --git a/...uuid-core/src/androidInstrumentedTest/kotlin/app/softwork/uuid/internal/ParcelableTest.kt b/...uuid-core/src/androidInstrumentedTest/kotlin/app/softwork/uuid/internal/ParcelableTest.kt
@@ -2,11 +2,13 @@ package app.softwork.uuid.internal
 
 import android.os.Parcel
 import android.os.Parcelable
-import app.softwork.uuid.*
+import app.softwork.uuid.SOME_UUID_STRING
+import app.softwork.uuid.UuidParceler
 import kotlinx.parcelize.Parcelize
 import kotlinx.parcelize.TypeParceler
 import kotlinx.parcelize.parcelableCreator
-import kotlin.test.*
+import kotlin.test.Test
+import kotlin.test.assertEquals
 import kotlin.uuid.Uuid
 
 class ParcelableTest {

diff --git a/kotlinx-uuid-core/src/appleTest/kotlin/app/softwork/uuid/NsUUIDConvertingTest.kt b/kotlinx-uuid-core/src/appleTest/kotlin/app/softwork/uuid/NsUUIDConvertingTest.kt
@@ -8,7 +8,8 @@
 
 package app.softwork.uuid
 
-import kotlin.test.*
+import kotlin.test.Test
+import kotlin.test.assertEquals
 import kotlin.uuid.Uuid
 
 class NsUUIDConvertingTest {

diff --git a/kotlinx-uuid-core/src/commonMain/kotlin/app/softwork/uuid/BinarySerializer.kt b/kotlinx-uuid-core/src/commonMain/kotlin/app/softwork/uuid/BinarySerializer.kt
@@ -4,10 +4,12 @@
 
 package app.softwork.uuid
 
-import kotlinx.serialization.*
-import kotlinx.serialization.builtins.*
-import kotlinx.serialization.descriptors.*
-import kotlinx.serialization.encoding.*
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.SerializationException
+import kotlinx.serialization.builtins.LongArraySerializer
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 import kotlin.uuid.Uuid
 
 /**

diff --git a/kotlinx-uuid-core/src/commonMain/kotlin/app/softwork/uuid/NameBasedGenerator.kt b/kotlinx-uuid-core/src/commonMain/kotlin/app/softwork/uuid/NameBasedGenerator.kt
@@ -4,8 +4,9 @@
 
 package app.softwork.uuid
 
-import app.softwork.uuid.internal.*
-import kotlin.experimental.*
+import app.softwork.uuid.internal.SHA1
+import kotlin.experimental.and
+import kotlin.experimental.or
 import kotlin.uuid.Uuid
 
 /**

diff --git a/kotlinx-uuid-core/src/commonMain/kotlin/app/softwork/uuid/RandomGenerator.kt b/kotlinx-uuid-core/src/commonMain/kotlin/app/softwork/uuid/RandomGenerator.kt
@@ -4,7 +4,7 @@
 
 package app.softwork.uuid
 
-import kotlin.random.*
+import kotlin.random.Random
 import kotlin.uuid.Uuid
 
 /**

diff --git a/kotlinx-uuid-core/src/commonTest/kotlin/app/softwork/uuid/BinarySerializationTest.kt b/kotlinx-uuid-core/src/commonTest/kotlin/app/softwork/uuid/BinarySerializationTest.kt
@@ -4,13 +4,19 @@
 
 package app.softwork.uuid
 
-import kotlinx.serialization.*
-import kotlinx.serialization.cbor.*
-import kotlinx.serialization.descriptors.*
-import kotlinx.serialization.encoding.*
-import kotlinx.serialization.json.*
-import kotlinx.serialization.modules.*
-import kotlin.test.*
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.SerializationException
+import kotlinx.serialization.cbor.Cbor
+import kotlinx.serialization.decodeFromHexString
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.descriptors.StructureKind
+import kotlinx.serialization.encodeToHexString
+import kotlinx.serialization.encoding.AbstractDecoder
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.modules.EmptySerializersModule
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertFailsWith
 import kotlin.uuid.Uuid
 
 @ExperimentalSerializationApi
@@ -27,8 +33,7 @@ class BinarySerializationTest {
     @Test
     fun testDeadDecoder() {
         val decoder = object : AbstractDecoder() {
-            override val serializersModule: SerializersModule
-                get() = EmptySerializersModule()
+            override val serializersModule = EmptySerializersModule()
 
             override fun decodeElementIndex(descriptor: SerialDescriptor): Int {
                 return 777

diff --git a/kotlinx-uuid-core/src/commonTest/kotlin/app/softwork/uuid/GenerationTest.kt b/kotlinx-uuid-core/src/commonTest/kotlin/app/softwork/uuid/GenerationTest.kt
@@ -4,8 +4,11 @@
 
 package app.softwork.uuid
 
-import kotlin.random.*
-import kotlin.test.*
+import kotlin.random.Random
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertNotEquals
+import kotlin.test.assertTrue
 import kotlin.uuid.Uuid
 
 class GenerationTest {

diff --git a/kotlinx-uuid-core/src/commonTest/kotlin/app/softwork/uuid/SHA1Test.kt b/kotlinx-uuid-core/src/commonTest/kotlin/app/softwork/uuid/SHA1Test.kt
@@ -4,8 +4,10 @@
 
 package app.softwork.uuid
 
-import app.softwork.uuid.internal.*
-import kotlin.test.*
+import app.softwork.uuid.internal.SHA1
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertNotNull
 
 class SHA1Test {
     private val sha1 = SHA1()

diff --git a/kotlinx-uuid-core/src/commonTest/kotlin/app/softwork/uuid/UuidTest.kt b/kotlinx-uuid-core/src/commonTest/kotlin/app/softwork/uuid/UuidTest.kt
@@ -5,7 +5,12 @@
 package app.softwork.uuid
 
 import kotlin.random.Random
-import kotlin.test.*
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertFailsWith
+import kotlin.test.assertFalse
+import kotlin.test.assertNull
+import kotlin.test.assertTrue
 import kotlin.uuid.Uuid
 
 private const val UUID_STRING_ALL_FF: String = "ffffffff-ffff-ffff-ffff-ffffffffffff"

diff --git a/kotlinx-uuid-core/src/commonTest/kotlin/app/softwork/uuid/Uuidv7Test.kt b/kotlinx-uuid-core/src/commonTest/kotlin/app/softwork/uuid/Uuidv7Test.kt
@@ -1,7 +1,8 @@
 package app.softwork.uuid
 
 import kotlin.random.Random
-import kotlin.test.*
+import kotlin.test.Test
+import kotlin.test.assertEquals
 
 class Uuidv7Test {
     @Test

diff --git a/...uid-sqldelight/src/commonMain/kotlin/app/softwork/uuid/sqldelight/UuidByteArrayAdapter.kt b/...uid-sqldelight/src/commonMain/kotlin/app/softwork/uuid/sqldelight/UuidByteArrayAdapter.kt
@@ -1,6 +1,6 @@
 package app.softwork.uuid.sqldelight
 
-import app.cash.sqldelight.*
+import app.cash.sqldelight.ColumnAdapter
 import kotlin.uuid.Uuid
 
 public data object UuidByteArrayAdapter : ColumnAdapter<Uuid, ByteArray> {

diff --git a/...x-uuid-sqldelight/src/commonMain/kotlin/app/softwork/uuid/sqldelight/UuidStringAdapter.kt b/...x-uuid-sqldelight/src/commonMain/kotlin/app/softwork/uuid/sqldelight/UuidStringAdapter.kt
@@ -1,6 +1,6 @@
 package app.softwork.uuid.sqldelight
 
-import app.cash.sqldelight.*
+import app.cash.sqldelight.ColumnAdapter
 import kotlin.uuid.Uuid
 
 public data object UuidStringAdapter : ColumnAdapter<Uuid, String> {