Fix inconsistent package defs

Author: bbrockbernd

atomicfu/build.gradle.kts

@@ -127,7 +127,7 @@ kotlin {
 
         jvmTest {
             dependencies {
-                implementation("org.jetbrains.kotlinx:lincheck:2.38")
+                implementation("org.jetbrains.kotlinx:lincheck:2.39")
                 implementation("org.jetbrains.kotlin:kotlin-reflect")
                 implementation("org.jetbrains.kotlin:kotlin-test")
                 implementation("org.jetbrains.kotlin:kotlin-test-junit")

atomicfu/src/jvmTest/kotlin/kotlinx/atomicfu/locks/NativeMutexLincheckReentrantTest.kt

@@ -1,7 +1,5 @@
-import kotlinx.atomicfu.locks.NativeMutex
-import kotlinx.atomicfu.locks.ParkingHandle
-import kotlinx.atomicfu.locks.ParkingSupport
-import kotlinx.atomicfu.locks.ThreadParker
+package kotlinx.atomicfu.locks
+
 import org.jetbrains.kotlinx.lincheck.annotations.Operation
 import org.jetbrains.kotlinx.lincheck.check
 import org.jetbrains.kotlinx.lincheck.strategy.managed.modelchecking.ModelCheckingOptions
@@ -42,8 +40,8 @@ class NativeMutexLincheckReentrantTest {
     fun inc(): Int {
         localParkers.computeIfAbsent(ParkingSupport.currentThreadHandle()) { ThreadParker() }
         lock.lock()
-        if (!lock.tryLock()) throw IllegalStateException("couldnt reent with trylock")
-        if (!lock.tryLock()) throw IllegalStateException("couldnt reent with trylock")
+        if (!lock.tryLock()) throw IllegalStateException("couldn't reenter with trylock")
+        if (!lock.tryLock()) throw IllegalStateException("couldn't reenter with trylock")
         val result = counter.inc()
         lock.unlock()
         lock.unlock()
@@ -55,8 +53,8 @@ class NativeMutexLincheckReentrantTest {
     fun get(): Int {
         localParkers.computeIfAbsent(ParkingSupport.currentThreadHandle()) { ThreadParker() }
         lock.lock()
-        if (!lock.tryLock()) throw IllegalStateException("couldnt reent with trylock")
-        if (!lock.tryLock()) throw IllegalStateException("couldnt reent with trylock")
+        if (!lock.tryLock()) throw IllegalStateException("couldn't reenter with trylock")
+        if (!lock.tryLock()) throw IllegalStateException("couldn't reenter with trylock")
         val result = counter.get()
         lock.unlock()
         lock.unlock()

atomicfu/src/jvmTest/kotlin/kotlinx/atomicfu/locks/NativeMutexLincheckTest.kt

@@ -1,7 +1,5 @@
-import kotlinx.atomicfu.locks.NativeMutex
-import kotlinx.atomicfu.locks.ParkingHandle
-import kotlinx.atomicfu.locks.ParkingSupport
-import kotlinx.atomicfu.locks.ThreadParker
+package kotlinx.atomicfu.locks
+
 import org.jetbrains.kotlinx.lincheck.annotations.Operation
 import org.jetbrains.kotlinx.lincheck.check
 import org.jetbrains.kotlinx.lincheck.strategy.managed.modelchecking.ModelCheckingOptions
@@ -17,6 +15,7 @@ class NativeMutexLincheckTest {
         fun inc(): Int = ++value
         fun get() = value
     }
+    
     private val counter = Counter()
     private val localParkers = ConcurrentHashMap<ParkingHandle, ThreadParker>()
 

atomicfu/src/jvmTest/kotlin/kotlinx/atomicfu/locks/NativeMutexTimeoutLincheckTest.kt

@@ -16,6 +16,7 @@ class NativeMutexTimeoutLincheckTest {
         fun inc(): Int = ++value
         fun get() = value
     }
+    
     private val counter = Counter()
     private val localParkers = ConcurrentHashMap<ParkingHandle, ThreadParker>()