From 343a6fddb01cd3565e3c720238b8581f6c458ba6 Mon Sep 17 00:00:00 2001
From: Kevin Schildhorn <kevin.schildhorn@gmail.com>
Date: Wed, 30 Apr 2025 15:41:36 -0400
Subject: [PATCH 1/7] Adding KtLint

---
 .editorconfig                                 | 23 ++++++++
 .github/workflows/build.yml                   |  2 +-
 .idea/codeStyles/Project.xml                  |  2 -
 build.gradle.kts                              | 20 +++++++
 .../touchlab/stately/collections/Functions.kt | 12 ++--
 .../stately/collections/ObjectPool.kt         |  6 +-
 .../stately/collections/SharedHashMap.kt      | 59 ++++++-------------
 .../stately/collections/SharedLinkedList.kt   | 37 ++++--------
 .../stately/collections/SharedLruCache.kt     | 14 ++---
 .../touchlab/stately/collections/SharedSet.kt | 22 ++++---
 .../stately/collections/SharedHashMapTest.kt  | 29 +++++----
 .../collections/SharedLinkedListTest.kt       | 49 +++++++--------
 .../stately/collections/SharedLruCacheTest.kt | 23 ++++----
 .../stately/collections/StableReadListTest.kt | 54 +++++++++--------
 .../touchlab/stately/collections/Functions.kt |  4 +-
 .../stately/collections/FunctionsJVM.kt       | 10 ++--
 .../stately/collections/CopyOnWriteList.kt    | 24 +++-----
 .../touchlab/stately/collections/Functions.kt | 10 ++--
 .../kotlin/co/touchlab/stately/HelpersTest.kt |  1 -
 .../stately/collections/IsoArrayDeque.kt      | 11 ++--
 .../collections/IsoMutableCollection.kt       | 11 ++--
 .../stately/collections/IsoMutableIterator.kt |  3 +-
 .../stately/collections/IsoMutableList.kt     | 20 ++++---
 .../stately/collections/IsoMutableMap.kt      | 11 ++--
 .../stately/collections/IsoMutableSet.kt      |  8 ++-
 .../stately/collections/IsoMutableListTest.kt |  4 +-
 .../stately/collections/IsoMutableMapTest.kt  |  4 +-
 .../stately/collections/IsoMutableSetTest.kt  | 30 +++++-----
 .../co/touchlab/stately/isolate/IsoState.kt   | 10 ++--
 .../touchlab/stately/isolate/IsoStateTest.kt  |  5 --
 .../stately/isolate/BackgroundStateRunner.kt  |  2 +-
 .../stately/isolate/BackgroundStateRunner.kt  |  5 +-
 .../co/touchlab/stately/isolate/Platform.kt   |  2 +
 stately-concurrency/build.gradle.kts          |  5 +-
 .../stately/concurrency/AtomicBoolean.kt      |  3 +-
 .../touchlab/stately/concurrency/Functions.kt |  4 +-
 .../stately/concurrency/ThreadLocal.kt        |  4 +-
 .../touchlab/stately/concurrency/AtomicInt.kt | 18 +++---
 .../stately/concurrency/AtomicLong.kt         | 18 +++---
 .../stately/concurrency/AtomicReference.kt    | 12 ++--
 .../stately/concurrency/Synchronizable.kt     |  2 +-
 .../stately/concurrency/ThreadLocal.kt        |  4 +-
 .../stately/concurrency/Synchronizable.kt     |  2 +-
 .../stately/concurrency/ThreadLocalJVM.kt     |  4 +-
 .../touchlab/stately/concurrency/Functions.kt |  4 +-
 .../stately/concurrency/ThreadLocal.kt        | 14 ++---
 .../concurrency/GuardedStableRefTest.kt       |  1 +
 .../build.gradle.kts                          |  2 -
 .../ConcurrentMutableCollection.kt            | 10 +---
 .../collections/ConcurrentMutableList.kt      | 14 ++---
 .../collections/ConcurrentMutableMap.kt       | 32 ++++------
 .../collections/ConcurrentMutableSet.kt       |  4 +-
 .../ConcurrentMutableCollectionTest.kt        |  4 +-
 .../collections/ConcurrentMutableListTest.kt  | 11 ++--
 .../collections/ConcurrentMutableMapTest.kt   |  7 +--
 .../stately/collections/TestHelpers.kt        |  2 +-
 .../collections/backgroundDispatcher.kt       |  4 +-
 ...dDispatcher.kt => BackgroundDispatcher.kt} |  2 +-
 .../collections/backgroundDispatcher.kt       |  2 +-
 stately-strict/build.gradle.kts               |  5 +-
 .../co/touchlab/stately/strict/Helpers.kt     |  2 +-
 .../co/touchlab/stately/strict/HelpersJS.kt   |  2 +-
 .../co/touchlab/stately/strict/Helpers.kt     |  2 +-
 .../co/touchlab/stately/strict/HelpersTest.kt |  4 +-
 64 files changed, 348 insertions(+), 383 deletions(-)
 create mode 100644 .editorconfig
 rename stately-concurrent-collections/src/jvmTest/kotlin/co/touchlab/stately/collections/{backgroundDispatcher.kt => BackgroundDispatcher.kt} (89%)

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..b927a29
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,23 @@
+# .editorconfig
+root = true
+
+[*.{kt,kts}]
+end_of_line = lf
+ij_kotlin_packages_to_use_import_on_demand = true
+ij_kotlin_allow_trailing_comma = true
+ij_kotlin_allow_trailing_comma_on_call_site = true
+ij_kotlin_imports_layout = *
+ij_kotlin_indent_before_arrow_on_new_line = false
+ij_kotlin_line_break_after_multiline_when_entry = true
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+ktlint_argument_list_wrapping_ignore_when_parameter_count_greater_or_equal_than = 8
+ktlint_chain_method_rule_force_multiline_when_chain_operator_count_greater_or_equal_than = 4
+ktlint_code_style = android_studio
+ktlint_enum_entry_name_casing = upper_or_camel_cases
+ktlint_function_naming_ignore_when_annotated_with = Composable
+ktlint_function_signature_body_expression_wrapping = default
+ktlint_ignore_back_ticked_identifier = false
+max_line_length = 140
+parameter-list-wrapping = true
\ No newline at end of file
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 482c298..aa304ae 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -36,7 +36,7 @@ jobs:
             ${{ runner.os }}-gradle-
 
       - name: Run Gradle Build
-        run: ./gradlew build --no-daemon --stacktrace --no-build-cache
+        run: ./gradlew ktlintCheck build --no-daemon --stacktrace --no-build-cache
         env:
           ORG_GRADLE_PROJECT_SONATYPE_NEXUS_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
           ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index c23569c..a1d5ac7 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -6,8 +6,6 @@
           <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
         </value>
       </option>
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <ScalaCodeStyleSettings>
diff --git a/build.gradle.kts b/build.gradle.kts
index e0af3dc..2ae2347 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,6 +6,7 @@ plugins {
     alias(libs.plugins.dokka) apply false
     alias(libs.plugins.touchlab.docusaurusosstemplate)
     alias(libs.plugins.mavenPublish) apply false
+    id("org.jlleitschuh.gradle.ktlint") version "12.2.0" apply false
 }
 
 apiValidation {
@@ -26,4 +27,23 @@ val VERSION_NAME: String by project
 allprojects {
     group = GROUP
     version = VERSION_NAME
+}
+
+subprojects {
+    apply(plugin = "org.jlleitschuh.gradle.ktlint")
+
+    configure<org.jlleitschuh.gradle.ktlint.KtlintExtension> {
+        version.set("1.4.0")
+        enableExperimentalRules.set(true)
+        verbose.set(true)
+        filter {
+            exclude { it.file.path.contains("build/") }
+        }
+    }
+
+    afterEvaluate {
+        tasks.named("check") {
+            dependsOn(tasks.getByName("ktlintCheck"))
+        }
+    }
 }
\ No newline at end of file
diff --git a/deprecated/stately-collections/src/commonMain/kotlin/co/touchlab/stately/collections/Functions.kt b/deprecated/stately-collections/src/commonMain/kotlin/co/touchlab/stately/collections/Functions.kt
index ffbc350..6b71c31 100644
--- a/deprecated/stately-collections/src/commonMain/kotlin/co/touchlab/stately/collections/Functions.kt
+++ b/deprecated/stately-collections/src/commonMain/kotlin/co/touchlab/stately/collections/Functions.kt
@@ -27,8 +27,8 @@ expect fun <T> frozenCopyOnWriteList(collection: Collection<T>? = null): Mutable
     message = "Replacing Atomic collections with isolated state collections (modele `stately-iso-collections`)",
     replaceWith = ReplaceWith(
         "sharedMutableListOf()",
-        "co.touchlab.stately.collections.sharedMutableListOf"
-    )
+        "co.touchlab.stately.collections.sharedMutableListOf",
+    ),
 )
 fun <T> frozenLinkedList(stableIterator: Boolean = false): MutableList<T> = if (stableIterator) {
     CopyOnIterateLinkedList()
@@ -40,8 +40,8 @@ fun <T> frozenLinkedList(stableIterator: Boolean = false): MutableList<T> = if (
     message = "Replacing Atomic collections with isolated state collections (modele `stately-iso-collections`)",
     replaceWith = ReplaceWith(
         "sharedMutableMapOf()",
-        "co.touchlab.stately.collections.sharedMutableMapOf"
-    )
+        "co.touchlab.stately.collections.sharedMutableMapOf",
+    ),
 )
 fun <K, V> frozenHashMap(initialCapacity: Int = 16, loadFactor: Float = 0.75.toFloat()): MutableMap<K, V> =
     SharedHashMap(initialCapacity, loadFactor)
@@ -50,8 +50,8 @@ fun <K, V> frozenHashMap(initialCapacity: Int = 16, loadFactor: Float = 0.75.toF
     message = "Replacing Atomic collections with isolated state collections (modele `stately-iso-collections`)",
     replaceWith = ReplaceWith(
         "sharedMutableSetOf()",
-        "co.touchlab.stately.collections.sharedMutableSetOf"
-    )
+        "co.touchlab.stately.collections.sharedMutableSetOf",
+    ),
 )
 fun <T> frozenHashSet(): MutableSet<T> = SharedSet()
 
diff --git a/deprecated/stately-collections/src/commonMain/kotlin/co/touchlab/stately/collections/ObjectPool.kt b/deprecated/stately-collections/src/commonMain/kotlin/co/touchlab/stately/collections/ObjectPool.kt
index 31d0e69..b6ce140 100644
--- a/deprecated/stately-collections/src/commonMain/kotlin/co/touchlab/stately/collections/ObjectPool.kt
+++ b/deprecated/stately-collections/src/commonMain/kotlin/co/touchlab/stately/collections/ObjectPool.kt
@@ -7,11 +7,7 @@ import co.touchlab.stately.concurrency.value
 import co.touchlab.stately.concurrency.withLock
 import co.touchlab.stately.freeze
 
-class ObjectPool<T>(
-    private val maxSize: Int,
-    private val createBlock: () -> T,
-    private val cleanupBlock: ((t: T) -> Unit)? = null
-) {
+class ObjectPool<T>(private val maxSize: Int, private val createBlock: () -> T, private val cleanupBlock: ((t: T) -> Unit)? = null) {
     init {
         if (maxSize < 0) {
             throw IllegalArgumentException("maxSize cannot be negative")
diff --git a/deprecated/stately-collections/src/commonMain/kotlin/co/touchlab/stately/collections/SharedHashMap.kt b/deprecated/stately-collections/src/commonMain/kotlin/co/touchlab/stately/collections/SharedHashMap.kt
index f7c0a11..8fa26f6 100644
--- a/deprecated/stately-collections/src/commonMain/kotlin/co/touchlab/stately/collections/SharedHashMap.kt
+++ b/deprecated/stately-collections/src/commonMain/kotlin/co/touchlab/stately/collections/SharedHashMap.kt
@@ -35,9 +35,7 @@ class SharedHashMap<K, V>(initialCapacity: Int = 16, val loadFactor: Float = 0.7
         override val value: V
             get() = v
 
-        override fun setValue(newValue: V): V {
-            throw UnsupportedOperationException()
-        }
+        override fun setValue(newValue: V): V = throw UnsupportedOperationException()
     }
 
     private var lock: Lock = Lock()
@@ -56,8 +54,9 @@ class SharedHashMap<K, V>(initialCapacity: Int = 16, val loadFactor: Float = 0.7
 
     init {
         var capacity = 1
-        while (capacity < initialCapacity)
+        while (capacity < initialCapacity) {
             capacity = capacity shl 1
+        }
 
         threshold = AtomicInt((capacity.toFloat() * loadFactor).toInt())
         buckets = AtomicReference(makeBuckets(capacity))
@@ -65,13 +64,11 @@ class SharedHashMap<K, V>(initialCapacity: Int = 16, val loadFactor: Float = 0.7
         freeze()
     }
 
-    private fun makeBuckets(capacity: Int): Array<AtomicReference<SharedLinkedList<Entry<K, V>>>> {
-        return (
-            Array(capacity) {
-                AtomicReference(SharedLinkedList<Entry<K, V>>(1).freeze())
-            }
-            ).freeze()
-    }
+    private fun makeBuckets(capacity: Int): Array<AtomicReference<SharedLinkedList<Entry<K, V>>>> = (
+        Array(capacity) {
+            AtomicReference(SharedLinkedList<Entry<K, V>>(1).freeze())
+        }
+        ).freeze()
 
     private inline fun iterInternal(proc: (Entry<K, V>) -> Unit) {
         buckets.value.forEach {
@@ -115,31 +112,19 @@ class SharedHashMap<K, V>(initialCapacity: Int = 16, val loadFactor: Float = 0.7
         }
 
     private class NotReallyMutableSet<T>(private val delegate: MutableCollection<T>) : MutableSet<T> {
-        override fun add(element: T): Boolean {
-            throw UnsupportedOperationException()
-        }
+        override fun add(element: T): Boolean = throw UnsupportedOperationException()
 
-        override fun addAll(elements: Collection<T>): Boolean {
-            throw UnsupportedOperationException()
-        }
+        override fun addAll(elements: Collection<T>): Boolean = throw UnsupportedOperationException()
 
-        override fun clear() {
-            throw UnsupportedOperationException()
-        }
+        override fun clear(): Unit = throw UnsupportedOperationException()
 
         override fun iterator(): MutableIterator<T> = delegate.iterator()
 
-        override fun remove(element: T): Boolean {
-            throw UnsupportedOperationException()
-        }
+        override fun remove(element: T): Boolean = throw UnsupportedOperationException()
 
-        override fun removeAll(elements: Collection<T>): Boolean {
-            throw UnsupportedOperationException()
-        }
+        override fun removeAll(elements: Collection<T>): Boolean = throw UnsupportedOperationException()
 
-        override fun retainAll(elements: Collection<T>): Boolean {
-            throw UnsupportedOperationException()
-        }
+        override fun retainAll(elements: Collection<T>): Boolean = throw UnsupportedOperationException()
 
         override val size: Int
             get() = delegate.size
@@ -201,10 +186,7 @@ class SharedHashMap<K, V>(initialCapacity: Int = 16, val loadFactor: Float = 0.7
         return result
     }
 
-    private fun internalRemoveByKey(
-        entryList: SharedLinkedList<Entry<K, V>>,
-        key: K
-    ): V? {
+    private fun internalRemoveByKey(entryList: SharedLinkedList<Entry<K, V>>, key: K): V? {
         var result: AbstractSharedLinkedList.Node<Entry<K, V>>? = null
         val iter = entryList.nodeIterator()
         while (iter.hasNext()) {
@@ -250,7 +232,7 @@ class SharedHashMap<K, V>(initialCapacity: Int = 16, val loadFactor: Float = 0.7
 
     private fun transfer(
         newTable: Array<AtomicReference<SharedLinkedList<Entry<K, V>>>>,
-        oldTable: Array<AtomicReference<SharedLinkedList<Entry<K, V>>>>
+        oldTable: Array<AtomicReference<SharedLinkedList<Entry<K, V>>>>,
     ) {
         oldTable.forEach {
             it.value.iterator().forEach {
@@ -262,9 +244,7 @@ class SharedHashMap<K, V>(initialCapacity: Int = 16, val loadFactor: Float = 0.7
 
     internal fun currentBucketSize(): Int = buckets.value.size
 
-    private fun indexFor(h: Int, length: Int): Int {
-        return h and length - 1
-    }
+    private fun indexFor(h: Int, length: Int): Int = h and length - 1
 
     internal fun rehash(initHash: Int): Int {
         var h = initHash
@@ -275,10 +255,7 @@ class SharedHashMap<K, V>(initialCapacity: Int = 16, val loadFactor: Float = 0.7
         return h xor h.ushr(7) xor h.ushr(4)
     }
 
-    private fun findEntryList(
-        bucketArray: Array<AtomicReference<SharedLinkedList<Entry<K, V>>>>,
-        key: K
-    ): SharedLinkedList<Entry<K, V>> {
+    private fun findEntryList(bucketArray: Array<AtomicReference<SharedLinkedList<Entry<K, V>>>>, key: K): SharedLinkedList<Entry<K, V>> {
         val hash = rehash(key.hashCode())
         val entryList = bucketArray.get(indexFor(hash, bucketArray.size)).value
         return entryList
diff --git a/deprecated/stately-collections/src/commonMain/kotlin/co/touchlab/stately/collections/SharedLinkedList.kt b/deprecated/stately-collections/src/commonMain/kotlin/co/touchlab/stately/collections/SharedLinkedList.kt
index d1c7c0b..231b4a8 100644
--- a/deprecated/stately-collections/src/commonMain/kotlin/co/touchlab/stately/collections/SharedLinkedList.kt
+++ b/deprecated/stately-collections/src/commonMain/kotlin/co/touchlab/stately/collections/SharedLinkedList.kt
@@ -57,9 +57,7 @@ class SharedLinkedList<T>(objectPoolSize: Int = 0) : AbstractSharedLinkedList<T>
     fun nodeIterator(): MutableIterator<Node<T>> = NodeIterator(this, version.value)
 
     class NodeIterator<T>(private val ll: SharedLinkedList<T>, private val version: Int) : MutableIterator<Node<T>> {
-        override fun remove() {
-            throw UnsupportedOperationException()
-        }
+        override fun remove(): Unit = throw UnsupportedOperationException()
 
         var currentNode = ll.head.value
 
@@ -83,9 +81,7 @@ class SharedLinkedList<T>(objectPoolSize: Int = 0) : AbstractSharedLinkedList<T>
     }
 
     class LLIterator<T>(private val ll: SharedLinkedList<T>, private val version: Int) : MutableIterator<T> {
-        override fun remove() {
-            throw UnsupportedOperationException()
-        }
+        override fun remove(): Unit = throw UnsupportedOperationException()
 
         var currentNode = ll.head.value
 
@@ -133,11 +129,9 @@ class CopyOnIterateLinkedList<T>(objectPoolSize: Int = 0) : AbstractSharedLinked
 
     override fun iterator(): MutableIterator<T> = LocalIterator(withLock(false) { checkUpdate() }.iterator())
 
-    override fun listIterator(): MutableListIterator<T> =
-        LocalListIterator(withLock(false) { checkUpdate() }.listIterator())
+    override fun listIterator(): MutableListIterator<T> = LocalListIterator(withLock(false) { checkUpdate() }.listIterator())
 
-    override fun listIterator(index: Int): MutableListIterator<T> =
-        LocalListIterator(withLock(false) { checkUpdate() }.listIterator(index))
+    override fun listIterator(index: Int): MutableListIterator<T> = LocalListIterator(withLock(false) { checkUpdate() }.listIterator(index))
 
     private fun checkUpdate(): MutableList<T> {
         if (updated.value != 0) {
@@ -162,9 +156,7 @@ private open class LocalIterator<T>(private val delegate: MutableIterator<T>) :
 
     override fun next(): T = delegate.next()
 
-    override fun remove() {
-        throw UnsupportedOperationException("Can't mutate list from iterator")
-    }
+    override fun remove(): Unit = throw UnsupportedOperationException("Can't mutate list from iterator")
 }
 
 private class LocalListIterator<T>(private val delegate: MutableListIterator<T>) : MutableListIterator<T> {
@@ -172,9 +164,7 @@ private class LocalListIterator<T>(private val delegate: MutableListIterator<T>)
 
     override fun next(): T = delegate.next()
 
-    override fun remove() {
-        throw UnsupportedOperationException("Can't mutate list from iterator")
-    }
+    override fun remove(): Unit = throw UnsupportedOperationException("Can't mutate list from iterator")
 
     override fun hasPrevious(): Boolean = delegate.hasPrevious()
 
@@ -184,13 +174,9 @@ private class LocalListIterator<T>(private val delegate: MutableListIterator<T>)
 
     override fun previousIndex(): Int = delegate.previousIndex()
 
-    override fun add(element: T) {
-        throw UnsupportedOperationException()
-    }
+    override fun add(element: T): Unit = throw UnsupportedOperationException()
 
-    override fun set(element: T) {
-        throw UnsupportedOperationException()
-    }
+    override fun set(element: T): Unit = throw UnsupportedOperationException()
 }
 
 abstract class AbstractSharedLinkedList<T>(objectPoolSize: Int) : MutableList<T> {
@@ -234,9 +220,7 @@ abstract class AbstractSharedLinkedList<T>(objectPoolSize: Int) : MutableList<T>
         true
     }
 
-    override fun subList(fromIndex: Int, toIndex: Int): MutableList<T> {
-        throw UnsupportedOperationException()
-    }
+    override fun subList(fromIndex: Int, toIndex: Int): MutableList<T> = throw UnsupportedOperationException()
 
     override val size: Int
         get() = withLock(false) { sizeCount.value }
@@ -293,8 +277,7 @@ abstract class AbstractSharedLinkedList<T>(objectPoolSize: Int) : MutableList<T>
 
     override fun contains(element: T): Boolean = withLock(false) { internalFindFirst(element) != null }
 
-    override fun containsAll(elements: Collection<T>): Boolean =
-        withLock(false) { elements.all { internalFindFirst(it) != null } }
+    override fun containsAll(elements: Collection<T>): Boolean = withLock(false) { elements.all { internalFindFirst(it) != null } }
 
     override fun get(index: Int) = withLock(false) { internalNodeAt(index).nodeValue }
 
diff --git a/deprecated/stately-collections/src/commonMain/kotlin/co/touchlab/stately/collections/SharedLruCache.kt b/deprecated/stately-collections/src/commonMain/kotlin/co/touchlab/stately/collections/SharedLruCache.kt
index e163d61..c4bce48 100644
--- a/deprecated/stately-collections/src/commonMain/kotlin/co/touchlab/stately/collections/SharedLruCache.kt
+++ b/deprecated/stately-collections/src/commonMain/kotlin/co/touchlab/stately/collections/SharedLruCache.kt
@@ -39,10 +39,8 @@ import co.touchlab.stately.freeze
  * case the onRemove logic intends to call back into the cache. This may have unintended consequences if you're expecting
  * the mutation to be fully atomic in nature.
  */
-class SharedLruCache<K, V>(
-    private val maxCacheSize: Int,
-    private val onRemove: (MutableMap.MutableEntry<K, V>) -> Unit = {}
-) : LruCache<K, V> {
+class SharedLruCache<K, V>(private val maxCacheSize: Int, private val onRemove: (MutableMap.MutableEntry<K, V>) -> Unit = {}) :
+    LruCache<K, V> {
 
     private var lock: Lock = Lock()
     private val cacheMap = SharedHashMap<K, CacheEntry<K, V>>(initialCapacity = maxCacheSize)
@@ -188,13 +186,9 @@ class SharedLruCache<K, V>(
 
     class LruEntry<K, V>(override val key: K, override val value: V) : MutableMap.MutableEntry<K, V> {
 
-        override fun setValue(newValue: V): V {
-            throw UnsupportedOperationException()
-        }
+        override fun setValue(newValue: V): V = throw UnsupportedOperationException()
 
-        override fun toString(): String {
-            return "LruEntry(key=$key, value=$value)"
-        }
+        override fun toString(): String = "LruEntry(key=$key, value=$value)"
     }
 
     private fun internalAll(): HashSet<MutableMap.MutableEntry<K, V>> {
diff --git a/deprecated/stately-collections/src/commonMain/kotlin/co/touchlab/stately/collections/SharedSet.kt b/deprecated/stately-collections/src/commonMain/kotlin/co/touchlab/stately/collections/SharedSet.kt
index 50df919..f3b21e7 100644
--- a/deprecated/stately-collections/src/commonMain/kotlin/co/touchlab/stately/collections/SharedSet.kt
+++ b/deprecated/stately-collections/src/commonMain/kotlin/co/touchlab/stately/collections/SharedSet.kt
@@ -31,12 +31,11 @@ class SharedSet<T> : MutableSet<T> {
         return !result
     }
 
-    override fun addAll(elements: Collection<T>): Boolean =
-        elements.fold(false) { b, t ->
-            val result = backingMap.containsKey(t)
-            backingMap.put(t, Unit)
-            b || result
-        }
+    override fun addAll(elements: Collection<T>): Boolean = elements.fold(false) { b, t ->
+        val result = backingMap.containsKey(t)
+        backingMap.put(t, Unit)
+        b || result
+    }
 
     override fun clear() {
         backingMap.clear()
@@ -48,12 +47,11 @@ class SharedSet<T> : MutableSet<T> {
         return result
     }
 
-    override fun removeAll(elements: Collection<T>): Boolean =
-        elements.fold(false) { b, t ->
-            val result = backingMap.containsKey(t)
-            backingMap.remove(t)
-            b || result
-        }
+    override fun removeAll(elements: Collection<T>): Boolean = elements.fold(false) { b, t ->
+        val result = backingMap.containsKey(t)
+        backingMap.remove(t)
+        b || result
+    }
 
     override fun retainAll(elements: Collection<T>): Boolean {
         TODO("not implemented") // To change body of created functions use File | Settings | File Templates.
diff --git a/deprecated/stately-collections/src/commonTest/kotlin/co/touchlab/stately/collections/SharedHashMapTest.kt b/deprecated/stately-collections/src/commonTest/kotlin/co/touchlab/stately/collections/SharedHashMapTest.kt
index a8e4f78..ecf5364 100644
--- a/deprecated/stately-collections/src/commonTest/kotlin/co/touchlab/stately/collections/SharedHashMapTest.kt
+++ b/deprecated/stately-collections/src/commonTest/kotlin/co/touchlab/stately/collections/SharedHashMapTest.kt
@@ -126,8 +126,8 @@ class SharedHashMapTest {
                 m.entries,
                 SharedHashMap.Entry("Key: 0", MapData("Value: 0")),
                 SharedHashMap.Entry("Key: 1", MapData("Value: 1")),
-                SharedHashMap.Entry("Key: 2", MapData("Value: 2"))
-            )
+                SharedHashMap.Entry("Key: 2", MapData("Value: 2")),
+            ),
         )
     }
 
@@ -147,11 +147,11 @@ class SharedHashMapTest {
     fun mtAddRemove() {
         try {
             println("mtAddRemove Start")
-            val LOOPS = 200
+            val loops = 200
             val ops = ThreadOperations { SharedHashMap<String, MapData>() }
             val removeOps = ThreadOperations { SharedHashMap<String, MapData>() }
             val m = SharedHashMap<String, MapData>()
-            for (i in 0 until LOOPS) {
+            for (i in 0 until loops) {
                 val key = "key $i"
                 val value = "val $i"
                 ops.exe { m.put(key, MapData(value)) }
@@ -169,7 +169,6 @@ class SharedHashMapTest {
             e.printStackTrace()
             throw e
         }
-
     }
 
     /**
@@ -182,8 +181,8 @@ class SharedHashMapTest {
         val ops = ThreadOperations { }
         val removeOps = ThreadOperations { }
 
-        val LOOPS = 500
-        for (i in 0 until LOOPS) {
+        val loops = 500
+        for (i in 0 until loops) {
             val key = "key $i"
             ops.exe { map.put(BadHashKey(key), MapData("val $i")) }
             ops.test { assertTrue { map.containsKey(BadHashKey(key)) } }
@@ -192,7 +191,7 @@ class SharedHashMapTest {
         }
 
         ops.run(threads = 8, randomize = true)
-        assertEquals(LOOPS, map.size)
+        assertEquals(loops, map.size)
         removeOps.run(threads = 8, randomize = true)
         assertEquals(0, map.size)
     }
@@ -205,11 +204,11 @@ class SharedHashMapTest {
     @Test
     @Ignore
     fun testBasicThreads() {
-        val WORKERS = 10
-        val LOOP_INSERT = 200
-        val LOOP_REMOVE = 15
+        val workerNum = 10
+        val loopInsert = 200
+        val loopRemove = 15
 
-        val workers = Array(WORKERS) {
+        val workers = Array(workerNum) {
             MPWorker()
         }
 
@@ -223,11 +222,11 @@ class SharedHashMapTest {
             val mycount = count.value
 
             it.runBackground {
-                for (i in 0 until LOOP_INSERT) {
+                for (i in 0 until loopInsert) {
                     val key = "W:$mycount I:$i"
                     m.put(key, MapData("W2:$mycount I2:$i"))
                 }
-                for (i in 0 until LOOP_REMOVE) {
+                for (i in 0 until loopRemove) {
                     m.remove("W:$mycount I:${i * 10}")
                 }
             }
@@ -237,7 +236,7 @@ class SharedHashMapTest {
         workers.forEach { it.requestTermination() }
 
         println("basic threads time: ${TimeSource.Monotonic.markNow().minus(start).inWholeMilliseconds}")
-        val size = (LOOP_INSERT - LOOP_REMOVE) * WORKERS
+        val size = (loopInsert - loopRemove) * workerNum
         assertEquals(m.size, size)
         assertEquals(m.entries.size, size)
         assertEquals(m.keys.size, size)
diff --git a/deprecated/stately-collections/src/commonTest/kotlin/co/touchlab/stately/collections/SharedLinkedListTest.kt b/deprecated/stately-collections/src/commonTest/kotlin/co/touchlab/stately/collections/SharedLinkedListTest.kt
index 9c48794..0d1d0c4 100644
--- a/deprecated/stately-collections/src/commonTest/kotlin/co/touchlab/stately/collections/SharedLinkedListTest.kt
+++ b/deprecated/stately-collections/src/commonTest/kotlin/co/touchlab/stately/collections/SharedLinkedListTest.kt
@@ -19,7 +19,6 @@ package co.touchlab.stately.collections
 import co.touchlab.stately.concurrency.value
 import co.touchlab.stately.freeze
 import co.touchlab.testhelp.concurrency.ThreadOperations
-import co.touchlab.testhelp.isNativeFrozen
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFails
@@ -308,21 +307,21 @@ class LinkedListTest {
 
     @Test
     fun mtNodeAdd() {
-        val LOOPS = 20
-        val DOOPS = 20
+        val loops = 20
+        val doops = 20
         val ll = SharedLinkedList<ListData>().freeze()
         val nodeList = mutableListOf<AbstractSharedLinkedList.Node<ListData>>()
-        for (i in 0 until LOOPS) {
+        for (i in 0 until loops) {
             nodeList.add(ll.addNode(ListData("a $i")))
         }
 
         nodeList.freeze()
 
         val ops = ThreadOperations { }
-        for (i in 0 until LOOPS) {
+        for (i in 0 until loops) {
             ops.exe {
                 val node = nodeList.get(i)
-                for (j in 0 until DOOPS) {
+                for (j in 0 until doops) {
                     node.add(ListData("a $i sub $j"))
                 }
                 node.remove()
@@ -331,7 +330,7 @@ class LinkedListTest {
 
         ops.run(8)
 
-        assertEquals(DOOPS * LOOPS, ll.size)
+        assertEquals(doops * loops, ll.size)
 
         var loopCount = 0
         var doopCount = 0
@@ -353,7 +352,7 @@ class LinkedListTest {
             assertEquals(ListData("a $loopCount sub $doopCount"), it)
 
             doopCount++
-            if (doopCount == DOOPS) {
+            if (doopCount == doops) {
                 doopCount = 0
                 loopCount++
             }
@@ -365,17 +364,17 @@ class LinkedListTest {
      */
     @Test
     fun mtNodeRemove() {
-        val LOOPS = 2_000
+        val loops = 2_000
         val ll = SharedLinkedList<ListData>().freeze()
         val nodeList = mutableListOf<AbstractSharedLinkedList.Node<ListData>>()
-        for (i in 0 until LOOPS) {
+        for (i in 0 until loops) {
             nodeList.add(ll.addNode(ListData("a $i")))
         }
 
         nodeList.freeze()
 
         val ops = ThreadOperations { }
-        for (i in 0 until LOOPS) {
+        for (i in 0 until loops) {
             ops.exe {
                 val node = nodeList.get(i)
                 if (i % 100 == 0) {
@@ -387,7 +386,7 @@ class LinkedListTest {
 
         ops.run(8)
 
-        assertEquals(LOOPS / 100, ll.size)
+        assertEquals(loops / 100, ll.size)
     }
 
     /**
@@ -396,24 +395,24 @@ class LinkedListTest {
      */
     @Test
     fun mtNodeSet() {
-        val LOOPS = 80
+        val loops = 80
         val ll = SharedLinkedList<ListData>().freeze()
         val nodeList = mutableListOf<AbstractSharedLinkedList.Node<ListData>>()
-        for (i in 0 until LOOPS) {
+        for (i in 0 until loops) {
             nodeList.add(ll.addNode(ListData("a $i")))
         }
 
         nodeList.freeze()
 
         val ops = ThreadOperations { }
-        for (i in 0 until LOOPS) {
+        for (i in 0 until loops) {
             ops.exe { nodeList.get(i).set(ListData("b $i")) }
             ops.test { assertEquals(ll.get(i), ListData("b $i")) }
         }
 
         ops.run(8, true)
 
-        assertEquals(LOOPS, ll.size)
+        assertEquals(loops, ll.size)
     }
 
     /**
@@ -423,9 +422,9 @@ class LinkedListTest {
     fun mtAdd() {
         val ops = ThreadOperations { SharedLinkedList<ListData>() }
 
-        val LOOPS = 50
+        val loops = 50
 
-        for (wcount in 0 until LOOPS) {
+        for (wcount in 0 until loops) {
             ops.exe { ll ->
                 ll.add(ListData("$wcount 1"))
                 ll.add(ListData("$wcount 2"))
@@ -435,7 +434,7 @@ class LinkedListTest {
 
         val ll = ops.run(threads = 5, randomize = true)
 
-        assertEquals(LOOPS * 3, ll.size)
+        assertEquals(loops * 3, ll.size)
     }
 
     /**
@@ -443,11 +442,11 @@ class LinkedListTest {
      */
     @Test
     fun testBasicThreads() {
-        val LOOPS = 500
+        val loops = 500
         val ops = ThreadOperations { SharedLinkedList<TestData>() }
         val ll = SharedLinkedList<TestData>().freeze()
 
-        for (i in 0 until LOOPS) {
+        for (i in 0 until loops) {
             ops.exe { ll.add(TestData("Value: $i")) }
             ops.test { ll.contains(TestData("Value: $i")) }
         }
@@ -468,7 +467,8 @@ class LinkedListTest {
                 //TODO: Figure out some threaded stress tests. The following
                 //was acting as intended but failing when trying to remove the same node
 
-                *//*val countDownEnd = 100 * valCount
+ */
+/*val countDownEnd = 100 * valCount
                 var countDownStart = countDownEnd +
 
                 ll.nodeIterator().forEach {
@@ -482,13 +482,14 @@ class LinkedListTest {
                             collisionCount.increment()
                         }
                     }
-                }*//*
+                }*/
+/*
             }
         }
 
         workers.forEach { it.requestTermination() }*/
 
-        assertEquals(LOOPS, ll.size)
+        assertEquals(loops, ll.size)
     }
 
     @Test
diff --git a/deprecated/stately-collections/src/commonTest/kotlin/co/touchlab/stately/collections/SharedLruCacheTest.kt b/deprecated/stately-collections/src/commonTest/kotlin/co/touchlab/stately/collections/SharedLruCacheTest.kt
index 883abff..1c9fdb0 100644
--- a/deprecated/stately-collections/src/commonTest/kotlin/co/touchlab/stately/collections/SharedLruCacheTest.kt
+++ b/deprecated/stately-collections/src/commonTest/kotlin/co/touchlab/stately/collections/SharedLruCacheTest.kt
@@ -19,11 +19,8 @@ package co.touchlab.stately.collections
 import co.touchlab.stately.concurrency.AtomicInt
 import co.touchlab.stately.concurrency.value
 import co.touchlab.testhelp.concurrency.ThreadOperations
-import co.touchlab.testhelp.isNative
-import co.touchlab.testhelp.isNativeFrozen
 import kotlin.test.Test
 import kotlin.test.assertEquals
-import kotlin.test.assertFails
 import kotlin.test.assertNull
 import kotlin.test.assertTrue
 
@@ -100,7 +97,7 @@ class SharedLruCacheTest {
             MapData("Value: 2"),
             MapData("Value: 0"),
             MapData("Value: 1"),
-            MapData("Value: 3")
+            MapData("Value: 3"),
         )
 
         assertEquals(sc.size, 0)
@@ -136,7 +133,7 @@ class SharedLruCacheTest {
             MapData("Value: 0"),
             MapData("Value: 1"),
             MapData("Value: 2"),
-            MapData("Value: 3")
+            MapData("Value: 3"),
         )
 
         sc.remove("Key: 1")
@@ -151,7 +148,7 @@ class SharedLruCacheTest {
             MapData("Value: 3"),
             MapData("Value: 2"),
             MapData("Value: 0"),
-            MapData("1")
+            MapData("1"),
         )
 
         sc.put("b", MapData("2"))
@@ -161,7 +158,7 @@ class SharedLruCacheTest {
             MapData("Value: 2"),
             MapData("Value: 0"),
             MapData("1"),
-            MapData("2")
+            MapData("2"),
         )
     }
 
@@ -282,23 +279,23 @@ class SharedLruCacheTest {
 
     @Test
     fun mtPutStress() {
-        val CACHE_SIZE = 100
-        val LOOPS = 100
+        val cacheSize = 100
+        val loops = 100
 
         val count = AtomicInt(0)
         val ops = ThreadOperations<SharedLruCache<String, MapData>> {
-            SharedLruCache(CACHE_SIZE) { count.incrementAndGet() }
+            SharedLruCache(cacheSize) { count.incrementAndGet() }
         }
 
-        for (i in 0 until LOOPS) {
+        for (i in 0 until loops) {
             ops.exe {
                 it.put("key $i", MapData("data $i"))
             }
         }
 
         val lru = ops.run(threads = 8, randomize = true)
-        assertEquals(CACHE_SIZE, lru.size)
-        assertEquals(LOOPS - CACHE_SIZE, count.value)
+        assertEquals(cacheSize, lru.size)
+        assertEquals(loops - cacheSize, count.value)
     }
 
     private fun checkExists(lru: LruCache<String, MapData>, vararg keys: String) {
diff --git a/deprecated/stately-collections/src/commonTest/kotlin/co/touchlab/stately/collections/StableReadListTest.kt b/deprecated/stately-collections/src/commonTest/kotlin/co/touchlab/stately/collections/StableReadListTest.kt
index 152aea0..8174404 100644
--- a/deprecated/stately-collections/src/commonTest/kotlin/co/touchlab/stately/collections/StableReadListTest.kt
+++ b/deprecated/stately-collections/src/commonTest/kotlin/co/touchlab/stately/collections/StableReadListTest.kt
@@ -18,7 +18,6 @@ package co.touchlab.stately.collections
 
 import co.touchlab.stately.freeze
 import co.touchlab.testhelp.concurrency.ThreadOperations
-import co.touchlab.testhelp.isNativeFrozen
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFails
@@ -35,13 +34,13 @@ These implementations should function identically except for 'subList'. See test
 
 // Ignored on JS because frozenCopyOnWriteList() is not implemented
 @JsIgnore
-class CopyOnWriteListTest<T>() : AbstractStableReadListTest<T>() {
+class CopyOnWriteListTest<T> : AbstractStableReadListTest<T>() {
     override val supportsSublist: Boolean = true
 
     override fun <T> createList(collection: Collection<T>?): MutableList<T> = frozenCopyOnWriteList()
 }
 
-class CopyOnWriteLinkedListTest<T>() : AbstractStableReadListTest<T>() {
+class CopyOnWriteLinkedListTest<T> : AbstractStableReadListTest<T>() {
     override val supportsSublist: Boolean = false
 
     override fun <T> createList(collection: Collection<T>?): MutableList<T> = frozenLinkedList(stableIterator = true)
@@ -52,7 +51,6 @@ abstract class AbstractStableReadListTest<T> {
     abstract fun <T> createList(collection: Collection<T>? = null): MutableList<T>
     abstract val supportsSublist: Boolean
 
-
     @Test
     fun testStableReads() {
         val list = createList<ListData>()
@@ -110,16 +108,20 @@ abstract class AbstractStableReadListTest<T> {
         assertTrue(
             list.containsAll(
                 mutableListOf(
-                    ListData("a 5"), ListData("a 15"), ListData("a 50")
-                )
-            )
+                    ListData("a 5"),
+                    ListData("a 15"),
+                    ListData("a 50"),
+                ),
+            ),
         )
         assertFalse(
             list.containsAll(
                 mutableListOf(
-                    ListData("a 5"), ListData("a 15"), ListData("a 500")
-                )
-            )
+                    ListData("a 5"),
+                    ListData("a 15"),
+                    ListData("a 500"),
+                ),
+            ),
         )
     }
 
@@ -179,29 +181,29 @@ abstract class AbstractStableReadListTest<T> {
 
     @Test
     fun mtAdd() {
-        val LOOPS = 500
+        val loops = 500
 
         val tops = ThreadOperations { createList<ListData>() }
 
-        for (i in 0 until LOOPS) {
+        for (i in 0 until loops) {
             val key = "Add: $i"
             tops.exe { it.add(ListData(key)) }
             tops.test { list -> assertTrue(list.contains(ListData(key))) }
         }
 
         val list = tops.run(8)
-        assertEquals(list.size, LOOPS)
+        assertEquals(list.size, loops)
 
         println("mtAdd: ${tops.lastRunTime}")
     }
 
     @Test
     fun mtAddAt() {
-        val LOOPS = 100
+        val loops = 100
 
         val tops = ThreadOperations { createList<ListData>() }
 
-        for (i in 0 until LOOPS) {
+        for (i in 0 until loops) {
             val key = "Add: $i"
             tops.exe {
                 val index = if (it.size == 0) {
@@ -220,16 +222,16 @@ abstract class AbstractStableReadListTest<T> {
             list.add(list.size + 1, ListData("Never"))
         }
 
-        assertEquals(list.size, LOOPS)
+        assertEquals(list.size, loops)
     }
 
     @Test
     fun mtAddAll() {
-        val LOOPS = 100
+        val loops = 100
 
         val tops = ThreadOperations { createList<ListData>() }
 
-        for (i in 0 until LOOPS) {
+        for (i in 0 until loops) {
             val key = "Add: $i"
             tops.exe { it.addAll(listOf(ListData("$key 0"), ListData("$key 1"), ListData("$key 2"))) }
             tops.test { list ->
@@ -240,16 +242,16 @@ abstract class AbstractStableReadListTest<T> {
         }
 
         val list = tops.run(8)
-        assertEquals(list.size, LOOPS * 3)
+        assertEquals(list.size, loops * 3)
     }
 
     @Test
     fun mtAddAllAt() {
-        val LOOPS = 100
+        val loops = 100
 
         val tops = ThreadOperations { createList<ListData>() }
 
-        for (i in 0 until LOOPS) {
+        for (i in 0 until loops) {
             val key = "Add: $i"
             tops.exe {
                 val index = if (it.size == 0) {
@@ -272,7 +274,7 @@ abstract class AbstractStableReadListTest<T> {
             list.add(list.size + 1, ListData("Never"))
         }
 
-        assertEquals(list.size, LOOPS * 3)
+        assertEquals(list.size, loops * 3)
     }
 
     @Test
@@ -290,11 +292,11 @@ abstract class AbstractStableReadListTest<T> {
 
     @Test
     fun mtRemove() {
-        val LOOPS = 500
+        val loops = 500
 
         val list = createList<ListData>().freeze()
 
-        for (i in 0 until LOOPS) {
+        for (i in 0 until loops) {
             val key = "Add: $i"
             list.add(ListData(key))
         }
@@ -303,14 +305,14 @@ abstract class AbstractStableReadListTest<T> {
 
         val tops = ThreadOperations { }
 
-        for (i in 0 until LOOPS) {
+        for (i in 0 until loops) {
             val key = "Add: $i"
             tops.exe { list.remove(ListData(key)) }
         }
 
         tops.run(8)
         assertEquals(list.size, 0)
-        assertEquals(iter.toList().size, LOOPS)
+        assertEquals(iter.toList().size, loops)
     }
 
     @Test
diff --git a/deprecated/stately-collections/src/jsAndWasmJsMain/kotlin/co/touchlab/stately/collections/Functions.kt b/deprecated/stately-collections/src/jsAndWasmJsMain/kotlin/co/touchlab/stately/collections/Functions.kt
index 0ddd062..ed7617c 100644
--- a/deprecated/stately-collections/src/jsAndWasmJsMain/kotlin/co/touchlab/stately/collections/Functions.kt
+++ b/deprecated/stately-collections/src/jsAndWasmJsMain/kotlin/co/touchlab/stately/collections/Functions.kt
@@ -5,6 +5,4 @@ package co.touchlab.stately.collections
  * [https://docs.oracle.com/javase/7/docs/api/java/util/concurrent/CopyOnWriteArrayList.html](CopyOnWriteArrayList).
  * On Native, there is a native implementation which maintains and updates a frozen ArrayList.
  */
-actual fun <T> frozenCopyOnWriteList(collection: Collection<T>?): MutableList<T> {
-    throw UnsupportedOperationException("Not for JS or Wasm")
-}
+actual fun <T> frozenCopyOnWriteList(collection: Collection<T>?): MutableList<T> = throw UnsupportedOperationException("Not for JS or Wasm")
diff --git a/deprecated/stately-collections/src/jvmMain/kotlin/co/touchlab/stately/collections/FunctionsJVM.kt b/deprecated/stately-collections/src/jvmMain/kotlin/co/touchlab/stately/collections/FunctionsJVM.kt
index 6042870..46f2ab9 100644
--- a/deprecated/stately-collections/src/jvmMain/kotlin/co/touchlab/stately/collections/FunctionsJVM.kt
+++ b/deprecated/stately-collections/src/jvmMain/kotlin/co/touchlab/stately/collections/FunctionsJVM.kt
@@ -18,10 +18,8 @@ package co.touchlab.stately.collections
 
 import java.util.concurrent.CopyOnWriteArrayList
 
-actual fun <T> frozenCopyOnWriteList(collection: Collection<T>?): MutableList<T> {
-    return if (collection == null) {
-        CopyOnWriteArrayList<T>()
-    } else {
-        CopyOnWriteArrayList<T>(collection)
-    }
+actual fun <T> frozenCopyOnWriteList(collection: Collection<T>?): MutableList<T> = if (collection == null) {
+    CopyOnWriteArrayList<T>()
+} else {
+    CopyOnWriteArrayList<T>(collection)
 }
diff --git a/deprecated/stately-collections/src/nativeMain/kotlin/co/touchlab/stately/collections/CopyOnWriteList.kt b/deprecated/stately-collections/src/nativeMain/kotlin/co/touchlab/stately/collections/CopyOnWriteList.kt
index 0afa4eb..d75243f 100644
--- a/deprecated/stately-collections/src/nativeMain/kotlin/co/touchlab/stately/collections/CopyOnWriteList.kt
+++ b/deprecated/stately-collections/src/nativeMain/kotlin/co/touchlab/stately/collections/CopyOnWriteList.kt
@@ -73,8 +73,7 @@ class CopyOnWriteList<T>(elements: Collection<T>) : MutableList<T> {
 
     override fun isEmpty(): Boolean = listData.value.isEmpty()
 
-    override fun iterator(): MutableIterator<T> =
-        LocalIterator(listData.value)
+    override fun iterator(): MutableIterator<T> = LocalIterator(listData.value)
 
     override fun lastIndexOf(element: T): Int = listData.value.lastIndexOf(element)
 
@@ -88,11 +87,9 @@ class CopyOnWriteList<T>(elements: Collection<T>) : MutableList<T> {
 
     override fun clear() = modifyList { it.clear() }
 
-    override fun listIterator(): MutableListIterator<T> =
-        LocalListIterator(listData.value)
+    override fun listIterator(): MutableListIterator<T> = LocalListIterator(listData.value)
 
-    override fun listIterator(index: Int): MutableListIterator<T> =
-        LocalListIterator(listData.value, index)
+    override fun listIterator(index: Int): MutableListIterator<T> = LocalListIterator(listData.value, index)
 
     override fun remove(element: T): Boolean = modifyList { it.remove(element) }
 
@@ -112,13 +109,12 @@ class CopyOnWriteList<T>(elements: Collection<T>) : MutableList<T> {
 
         override fun next(): T = list.get(index.addAndGet(1) - 1)
 
-        override fun remove() {
-            throw UnsupportedOperationException("Can't mutate list from iterator")
-        }
+        override fun remove(): Unit = throw UnsupportedOperationException("Can't mutate list from iterator")
     }
 
     private class LocalListIterator<T>(private val list: List<T>, startIndex: Int = 0) :
-        LocalIterator<T>(list, startIndex), MutableListIterator<T> {
+        LocalIterator<T>(list, startIndex),
+        MutableListIterator<T> {
         override fun hasPrevious(): Boolean = index.value > 0
 
         override fun nextIndex(): Int = index.value
@@ -127,12 +123,8 @@ class CopyOnWriteList<T>(elements: Collection<T>) : MutableList<T> {
 
         override fun previousIndex(): Int = index.value - 1
 
-        override fun add(element: T) {
-            throw UnsupportedOperationException()
-        }
+        override fun add(element: T): Unit = throw UnsupportedOperationException()
 
-        override fun set(element: T) {
-            throw UnsupportedOperationException()
-        }
+        override fun set(element: T): Unit = throw UnsupportedOperationException()
     }
 }
diff --git a/deprecated/stately-collections/src/nativeMain/kotlin/co/touchlab/stately/collections/Functions.kt b/deprecated/stately-collections/src/nativeMain/kotlin/co/touchlab/stately/collections/Functions.kt
index 27e7089..8a4a98a 100644
--- a/deprecated/stately-collections/src/nativeMain/kotlin/co/touchlab/stately/collections/Functions.kt
+++ b/deprecated/stately-collections/src/nativeMain/kotlin/co/touchlab/stately/collections/Functions.kt
@@ -16,10 +16,8 @@
 
 package co.touchlab.stately.collections
 
-actual fun <T> frozenCopyOnWriteList(collection: Collection<T>?): MutableList<T> {
-    return if (collection == null) {
-        CopyOnWriteList()
-    } else {
-        CopyOnWriteList(collection)
-    }
+actual fun <T> frozenCopyOnWriteList(collection: Collection<T>?): MutableList<T> = if (collection == null) {
+    CopyOnWriteList()
+} else {
+    CopyOnWriteList(collection)
 }
diff --git a/deprecated/stately-common/src/commonTest/kotlin/co/touchlab/stately/HelpersTest.kt b/deprecated/stately-common/src/commonTest/kotlin/co/touchlab/stately/HelpersTest.kt
index 82b4d27..b942ce9 100644
--- a/deprecated/stately-common/src/commonTest/kotlin/co/touchlab/stately/HelpersTest.kt
+++ b/deprecated/stately-common/src/commonTest/kotlin/co/touchlab/stately/HelpersTest.kt
@@ -16,7 +16,6 @@
 
 package co.touchlab.stately
 
-
 class HelpersTest {
     // @Test
     // fun ensureNeverFrozenNoFreezeChild() {
diff --git a/deprecated/stately-iso-collections/src/commonMain/kotlin/co/touchlab/stately/collections/IsoArrayDeque.kt b/deprecated/stately-iso-collections/src/commonMain/kotlin/co/touchlab/stately/collections/IsoArrayDeque.kt
index 9faabab..b673339 100644
--- a/deprecated/stately-iso-collections/src/commonMain/kotlin/co/touchlab/stately/collections/IsoArrayDeque.kt
+++ b/deprecated/stately-iso-collections/src/commonMain/kotlin/co/touchlab/stately/collections/IsoArrayDeque.kt
@@ -5,9 +5,11 @@ import co.touchlab.stately.isolate.StateRunner
 import co.touchlab.stately.isolate.createState
 
 open class IsoArrayDeque<E>
-internal constructor(stateHolder: StateHolder<ArrayDeque<E>>) :
-    IsoMutableList<E>(stateHolder) {
-    constructor(stateRunner: StateRunner? = null, producer: () -> ArrayDeque<E> = { ArrayDeque() }) : this(createState(stateRunner, producer))
+internal constructor(stateHolder: StateHolder<ArrayDeque<E>>) : IsoMutableList<E>(stateHolder) {
+    constructor(
+        stateRunner: StateRunner? = null,
+        producer: () -> ArrayDeque<E> = { ArrayDeque() },
+    ) : this(createState(stateRunner, producer))
 
     /**
      * Returns the first element, or throws [NoSuchElementException] if this deque is empty.
@@ -59,6 +61,5 @@ internal constructor(stateHolder: StateHolder<ArrayDeque<E>>) :
      */
     public fun removeLastOrNull(): E? = asAccess { it.removeLastOrNull() }
 
-    private inline fun <R> asAccess(crossinline block: (ArrayDeque<E>) -> R): R =
-        access { block(it as ArrayDeque<E>) }
+    private inline fun <R> asAccess(crossinline block: (ArrayDeque<E>) -> R): R = access { block(it as ArrayDeque<E>) }
 }
diff --git a/deprecated/stately-iso-collections/src/commonMain/kotlin/co/touchlab/stately/collections/IsoMutableCollection.kt b/deprecated/stately-iso-collections/src/commonMain/kotlin/co/touchlab/stately/collections/IsoMutableCollection.kt
index 04f2e4d..858c122 100644
--- a/deprecated/stately-iso-collections/src/commonMain/kotlin/co/touchlab/stately/collections/IsoMutableCollection.kt
+++ b/deprecated/stately-iso-collections/src/commonMain/kotlin/co/touchlab/stately/collections/IsoMutableCollection.kt
@@ -6,16 +6,13 @@ import co.touchlab.stately.isolate.StateRunner
 import co.touchlab.stately.isolate.createState
 
 open class IsoMutableCollection<T> internal constructor(stateHolder: StateHolder<MutableCollection<T>>) :
-    IsolateState<MutableCollection<T>>(stateHolder), MutableCollection<T> {
+    IsolateState<MutableCollection<T>>(stateHolder),
+    MutableCollection<T> {
     constructor(stateRunner: StateRunner? = null, producer: () -> MutableCollection<T>) : this(createState(stateRunner, producer))
 
-    override fun equals(other: Any?): Boolean {
-        return access { it == other }
-    }
+    override fun equals(other: Any?): Boolean = access { it == other }
 
-    override fun hashCode(): Int {
-        return access { it.hashCode() }
-    }
+    override fun hashCode(): Int = access { it.hashCode() }
 
     override val size: Int
         get() = access { it.size }
diff --git a/deprecated/stately-iso-collections/src/commonMain/kotlin/co/touchlab/stately/collections/IsoMutableIterator.kt b/deprecated/stately-iso-collections/src/commonMain/kotlin/co/touchlab/stately/collections/IsoMutableIterator.kt
index 6f0cc96..135a92d 100644
--- a/deprecated/stately-iso-collections/src/commonMain/kotlin/co/touchlab/stately/collections/IsoMutableIterator.kt
+++ b/deprecated/stately-iso-collections/src/commonMain/kotlin/co/touchlab/stately/collections/IsoMutableIterator.kt
@@ -4,7 +4,8 @@ import co.touchlab.stately.isolate.IsolateState
 import co.touchlab.stately.isolate.StateHolder
 
 class IsoMutableIterator<T> internal constructor(stateHolder: StateHolder<MutableIterator<T>>) :
-    IsolateState<MutableIterator<T>>(stateHolder), MutableIterator<T> {
+    IsolateState<MutableIterator<T>>(stateHolder),
+    MutableIterator<T> {
     override fun hasNext(): Boolean = access { it.hasNext() }
     override fun next(): T = access { it.next() }
     override fun remove() = access { it.remove() }
diff --git a/deprecated/stately-iso-collections/src/commonMain/kotlin/co/touchlab/stately/collections/IsoMutableList.kt b/deprecated/stately-iso-collections/src/commonMain/kotlin/co/touchlab/stately/collections/IsoMutableList.kt
index 8646081..b1fb889 100644
--- a/deprecated/stately-iso-collections/src/commonMain/kotlin/co/touchlab/stately/collections/IsoMutableList.kt
+++ b/deprecated/stately-iso-collections/src/commonMain/kotlin/co/touchlab/stately/collections/IsoMutableList.kt
@@ -6,19 +6,20 @@ import co.touchlab.stately.isolate.StateRunner
 import co.touchlab.stately.isolate.createState
 
 open class IsoMutableList<T> internal constructor(stateHolder: StateHolder<MutableList<T>>) :
-    IsoMutableCollection<T>(stateHolder), MutableList<T> {
-    constructor(stateRunner: StateRunner? = null, producer: () -> MutableList<T> = { mutableListOf() }) : this(createState(stateRunner, producer))
+    IsoMutableCollection<T>(stateHolder),
+    MutableList<T> {
+    constructor(
+        stateRunner: StateRunner? = null,
+        producer: () -> MutableList<T> = { mutableListOf() },
+    ) : this(createState(stateRunner, producer))
 
     override fun get(index: Int): T = asAccess { it.get(index) }
     override fun indexOf(element: T): Int = asAccess { it.indexOf(element) }
     override fun lastIndexOf(element: T): Int = asAccess { it.lastIndexOf(element) }
     override fun add(index: Int, element: T) = asAccess { it.add(index, element) }
-    override fun addAll(index: Int, elements: Collection<T>): Boolean =
-        asAccess { it.addAll(index, elements) }
-    override fun listIterator(): MutableListIterator<T> =
-        asAccess { IsoMutableListIterator(fork(it.listIterator())) }
-    override fun listIterator(index: Int): MutableListIterator<T> =
-        asAccess { IsoMutableListIterator(fork(it.listIterator(index))) }
+    override fun addAll(index: Int, elements: Collection<T>): Boolean = asAccess { it.addAll(index, elements) }
+    override fun listIterator(): MutableListIterator<T> = asAccess { IsoMutableListIterator(fork(it.listIterator())) }
+    override fun listIterator(index: Int): MutableListIterator<T> = asAccess { IsoMutableListIterator(fork(it.listIterator(index))) }
     override fun removeAt(index: Int): T = asAccess { it.removeAt(index) }
     override fun set(index: Int, element: T): T = asAccess { it.set(index, element) }
     override fun subList(fromIndex: Int, toIndex: Int): MutableList<T> = asAccess {
@@ -29,7 +30,8 @@ open class IsoMutableList<T> internal constructor(stateHolder: StateHolder<Mutab
 }
 
 class IsoMutableListIterator<T> internal constructor(stateHolder: StateHolder<MutableListIterator<T>>) :
-    IsolateState<MutableListIterator<T>>(stateHolder), MutableListIterator<T> {
+    IsolateState<MutableListIterator<T>>(stateHolder),
+    MutableListIterator<T> {
     override fun hasPrevious(): Boolean = access { it.hasPrevious() }
     override fun nextIndex(): Int = access { it.nextIndex() }
     override fun previous(): T = access { it.previous() }
diff --git a/deprecated/stately-iso-collections/src/commonMain/kotlin/co/touchlab/stately/collections/IsoMutableMap.kt b/deprecated/stately-iso-collections/src/commonMain/kotlin/co/touchlab/stately/collections/IsoMutableMap.kt
index 996b723..74e1e85 100644
--- a/deprecated/stately-iso-collections/src/commonMain/kotlin/co/touchlab/stately/collections/IsoMutableMap.kt
+++ b/deprecated/stately-iso-collections/src/commonMain/kotlin/co/touchlab/stately/collections/IsoMutableMap.kt
@@ -5,7 +5,8 @@ import co.touchlab.stately.isolate.StateRunner
 import co.touchlab.stately.isolate.createState
 
 open class IsoMutableMap<K, V>(stateRunner: StateRunner? = null, producer: () -> MutableMap<K, V> = { mutableMapOf() }) :
-    IsolateState<MutableMap<K, V>>(createState(stateRunner, producer)), MutableMap<K, V> {
+    IsolateState<MutableMap<K, V>>(createState(stateRunner, producer)),
+    MutableMap<K, V> {
     override val size: Int
         get() = access { it.size }
 
@@ -28,11 +29,7 @@ open class IsoMutableMap<K, V>(stateRunner: StateRunner? = null, producer: () ->
     override fun putAll(from: Map<out K, V>) = access { it.putAll(from) }
     override fun remove(key: K): V? = access { it.remove(key) }
 
-    override fun equals(other: Any?): Boolean {
-        return access { it.equals(other) }
-    }
+    override fun equals(other: Any?): Boolean = access { it.equals(other) }
 
-    override fun hashCode(): Int {
-        return access { it.hashCode() }
-    }
+    override fun hashCode(): Int = access { it.hashCode() }
 }
diff --git a/deprecated/stately-iso-collections/src/commonMain/kotlin/co/touchlab/stately/collections/IsoMutableSet.kt b/deprecated/stately-iso-collections/src/commonMain/kotlin/co/touchlab/stately/collections/IsoMutableSet.kt
index 05a479f..81f00d6 100644
--- a/deprecated/stately-iso-collections/src/commonMain/kotlin/co/touchlab/stately/collections/IsoMutableSet.kt
+++ b/deprecated/stately-iso-collections/src/commonMain/kotlin/co/touchlab/stately/collections/IsoMutableSet.kt
@@ -5,6 +5,10 @@ import co.touchlab.stately.isolate.StateRunner
 import co.touchlab.stately.isolate.createState
 
 open class IsoMutableSet<T> internal constructor(stateHolder: StateHolder<MutableSet<T>>) :
-    IsoMutableCollection<T>(stateHolder), MutableSet<T> {
-    constructor(stateRunner: StateRunner? = null, producer: () -> MutableSet<T> = { mutableSetOf() }) : this(createState(stateRunner, producer))
+    IsoMutableCollection<T>(stateHolder),
+    MutableSet<T> {
+    constructor(
+        stateRunner: StateRunner? = null,
+        producer: () -> MutableSet<T> = { mutableSetOf() },
+    ) : this(createState(stateRunner, producer))
 }
diff --git a/deprecated/stately-iso-collections/src/commonTest/kotlin/co/touchlab/stately/collections/IsoMutableListTest.kt b/deprecated/stately-iso-collections/src/commonTest/kotlin/co/touchlab/stately/collections/IsoMutableListTest.kt
index 2dffc37..bff90d4 100644
--- a/deprecated/stately-iso-collections/src/commonTest/kotlin/co/touchlab/stately/collections/IsoMutableListTest.kt
+++ b/deprecated/stately-iso-collections/src/commonTest/kotlin/co/touchlab/stately/collections/IsoMutableListTest.kt
@@ -49,8 +49,8 @@ open class IsoMutableListTest : IsoMutableCollectionTest() {
             listOf(
                 SomeData("key 234"),
                 SomeData("key 235"),
-                SomeData("key 236")
-            )
+                SomeData("key 236"),
+            ),
         )
     }
 
diff --git a/deprecated/stately-iso-collections/src/commonTest/kotlin/co/touchlab/stately/collections/IsoMutableMapTest.kt b/deprecated/stately-iso-collections/src/commonTest/kotlin/co/touchlab/stately/collections/IsoMutableMapTest.kt
index f248fdb..35f00a2 100644
--- a/deprecated/stately-iso-collections/src/commonTest/kotlin/co/touchlab/stately/collections/IsoMutableMapTest.kt
+++ b/deprecated/stately-iso-collections/src/commonTest/kotlin/co/touchlab/stately/collections/IsoMutableMapTest.kt
@@ -135,8 +135,8 @@ class IsoMutableMapTest {
                 Pair("a", SomeData("a")),
                 Pair("b", SomeData("b")),
                 Pair("c", SomeData("c")),
-                Pair("a", SomeData("a"))
-            )
+                Pair("a", SomeData("a")),
+            ),
         )
 
         assertEquals(503, map.size)
diff --git a/deprecated/stately-iso-collections/src/commonTest/kotlin/co/touchlab/stately/collections/IsoMutableSetTest.kt b/deprecated/stately-iso-collections/src/commonTest/kotlin/co/touchlab/stately/collections/IsoMutableSetTest.kt
index 44bf758..34a6d51 100644
--- a/deprecated/stately-iso-collections/src/commonTest/kotlin/co/touchlab/stately/collections/IsoMutableSetTest.kt
+++ b/deprecated/stately-iso-collections/src/commonTest/kotlin/co/touchlab/stately/collections/IsoMutableSetTest.kt
@@ -120,9 +120,9 @@ abstract class IsoMutableCollectionTest {
                 listOf(
                     SomeData("key 55"),
                     SomeData("key 155"),
-                    SomeData("key2 65")
-                )
-            )
+                    SomeData("key2 65"),
+                ),
+            ),
         )
 
         assertEquals(498, set.size)
@@ -131,9 +131,9 @@ abstract class IsoMutableCollectionTest {
             set.removeAll(
                 listOf(
                     SomeData("key 65"),
-                    SomeData("key 165")
-                )
-            )
+                    SomeData("key 165"),
+                ),
+            ),
         )
 
         assertEquals(496, set.size)
@@ -142,9 +142,9 @@ abstract class IsoMutableCollectionTest {
             set.removeAll(
                 listOf(
                     SomeData("key 65"),
-                    SomeData("key 165")
-                )
-            )
+                    SomeData("key 165"),
+                ),
+            ),
         )
 
         assertEquals(496, set.size)
@@ -159,9 +159,9 @@ abstract class IsoMutableCollectionTest {
                 listOf(
                     SomeData("key 55"),
                     SomeData("key 155"),
-                    SomeData("key2 65")
-                )
-            )
+                    SomeData("key2 65"),
+                ),
+            ),
         )
 
         assertEquals(2, set.size)
@@ -171,9 +171,9 @@ abstract class IsoMutableCollectionTest {
                 listOf(
                     SomeData("key 55"),
                     SomeData("key 155"),
-                    SomeData("key2 65")
-                )
-            )
+                    SomeData("key2 65"),
+                ),
+            ),
         )
 
         assertEquals(2, set.size)
diff --git a/deprecated/stately-isolate/src/commonMain/kotlin/co/touchlab/stately/isolate/IsoState.kt b/deprecated/stately-isolate/src/commonMain/kotlin/co/touchlab/stately/isolate/IsoState.kt
index b0c1253..25c41bb 100644
--- a/deprecated/stately-isolate/src/commonMain/kotlin/co/touchlab/stately/isolate/IsoState.kt
+++ b/deprecated/stately-isolate/src/commonMain/kotlin/co/touchlab/stately/isolate/IsoState.kt
@@ -22,13 +22,11 @@ open class IsolateState<T : Any> constructor(private val stateHolder: StateHolde
         throw IllegalStateException("Must fork state from the state thread")
     }
 
-    fun <R> access(block: (T) -> R): R {
-        return if (stateHolder.myThread) {
+    fun <R> access(block: (T) -> R): R = if (stateHolder.myThread) {
+        block(stateHolder.myState)
+    } else {
+        stateHolder.stateRunner.stateRun {
             block(stateHolder.myState)
-        } else {
-            stateHolder.stateRunner.stateRun {
-                block(stateHolder.myState)
-            }
         }
     }
 
diff --git a/deprecated/stately-isolate/src/commonTest/kotlin/co/touchlab/stately/isolate/IsoStateTest.kt b/deprecated/stately-isolate/src/commonTest/kotlin/co/touchlab/stately/isolate/IsoStateTest.kt
index 444edda..0975ab2 100644
--- a/deprecated/stately-isolate/src/commonTest/kotlin/co/touchlab/stately/isolate/IsoStateTest.kt
+++ b/deprecated/stately-isolate/src/commonTest/kotlin/co/touchlab/stately/isolate/IsoStateTest.kt
@@ -1,13 +1,10 @@
 package co.touchlab.stately.isolate
 
 import co.touchlab.stately.concurrency.ThreadRef
-import co.touchlab.stately.freeze
 import co.touchlab.testhelp.concurrency.ThreadOperations
 import co.touchlab.testhelp.concurrency.background
-import co.touchlab.testhelp.isNative
 import kotlin.test.Test
 import kotlin.test.assertEquals
-import kotlin.test.assertFails
 import kotlin.test.assertTrue
 import kotlin.test.fail
 
@@ -34,8 +31,6 @@ class IsoStateTest {
         assertEquals(5_000, lsize)
     }
 
-
-
     @Test
     fun throwExceptions() {
         val iso = IsolateState { mutableListOf("a") }
diff --git a/deprecated/stately-isolate/src/jvmMain/kotlin/co/touchlab/stately/isolate/BackgroundStateRunner.kt b/deprecated/stately-isolate/src/jvmMain/kotlin/co/touchlab/stately/isolate/BackgroundStateRunner.kt
index dce236e..155feff 100644
--- a/deprecated/stately-isolate/src/jvmMain/kotlin/co/touchlab/stately/isolate/BackgroundStateRunner.kt
+++ b/deprecated/stately-isolate/src/jvmMain/kotlin/co/touchlab/stately/isolate/BackgroundStateRunner.kt
@@ -14,7 +14,7 @@ actual class BackgroundStateRunner actual constructor() : StateRunner {
                 } catch (e: Throwable) {
                     Thrown(e)
                 }
-            }
+            },
         ).get()
 
         return when (result) {
diff --git a/deprecated/stately-isolate/src/nativeMain/kotlin/co/touchlab/stately/isolate/BackgroundStateRunner.kt b/deprecated/stately-isolate/src/nativeMain/kotlin/co/touchlab/stately/isolate/BackgroundStateRunner.kt
index 4d4a01f..246cd0b 100644
--- a/deprecated/stately-isolate/src/nativeMain/kotlin/co/touchlab/stately/isolate/BackgroundStateRunner.kt
+++ b/deprecated/stately-isolate/src/nativeMain/kotlin/co/touchlab/stately/isolate/BackgroundStateRunner.kt
@@ -9,14 +9,15 @@ actual class BackgroundStateRunner actual constructor() : StateRunner {
 
     actual override fun <R> stateRun(block: () -> R): R {
         val result = stateWorker.execute(
-            TransferMode.SAFE, { block.freeze() },
+            TransferMode.SAFE,
+            { block.freeze() },
             {
                 try {
                     Ok(it()).freeze()
                 } catch (e: Throwable) {
                     Thrown(e).freeze()
                 }
-            }
+            },
         ).result
         return when (result) {
             is Ok<*> -> result.result as R
diff --git a/deprecated/stately-isolate/src/nativeMain/kotlin/co/touchlab/stately/isolate/Platform.kt b/deprecated/stately-isolate/src/nativeMain/kotlin/co/touchlab/stately/isolate/Platform.kt
index 31fdf6e..64f8836 100644
--- a/deprecated/stately-isolate/src/nativeMain/kotlin/co/touchlab/stately/isolate/Platform.kt
+++ b/deprecated/stately-isolate/src/nativeMain/kotlin/co/touchlab/stately/isolate/Platform.kt
@@ -1,3 +1,5 @@
+@file:Suppress("ktlint:standard:filename")
+
 package co.touchlab.stately.isolate
 
 import co.touchlab.stately.concurrency.GuardedStableRef
diff --git a/stately-concurrency/build.gradle.kts b/stately-concurrency/build.gradle.kts
index 111c657..2e396b7 100644
--- a/stately-concurrency/build.gradle.kts
+++ b/stately-concurrency/build.gradle.kts
@@ -1,12 +1,13 @@
-import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
-
 plugins {
     kotlin("multiplatform")
     id("com.vanniktech.maven.publish")
     id("kmp-setup")
 }
 
+@Suppress("ktlint:standard:property-naming")
 val GROUP: String by project
+
+@Suppress("ktlint:standard:property-naming")
 val VERSION_NAME: String by project
 
 group = GROUP
diff --git a/stately-concurrency/src/commonMain/kotlin/co/touchlab/stately/concurrency/AtomicBoolean.kt b/stately-concurrency/src/commonMain/kotlin/co/touchlab/stately/concurrency/AtomicBoolean.kt
index a75b0bf..507377a 100644
--- a/stately-concurrency/src/commonMain/kotlin/co/touchlab/stately/concurrency/AtomicBoolean.kt
+++ b/stately-concurrency/src/commonMain/kotlin/co/touchlab/stately/concurrency/AtomicBoolean.kt
@@ -27,8 +27,7 @@ class AtomicBoolean(value_: Boolean) {
             atom.value = boolToInt(value)
         }
 
-    fun compareAndSet(expected: Boolean, new: Boolean): Boolean =
-        atom.compareAndSet(boolToInt(expected), boolToInt(new))
+    fun compareAndSet(expected: Boolean, new: Boolean): Boolean = atom.compareAndSet(boolToInt(expected), boolToInt(new))
 
     private fun boolToInt(b: Boolean): Int = if (b) {
         1
diff --git a/stately-concurrency/src/commonMain/kotlin/co/touchlab/stately/concurrency/Functions.kt b/stately-concurrency/src/commonMain/kotlin/co/touchlab/stately/concurrency/Functions.kt
index 5114e42..c289934 100644
--- a/stately-concurrency/src/commonMain/kotlin/co/touchlab/stately/concurrency/Functions.kt
+++ b/stately-concurrency/src/commonMain/kotlin/co/touchlab/stately/concurrency/Functions.kt
@@ -1,5 +1,7 @@
+@file:Suppress("ktlint:standard:filename")
+
 package co.touchlab.stately.concurrency
 
 expect open class Synchronizable()
 
-expect inline fun <R> Synchronizable.synchronize(noinline  block: () -> R): R
\ No newline at end of file
+expect inline fun <R> Synchronizable.synchronize(noinline block: () -> R): R
diff --git a/stately-concurrency/src/commonMain/kotlin/co/touchlab/stately/concurrency/ThreadLocal.kt b/stately-concurrency/src/commonMain/kotlin/co/touchlab/stately/concurrency/ThreadLocal.kt
index ba90a17..731c272 100644
--- a/stately-concurrency/src/commonMain/kotlin/co/touchlab/stately/concurrency/ThreadLocal.kt
+++ b/stately-concurrency/src/commonMain/kotlin/co/touchlab/stately/concurrency/ThreadLocal.kt
@@ -1,4 +1,4 @@
-// ktlint-disable filename
+
 /*
  * Copyright (C) 2018 Touchlab, Inc.
  *
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+@file:Suppress("ktlint:standard:filename")
+
 package co.touchlab.stately.concurrency
 
 expect open class ThreadLocalRef<T>() {
diff --git a/stately-concurrency/src/jsAndWasmJsMain/kotlin/co/touchlab/stately/concurrency/AtomicInt.kt b/stately-concurrency/src/jsAndWasmJsMain/kotlin/co/touchlab/stately/concurrency/AtomicInt.kt
index 0840b63..06bb4a6 100644
--- a/stately-concurrency/src/jsAndWasmJsMain/kotlin/co/touchlab/stately/concurrency/AtomicInt.kt
+++ b/stately-concurrency/src/jsAndWasmJsMain/kotlin/co/touchlab/stately/concurrency/AtomicInt.kt
@@ -22,19 +22,15 @@ package co.touchlab.stately.concurrency
 actual class AtomicInt actual constructor(initialValue: Int) {
     private var internalValue: Int = initialValue
 
-    actual fun addAndGet(delta: Int): Int {
-        return (internalValue + delta).also {
-            internalValue = it
-        }
+    actual fun addAndGet(delta: Int): Int = (internalValue + delta).also {
+        internalValue = it
     }
 
-    actual fun compareAndSet(expected: Int, new: Int): Boolean {
-        return if (expected == internalValue) {
-            internalValue = new
-            true
-        } else {
-            false
-        }
+    actual fun compareAndSet(expected: Int, new: Int): Boolean = if (expected == internalValue) {
+        internalValue = new
+        true
+    } else {
+        false
     }
 
     actual fun get(): Int = internalValue
diff --git a/stately-concurrency/src/jsAndWasmJsMain/kotlin/co/touchlab/stately/concurrency/AtomicLong.kt b/stately-concurrency/src/jsAndWasmJsMain/kotlin/co/touchlab/stately/concurrency/AtomicLong.kt
index 3b7fe0d..9038b53 100644
--- a/stately-concurrency/src/jsAndWasmJsMain/kotlin/co/touchlab/stately/concurrency/AtomicLong.kt
+++ b/stately-concurrency/src/jsAndWasmJsMain/kotlin/co/touchlab/stately/concurrency/AtomicLong.kt
@@ -22,19 +22,15 @@ package co.touchlab.stately.concurrency
 actual class AtomicLong actual constructor(initialValue: Long) {
     private var internalValue: Long = initialValue
 
-    actual fun addAndGet(delta: Long): Long {
-        return (internalValue + delta).also {
-            internalValue = it
-        }
+    actual fun addAndGet(delta: Long): Long = (internalValue + delta).also {
+        internalValue = it
     }
 
-    actual fun compareAndSet(expected: Long, new: Long): Boolean {
-        return if (expected == internalValue) {
-            internalValue = new
-            true
-        } else {
-            false
-        }
+    actual fun compareAndSet(expected: Long, new: Long): Boolean = if (expected == internalValue) {
+        internalValue = new
+        true
+    } else {
+        false
     }
 
     actual fun get(): Long = internalValue
diff --git a/stately-concurrency/src/jsAndWasmJsMain/kotlin/co/touchlab/stately/concurrency/AtomicReference.kt b/stately-concurrency/src/jsAndWasmJsMain/kotlin/co/touchlab/stately/concurrency/AtomicReference.kt
index 944f8aa..f4aea7b 100644
--- a/stately-concurrency/src/jsAndWasmJsMain/kotlin/co/touchlab/stately/concurrency/AtomicReference.kt
+++ b/stately-concurrency/src/jsAndWasmJsMain/kotlin/co/touchlab/stately/concurrency/AtomicReference.kt
@@ -26,13 +26,11 @@ actual class AtomicReference<V> actual constructor(initialValue: V) {
      * Compare current value with expected and set to new if they're the same. Note, 'compare' is checking
      * the actual object id, not 'equals'.
      */
-    actual fun compareAndSet(expected: V, new: V): Boolean {
-        return if (expected === internalValue) {
-            internalValue = new
-            true
-        } else {
-            false
-        }
+    actual fun compareAndSet(expected: V, new: V): Boolean = if (expected === internalValue) {
+        internalValue = new
+        true
+    } else {
+        false
     }
 
     actual fun get(): V = internalValue
diff --git a/stately-concurrency/src/jsAndWasmJsMain/kotlin/co/touchlab/stately/concurrency/Synchronizable.kt b/stately-concurrency/src/jsAndWasmJsMain/kotlin/co/touchlab/stately/concurrency/Synchronizable.kt
index 2ccdcd5..b088691 100644
--- a/stately-concurrency/src/jsAndWasmJsMain/kotlin/co/touchlab/stately/concurrency/Synchronizable.kt
+++ b/stately-concurrency/src/jsAndWasmJsMain/kotlin/co/touchlab/stately/concurrency/Synchronizable.kt
@@ -2,4 +2,4 @@ package co.touchlab.stately.concurrency
 
 actual typealias Synchronizable = Any
 
-actual inline fun <R> Synchronizable.synchronize(noinline block: () -> R): R = block()
\ No newline at end of file
+actual inline fun <R> Synchronizable.synchronize(noinline block: () -> R): R = block()
diff --git a/stately-concurrency/src/jsAndWasmJsMain/kotlin/co/touchlab/stately/concurrency/ThreadLocal.kt b/stately-concurrency/src/jsAndWasmJsMain/kotlin/co/touchlab/stately/concurrency/ThreadLocal.kt
index ea2a9ae..aac5543 100644
--- a/stately-concurrency/src/jsAndWasmJsMain/kotlin/co/touchlab/stately/concurrency/ThreadLocal.kt
+++ b/stately-concurrency/src/jsAndWasmJsMain/kotlin/co/touchlab/stately/concurrency/ThreadLocal.kt
@@ -1,4 +1,4 @@
-// ktlint-disable filename
+
 /*
  * Copyright (C) 2018 Touchlab, Inc.
  *
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+@file:Suppress("ktlint:standard:filename")
+
 package co.touchlab.stately.concurrency
 
 actual open class ThreadLocalRef<T> actual constructor() {
diff --git a/stately-concurrency/src/jvmMain/kotlin/co/touchlab/stately/concurrency/Synchronizable.kt b/stately-concurrency/src/jvmMain/kotlin/co/touchlab/stately/concurrency/Synchronizable.kt
index 8d75bfc..ed8a125 100644
--- a/stately-concurrency/src/jvmMain/kotlin/co/touchlab/stately/concurrency/Synchronizable.kt
+++ b/stately-concurrency/src/jvmMain/kotlin/co/touchlab/stately/concurrency/Synchronizable.kt
@@ -2,4 +2,4 @@ package co.touchlab.stately.concurrency
 
 actual typealias Synchronizable = Any
 
-actual inline fun <R> Synchronizable.synchronize(noinline block: () -> R): R = synchronized(this, block)
\ No newline at end of file
+actual inline fun <R> Synchronizable.synchronize(noinline block: () -> R): R = synchronized(this, block)
diff --git a/stately-concurrency/src/jvmMain/kotlin/co/touchlab/stately/concurrency/ThreadLocalJVM.kt b/stately-concurrency/src/jvmMain/kotlin/co/touchlab/stately/concurrency/ThreadLocalJVM.kt
index b9871dd..263a472 100644
--- a/stately-concurrency/src/jvmMain/kotlin/co/touchlab/stately/concurrency/ThreadLocalJVM.kt
+++ b/stately-concurrency/src/jvmMain/kotlin/co/touchlab/stately/concurrency/ThreadLocalJVM.kt
@@ -1,4 +1,4 @@
-// ktlint-disable filename
+
 /*
  * Copyright (C) 2018 Touchlab, Inc.
  *
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+@file:Suppress("ktlint:standard:filename")
+
 package co.touchlab.stately.concurrency
 
 actual typealias ThreadLocalRef<T> = ThreadLocal<T>
diff --git a/stately-concurrency/src/nativeMain/kotlin/co/touchlab/stately/concurrency/Functions.kt b/stately-concurrency/src/nativeMain/kotlin/co/touchlab/stately/concurrency/Functions.kt
index 6c81300..2fdafe1 100644
--- a/stately-concurrency/src/nativeMain/kotlin/co/touchlab/stately/concurrency/Functions.kt
+++ b/stately-concurrency/src/nativeMain/kotlin/co/touchlab/stately/concurrency/Functions.kt
@@ -1,3 +1,5 @@
+@file:Suppress("ktlint:standard:filename")
+
 package co.touchlab.stately.concurrency
 
 actual open class Synchronizable(private val _lock: Lock) {
@@ -6,4 +8,4 @@ actual open class Synchronizable(private val _lock: Lock) {
     fun <R> runSynchronized(block: () -> R): R = _lock.withLock(block)
 }
 
-actual inline fun <R> Synchronizable.synchronize(noinline block: () -> R): R = runSynchronized(block)
\ No newline at end of file
+actual inline fun <R> Synchronizable.synchronize(noinline block: () -> R): R = runSynchronized(block)
diff --git a/stately-concurrency/src/nativeMain/kotlin/co/touchlab/stately/concurrency/ThreadLocal.kt b/stately-concurrency/src/nativeMain/kotlin/co/touchlab/stately/concurrency/ThreadLocal.kt
index 9c3f45e..903f088 100644
--- a/stately-concurrency/src/nativeMain/kotlin/co/touchlab/stately/concurrency/ThreadLocal.kt
+++ b/stately-concurrency/src/nativeMain/kotlin/co/touchlab/stately/concurrency/ThreadLocal.kt
@@ -1,4 +1,4 @@
-// ktlint-disable filename
+
 /*
  * Copyright (C) 2018 Touchlab, Inc.
  *
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+@file:Suppress("ktlint:standard:filename")
+
 package co.touchlab.stately.concurrency
 
 actual open class ThreadLocalRef<T> actual constructor() {
@@ -24,12 +26,10 @@ actual open class ThreadLocalRef<T> actual constructor() {
         ThreadLocalState.threadLocalMap.remove(threadLocalId)
     }
 
-    actual fun get(): T? {
-        return if (ThreadLocalState.threadLocalMap.containsKey(threadLocalId)) {
-            ThreadLocalState.threadLocalMap.get(threadLocalId) as T
-        } else {
-            null
-        }
+    actual fun get(): T? = if (ThreadLocalState.threadLocalMap.containsKey(threadLocalId)) {
+        ThreadLocalState.threadLocalMap.get(threadLocalId) as T
+    } else {
+        null
     }
 
     actual fun set(value: T?) {
diff --git a/stately-concurrency/src/nativeTest/kotlin/co/touchlab/stately/concurrency/GuardedStableRefTest.kt b/stately-concurrency/src/nativeTest/kotlin/co/touchlab/stately/concurrency/GuardedStableRefTest.kt
index c9af389..d672696 100644
--- a/stately-concurrency/src/nativeTest/kotlin/co/touchlab/stately/concurrency/GuardedStableRefTest.kt
+++ b/stately-concurrency/src/nativeTest/kotlin/co/touchlab/stately/concurrency/GuardedStableRefTest.kt
@@ -12,6 +12,7 @@ import kotlin.test.assertNotNull
 
 class GuardedStableRefTest {
 
+    @Suppress("ktlint:standard:backing-property-naming")
     var _w: Worker? = null
     val w: Worker
         get() = _w!!
diff --git a/stately-concurrent-collections/build.gradle.kts b/stately-concurrent-collections/build.gradle.kts
index 0911f0e..f4d8861 100644
--- a/stately-concurrent-collections/build.gradle.kts
+++ b/stately-concurrent-collections/build.gradle.kts
@@ -1,7 +1,5 @@
 @file:Suppress("PropertyName")
 
-import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
-
 plugins {
     kotlin("multiplatform")
     id("com.vanniktech.maven.publish")
diff --git a/stately-concurrent-collections/src/commonMain/kotlin/co/touchlab/stately/collections/ConcurrentMutableCollection.kt b/stately-concurrent-collections/src/commonMain/kotlin/co/touchlab/stately/collections/ConcurrentMutableCollection.kt
index ae61766..72dab05 100644
--- a/stately-concurrent-collections/src/commonMain/kotlin/co/touchlab/stately/collections/ConcurrentMutableCollection.kt
+++ b/stately-concurrent-collections/src/commonMain/kotlin/co/touchlab/stately/collections/ConcurrentMutableCollection.kt
@@ -26,8 +26,7 @@ open class ConcurrentMutableCollection<E> internal constructor(rootArg: Synchron
         syncTarget.synchronize { del.clear() }
     }
 
-    override fun iterator(): MutableIterator<E> =
-        syncTarget.synchronize { ConcurrentMutableIterator(syncTarget, del.iterator()) }
+    override fun iterator(): MutableIterator<E> = syncTarget.synchronize { ConcurrentMutableIterator(syncTarget, del.iterator()) }
 
     override fun remove(element: E): Boolean = syncTarget.synchronize { del.remove(element) }
 
@@ -43,10 +42,7 @@ open class ConcurrentMutableCollection<E> internal constructor(rootArg: Synchron
     }
 }
 
-internal open class ConcurrentMutableIterator<E>(
-    private val root: Synchronizable,
-    private val del: MutableIterator<E>
-) :
+internal open class ConcurrentMutableIterator<E>(private val root: Synchronizable, private val del: MutableIterator<E>) :
     Synchronizable(),
     MutableIterator<E> {
     override fun hasNext(): Boolean = root.synchronize { del.hasNext() }
@@ -80,4 +76,4 @@ internal open class MutableCollectionWrapper<E>(internal var _coll: MutableColle
     override fun contains(element: E): Boolean = coll.contains(element)
     override fun containsAll(elements: Collection<E>): Boolean = coll.containsAll(elements)
     override fun isEmpty(): Boolean = coll.isEmpty()
-}
\ No newline at end of file
+}
diff --git a/stately-concurrent-collections/src/commonMain/kotlin/co/touchlab/stately/collections/ConcurrentMutableList.kt b/stately-concurrent-collections/src/commonMain/kotlin/co/touchlab/stately/collections/ConcurrentMutableList.kt
index 504cb95..27e9b7d 100644
--- a/stately-concurrent-collections/src/commonMain/kotlin/co/touchlab/stately/collections/ConcurrentMutableList.kt
+++ b/stately-concurrent-collections/src/commonMain/kotlin/co/touchlab/stately/collections/ConcurrentMutableList.kt
@@ -4,7 +4,8 @@ import co.touchlab.stately.concurrency.Synchronizable
 import co.touchlab.stately.concurrency.synchronize
 
 class ConcurrentMutableList<E> internal constructor(rootArg: Synchronizable?, private val del: MutableList<E>) :
-    ConcurrentMutableCollection<E>(rootArg, del), MutableList<E> {
+    ConcurrentMutableCollection<E>(rootArg, del),
+    MutableList<E> {
     constructor() : this(null, mutableListOf())
 
     override fun get(index: Int): E = syncTarget.synchronize { del.get(index) }
@@ -17,11 +18,9 @@ class ConcurrentMutableList<E> internal constructor(rootArg: Synchronizable?, pr
         syncTarget.synchronize { del.add(index, element) }
     }
 
-    override fun addAll(index: Int, elements: Collection<E>): Boolean =
-        syncTarget.synchronize { del.addAll(index, elements) }
+    override fun addAll(index: Int, elements: Collection<E>): Boolean = syncTarget.synchronize { del.addAll(index, elements) }
 
-    override fun listIterator(): MutableListIterator<E> =
-        syncTarget.synchronize { ConcurrentMutableListIterator(this, del.listIterator()) }
+    override fun listIterator(): MutableListIterator<E> = syncTarget.synchronize { ConcurrentMutableListIterator(this, del.listIterator()) }
 
     override fun listIterator(index: Int): MutableListIterator<E> =
         syncTarget.synchronize { ConcurrentMutableListIterator(this, del.listIterator(index)) }
@@ -41,7 +40,8 @@ class ConcurrentMutableList<E> internal constructor(rootArg: Synchronizable?, pr
     }
 }
 
-internal class MutableListWrapper<E>(internal var list: MutableList<E>) : MutableCollectionWrapper<E>(list),
+internal class MutableListWrapper<E>(internal var list: MutableList<E>) :
+    MutableCollectionWrapper<E>(list),
     MutableList<E> {
     override fun get(index: Int): E = list.get(index)
 
@@ -62,4 +62,4 @@ internal class MutableListWrapper<E>(internal var list: MutableList<E>) : Mutabl
     override fun set(index: Int, element: E): E = list.set(index, element)
 
     override fun subList(fromIndex: Int, toIndex: Int): MutableList<E> = list.subList(fromIndex, toIndex)
-}
\ No newline at end of file
+}
diff --git a/stately-concurrent-collections/src/commonMain/kotlin/co/touchlab/stately/collections/ConcurrentMutableMap.kt b/stately-concurrent-collections/src/commonMain/kotlin/co/touchlab/stately/collections/ConcurrentMutableMap.kt
index 997549f..ec76ce2 100644
--- a/stately-concurrent-collections/src/commonMain/kotlin/co/touchlab/stately/collections/ConcurrentMutableMap.kt
+++ b/stately-concurrent-collections/src/commonMain/kotlin/co/touchlab/stately/collections/ConcurrentMutableMap.kt
@@ -4,10 +4,9 @@ import co.touchlab.stately.concurrency.Synchronizable
 import co.touchlab.stately.concurrency.synchronize
 import kotlin.jvm.JvmName
 
-class ConcurrentMutableMap<K, V> internal constructor(
-    rootArg: Synchronizable? = null,
-    private val del: MutableMap<K, V>
-) : Synchronizable(), MutableMap<K, V> {
+class ConcurrentMutableMap<K, V> internal constructor(rootArg: Synchronizable? = null, private val del: MutableMap<K, V>) :
+    Synchronizable(),
+    MutableMap<K, V> {
 
     constructor() : this(null, mutableMapOf())
 
@@ -35,16 +34,14 @@ class ConcurrentMutableMap<K, V> internal constructor(
      * attempts to compute its value using the given mapping function and enters it into this map
      */
     @JvmName("safeComputeIfAbsent")
-    fun computeIfAbsent(key: K, defaultValue: (K) -> V): V {
-        return syncTarget.synchronize {
-            val value = del[key]
-            if (value == null) {
-                val newValue = defaultValue(key)
-                del[key] = newValue
-                newValue
-            } else {
-                value
-            }
+    fun computeIfAbsent(key: K, defaultValue: (K) -> V): V = syncTarget.synchronize {
+        val value = del[key]
+        if (value == null) {
+            val newValue = defaultValue(key)
+            del[key] = newValue
+            newValue
+        } else {
+            value
         }
     }
 
@@ -63,10 +60,7 @@ class ConcurrentMutableMap<K, V> internal constructor(
     }
 }
 
-internal class ConcurrentMutableListIterator<E>(
-    private val root: Synchronizable,
-    private val del: MutableListIterator<E>
-) :
+internal class ConcurrentMutableListIterator<E>(private val root: Synchronizable, private val del: MutableListIterator<E>) :
     ConcurrentMutableIterator<E>(root, del),
     MutableListIterator<E> {
     override fun hasPrevious(): Boolean = root.synchronize { del.hasPrevious() }
@@ -116,4 +110,4 @@ internal class MutableMapWrapper<K, V>(internal var map: MutableMap<K, V>) : Mut
     }
 
     override fun remove(key: K): V? = map.remove(key)
-}
\ No newline at end of file
+}
diff --git a/stately-concurrent-collections/src/commonMain/kotlin/co/touchlab/stately/collections/ConcurrentMutableSet.kt b/stately-concurrent-collections/src/commonMain/kotlin/co/touchlab/stately/collections/ConcurrentMutableSet.kt
index f858eaf..3d103ab 100644
--- a/stately-concurrent-collections/src/commonMain/kotlin/co/touchlab/stately/collections/ConcurrentMutableSet.kt
+++ b/stately-concurrent-collections/src/commonMain/kotlin/co/touchlab/stately/collections/ConcurrentMutableSet.kt
@@ -16,4 +16,6 @@ class ConcurrentMutableSet<E> internal constructor(rootArg: Synchronizable?, pri
     }
 }
 
-internal class MutableSetWrapper<E>(internal var set: MutableSet<E>) : MutableCollectionWrapper<E>(set), MutableSet<E>
\ No newline at end of file
+internal class MutableSetWrapper<E>(internal var set: MutableSet<E>) :
+    MutableCollectionWrapper<E>(set),
+    MutableSet<E>
diff --git a/stately-concurrent-collections/src/commonTest/kotlin/co/touchlab/stately/collections/ConcurrentMutableCollectionTest.kt b/stately-concurrent-collections/src/commonTest/kotlin/co/touchlab/stately/collections/ConcurrentMutableCollectionTest.kt
index 3adf3cb..d58fb70 100644
--- a/stately-concurrent-collections/src/commonTest/kotlin/co/touchlab/stately/collections/ConcurrentMutableCollectionTest.kt
+++ b/stately-concurrent-collections/src/commonTest/kotlin/co/touchlab/stately/collections/ConcurrentMutableCollectionTest.kt
@@ -128,7 +128,7 @@ class ConcurrentMutableCollectionTest {
 fun <E> runBoth(
     runs: Int = DEFAULT_RUNS,
     block: (ConcurrentMutableCollection<E>, Int) -> Unit,
-    verify: (ConcurrentMutableCollection<E>) -> Unit
+    verify: (ConcurrentMutableCollection<E>) -> Unit,
 ) {
     val set = ConcurrentMutableSet<E>()
     runAlot(runs) {
@@ -140,4 +140,4 @@ fun <E> runBoth(
         block(list, it)
     }
     verify(list)
-}
\ No newline at end of file
+}
diff --git a/stately-concurrent-collections/src/commonTest/kotlin/co/touchlab/stately/collections/ConcurrentMutableListTest.kt b/stately-concurrent-collections/src/commonTest/kotlin/co/touchlab/stately/collections/ConcurrentMutableListTest.kt
index 6beed42..c065c51 100644
--- a/stately-concurrent-collections/src/commonTest/kotlin/co/touchlab/stately/collections/ConcurrentMutableListTest.kt
+++ b/stately-concurrent-collections/src/commonTest/kotlin/co/touchlab/stately/collections/ConcurrentMutableListTest.kt
@@ -1,11 +1,11 @@
 package co.touchlab.stately.collections
 
 import co.touchlab.stately.concurrency.ThreadRef
+import kotlin.test.Test
+import kotlin.test.assertEquals
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.async
 import kotlinx.coroutines.test.runTest
-import kotlin.test.Test
-import kotlin.test.assertEquals
 
 class ConcurrentMutableListTest {
     @Test
@@ -16,8 +16,9 @@ class ConcurrentMutableListTest {
 
         runAlot {
             list.add(SomeData("arst $it"))
-            if (it % (DEFAULT_RUNS / 10) == 0)
+            if (it % (DEFAULT_RUNS / 10) == 0) {
                 println("count $it thread: ${threadRef.same()}")
+            }
         }
 
         assertEquals(list.size, DEFAULT_RUNS * 2)
@@ -31,7 +32,7 @@ class ConcurrentMutableListTest {
         runAlot(100) { outerCount ->
             list.block {
                 repeat(1000) { innerCount ->
-                    list.add(SomeData("arst ${innerCount}"))
+                    list.add(SomeData("arst $innerCount"))
                 }
             }
         }
@@ -59,4 +60,4 @@ data class SomeData(val s: String)
 expect val backgroundDispatcher: CoroutineDispatcher
 
 @Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
-expect annotation class NoJsTest()
\ No newline at end of file
+expect annotation class NoJsTest()
diff --git a/stately-concurrent-collections/src/commonTest/kotlin/co/touchlab/stately/collections/ConcurrentMutableMapTest.kt b/stately-concurrent-collections/src/commonTest/kotlin/co/touchlab/stately/collections/ConcurrentMutableMapTest.kt
index 2aaec70..1f5522a 100644
--- a/stately-concurrent-collections/src/commonTest/kotlin/co/touchlab/stately/collections/ConcurrentMutableMapTest.kt
+++ b/stately-concurrent-collections/src/commonTest/kotlin/co/touchlab/stately/collections/ConcurrentMutableMapTest.kt
@@ -2,7 +2,6 @@ package co.touchlab.stately.collections
 
 import co.touchlab.stately.concurrency.AtomicInt
 import co.touchlab.testhelp.concurrency.sleep
-import kotlinx.coroutines.delay
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
@@ -31,9 +30,9 @@ class ConcurrentMutableMapTest {
 
         repeat(1000) { i ->
             val key = "key $i"
-            assertTrue(map.containsKey(key), "Key not found '${key}'")
+            assertTrue(map.containsKey(key), "Key not found '$key'")
             val valueString = "value $i"
-            assertTrue(map.containsValue(SomeData(valueString)), "Value not found '${valueString}'")
+            assertTrue(map.containsValue(SomeData(valueString)), "Value not found '$valueString'")
         }
     }
 
@@ -88,4 +87,4 @@ class ConcurrentMutableMapTest {
 
         assertEquals(count.get(), 1)
     }
-}
\ No newline at end of file
+}
diff --git a/stately-concurrent-collections/src/commonTest/kotlin/co/touchlab/stately/collections/TestHelpers.kt b/stately-concurrent-collections/src/commonTest/kotlin/co/touchlab/stately/collections/TestHelpers.kt
index da49c70..fa50812 100644
--- a/stately-concurrent-collections/src/commonTest/kotlin/co/touchlab/stately/collections/TestHelpers.kt
+++ b/stately-concurrent-collections/src/commonTest/kotlin/co/touchlab/stately/collections/TestHelpers.kt
@@ -1,3 +1,3 @@
 package co.touchlab.stately.collections
 
-val DEFAULT_RUNS = 100_000
\ No newline at end of file
+val DEFAULT_RUNS = 100_000
diff --git a/stately-concurrent-collections/src/jsAndWasmJsTest/kotlin/co/touchlab/stately/collections/backgroundDispatcher.kt b/stately-concurrent-collections/src/jsAndWasmJsTest/kotlin/co/touchlab/stately/collections/backgroundDispatcher.kt
index 3f389fa..6c8c28f 100644
--- a/stately-concurrent-collections/src/jsAndWasmJsTest/kotlin/co/touchlab/stately/collections/backgroundDispatcher.kt
+++ b/stately-concurrent-collections/src/jsAndWasmJsTest/kotlin/co/touchlab/stately/collections/backgroundDispatcher.kt
@@ -1,10 +1,10 @@
 package co.touchlab.stately.collections
 
+import kotlin.test.Ignore
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
-import kotlin.test.Ignore
 
 actual val backgroundDispatcher: CoroutineDispatcher
     get() = Dispatchers.Main
 
-actual typealias NoJsTest = Ignore
\ No newline at end of file
+actual typealias NoJsTest = Ignore
diff --git a/stately-concurrent-collections/src/jvmTest/kotlin/co/touchlab/stately/collections/backgroundDispatcher.kt b/stately-concurrent-collections/src/jvmTest/kotlin/co/touchlab/stately/collections/BackgroundDispatcher.kt
similarity index 89%
rename from stately-concurrent-collections/src/jvmTest/kotlin/co/touchlab/stately/collections/backgroundDispatcher.kt
rename to stately-concurrent-collections/src/jvmTest/kotlin/co/touchlab/stately/collections/BackgroundDispatcher.kt
index 8346e72..2f9f374 100644
--- a/stately-concurrent-collections/src/jvmTest/kotlin/co/touchlab/stately/collections/backgroundDispatcher.kt
+++ b/stately-concurrent-collections/src/jvmTest/kotlin/co/touchlab/stately/collections/BackgroundDispatcher.kt
@@ -7,4 +7,4 @@ actual val backgroundDispatcher: CoroutineDispatcher
     get() = Dispatchers.Default
 
 @Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
-actual annotation class NoJsTest
\ No newline at end of file
+actual annotation class NoJsTest
diff --git a/stately-concurrent-collections/src/nativeTest/kotlin/co/touchlab/stately/collections/backgroundDispatcher.kt b/stately-concurrent-collections/src/nativeTest/kotlin/co/touchlab/stately/collections/backgroundDispatcher.kt
index 8346e72..2f9f374 100644
--- a/stately-concurrent-collections/src/nativeTest/kotlin/co/touchlab/stately/collections/backgroundDispatcher.kt
+++ b/stately-concurrent-collections/src/nativeTest/kotlin/co/touchlab/stately/collections/backgroundDispatcher.kt
@@ -7,4 +7,4 @@ actual val backgroundDispatcher: CoroutineDispatcher
     get() = Dispatchers.Default
 
 @Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
-actual annotation class NoJsTest
\ No newline at end of file
+actual annotation class NoJsTest
diff --git a/stately-strict/build.gradle.kts b/stately-strict/build.gradle.kts
index 0c19473..359eac3 100644
--- a/stately-strict/build.gradle.kts
+++ b/stately-strict/build.gradle.kts
@@ -4,7 +4,10 @@ plugins {
     id("kmp-setup")
 }
 
+@Suppress("ktlint:standard:property-naming")
 val GROUP: String by project
+
+@Suppress("ktlint:standard:property-naming")
 val VERSION_NAME: String by project
 
 group = GROUP
@@ -17,4 +20,4 @@ kotlin {
             implementation(libs.testHelp)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/stately-strict/src/commonMain/kotlin/co/touchlab/stately/strict/Helpers.kt b/stately-strict/src/commonMain/kotlin/co/touchlab/stately/strict/Helpers.kt
index abf2463..18e3096 100644
--- a/stately-strict/src/commonMain/kotlin/co/touchlab/stately/strict/Helpers.kt
+++ b/stately-strict/src/commonMain/kotlin/co/touchlab/stately/strict/Helpers.kt
@@ -18,4 +18,4 @@ package co.touchlab.stately.strict
 
 expect fun <T> T.maybeFreeze(): T
 
-expect val strictMemoryModel: Boolean
\ No newline at end of file
+expect val strictMemoryModel: Boolean
diff --git a/stately-strict/src/jsAndWasmJsMain/kotlin/co/touchlab/stately/strict/HelpersJS.kt b/stately-strict/src/jsAndWasmJsMain/kotlin/co/touchlab/stately/strict/HelpersJS.kt
index 3ad732d..78a4603 100644
--- a/stately-strict/src/jsAndWasmJsMain/kotlin/co/touchlab/stately/strict/HelpersJS.kt
+++ b/stately-strict/src/jsAndWasmJsMain/kotlin/co/touchlab/stately/strict/HelpersJS.kt
@@ -17,4 +17,4 @@
 package co.touchlab.stately.strict
 
 actual fun <T> T.maybeFreeze(): T = this
-actual val strictMemoryModel: Boolean = false
\ No newline at end of file
+actual val strictMemoryModel: Boolean = false
diff --git a/stately-strict/src/nativeMain/kotlin/co/touchlab/stately/strict/Helpers.kt b/stately-strict/src/nativeMain/kotlin/co/touchlab/stately/strict/Helpers.kt
index 2cb9682..489fa83 100644
--- a/stately-strict/src/nativeMain/kotlin/co/touchlab/stately/strict/Helpers.kt
+++ b/stately-strict/src/nativeMain/kotlin/co/touchlab/stately/strict/Helpers.kt
@@ -30,4 +30,4 @@ actual fun <T> T.maybeFreeze(): T = if (Platform.memoryModel == MemoryModel.STRI
 
 @OptIn(ExperimentalNativeApi::class)
 actual val strictMemoryModel: Boolean
-    get() = Platform.memoryModel == MemoryModel.STRICT
\ No newline at end of file
+    get() = Platform.memoryModel == MemoryModel.STRICT
diff --git a/stately-strict/src/nativeTest/kotlin/co/touchlab/stately/strict/HelpersTest.kt b/stately-strict/src/nativeTest/kotlin/co/touchlab/stately/strict/HelpersTest.kt
index 29303a4..3832e95 100644
--- a/stately-strict/src/nativeTest/kotlin/co/touchlab/stately/strict/HelpersTest.kt
+++ b/stately-strict/src/nativeTest/kotlin/co/touchlab/stately/strict/HelpersTest.kt
@@ -24,10 +24,10 @@ import kotlin.test.assertEquals
 class HelpersTest {
     @OptIn(ExperimentalNativeApi::class)
     @Test
-    fun maybeFreezeTest(){
+    fun maybeFreezeTest() {
         val h = Heyo("hello").maybeFreeze()
         assertEquals(h.isFrozen, Platform.memoryModel == MemoryModel.STRICT && Platform.isFreezingEnabled)
     }
 
-    data class Heyo(val s:String)
+    data class Heyo(val s: String)
 }

From 27d58e6417df6efdc7727fa6831ea19ce3889aaf Mon Sep 17 00:00:00 2001
From: Kevin Schildhorn <kevin.schildhorn@gmail.com>
Date: Mon, 5 May 2025 08:56:32 -0400
Subject: [PATCH 2/7] updating cache

---
 .github/workflows/build.yml   | 4 ++--
 .github/workflows/deploy.yml  | 4 ++--
 .github/workflows/release.yml | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index aa304ae..dfe4edb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@v1
       - name: Cache gradle
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
@@ -28,7 +28,7 @@ jobs:
             ${{ runner.os }}-gradle-
 
       - name: Cache konan
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.konan
           key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 3df44b0..8121ed4 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@v1
       - name: Cache gradle
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
@@ -23,7 +23,7 @@ jobs:
             ${{ runner.os }}-gradle-
 
       - name: Cache konan
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.konan
           key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a5003bc..232c394 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@v1
       - name: Cache gradle
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}
@@ -32,7 +32,7 @@ jobs:
             ${{ runner.os }}-gradle-
 
       - name: Cache konan
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.konan
           key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle.kts') }}

From caa96e5b5fd3784eae0643104bf4c17fc1dfb124 Mon Sep 17 00:00:00 2001
From: Kevin Schildhorn <kevin.schildhorn@gmail.com>
Date: Mon, 5 May 2025 08:59:43 -0400
Subject: [PATCH 3/7] Update build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index dfe4edb..846af42 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -47,7 +47,7 @@ jobs:
 
       - name: Upload Stately Collections Build Results
         if: always()
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: deprecated-test-results
           path: deprecated/**/build/reports/tests/

From 47a21a236c34b8f71dc94861ed8f3434d75fd121 Mon Sep 17 00:00:00 2001
From: Daniel Bertoldi <dsdanielbertoldi@gmail.com>
Date: Wed, 2 Jul 2025 17:04:18 -0300
Subject: [PATCH 4/7] Fix last two lint errors

Renamed backgroundDispatcher to BackgroundDispatcher
---
 .../{backgroundDispatcher.kt => BackgroundDispatcher.kt}          | 0
 .../{backgroundDispatcher.kt => BackgroundDispatcher.kt}          | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename stately-concurrent-collections/src/jsAndWasmJsTest/kotlin/co/touchlab/stately/collections/{backgroundDispatcher.kt => BackgroundDispatcher.kt} (100%)
 rename stately-concurrent-collections/src/nativeTest/kotlin/co/touchlab/stately/collections/{backgroundDispatcher.kt => BackgroundDispatcher.kt} (100%)

diff --git a/stately-concurrent-collections/src/jsAndWasmJsTest/kotlin/co/touchlab/stately/collections/backgroundDispatcher.kt b/stately-concurrent-collections/src/jsAndWasmJsTest/kotlin/co/touchlab/stately/collections/BackgroundDispatcher.kt
similarity index 100%
rename from stately-concurrent-collections/src/jsAndWasmJsTest/kotlin/co/touchlab/stately/collections/backgroundDispatcher.kt
rename to stately-concurrent-collections/src/jsAndWasmJsTest/kotlin/co/touchlab/stately/collections/BackgroundDispatcher.kt
diff --git a/stately-concurrent-collections/src/nativeTest/kotlin/co/touchlab/stately/collections/backgroundDispatcher.kt b/stately-concurrent-collections/src/nativeTest/kotlin/co/touchlab/stately/collections/BackgroundDispatcher.kt
similarity index 100%
rename from stately-concurrent-collections/src/nativeTest/kotlin/co/touchlab/stately/collections/backgroundDispatcher.kt
rename to stately-concurrent-collections/src/nativeTest/kotlin/co/touchlab/stately/collections/BackgroundDispatcher.kt

From 797c8bef8cd70416ad5e02cbff8b7870bd07c143 Mon Sep 17 00:00:00 2001
From: Kevin Schildhorn <kevin.schildhorn@gmail.com>
Date: Tue, 28 Oct 2025 15:17:40 -0400
Subject: [PATCH 5/7] updating based on comments

---
 .github/workflows/build.yml | 2 +-
 build.gradle.kts            | 4 ++--
 gradle/libs.versions.toml   | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 846af42..2bd01e6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -36,7 +36,7 @@ jobs:
             ${{ runner.os }}-gradle-
 
       - name: Run Gradle Build
-        run: ./gradlew ktlintCheck build --no-daemon --stacktrace --no-build-cache
+        run: ./gradlew build --no-daemon --stacktrace --no-build-cache
         env:
           ORG_GRADLE_PROJECT_SONATYPE_NEXUS_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
           ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
diff --git a/build.gradle.kts b/build.gradle.kts
index 2ae2347..90c8813 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     alias(libs.plugins.dokka) apply false
     alias(libs.plugins.touchlab.docusaurusosstemplate)
     alias(libs.plugins.mavenPublish) apply false
-    id("org.jlleitschuh.gradle.ktlint") version "12.2.0" apply false
+    alias(libs.plugins.ktlint) apply false
 }
 
 apiValidation {
@@ -46,4 +46,4 @@ subprojects {
             dependsOn(tasks.getByName("ktlintCheck"))
         }
     }
-}
\ No newline at end of file
+}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c796195..eb3fede 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -9,6 +9,7 @@ mavenPublish = "0.27.0"
 testHelp = "0.6.12"
 coroutines-test = "1.8.0"
 kotlin = "1.9.23"
+ktlint = "12.2.0"
 
 [libraries]
 
@@ -25,6 +26,6 @@ binaryCompatibilityValidator = { id = "org.jetbrains.kotlinx.binary-compatibilit
 dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
 touchlab-docusaurusosstemplate = { id = "co.touchlab.touchlabtools.docusaurusosstemplate", version.ref = "touchlab-docusaurusosstemplate" }
 mavenPublish = { id = "com.vanniktech.maven.publish", version.ref = "mavenPublish" }
-
+ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" }
 [bundles]
 

From f7c1009afc65492e740acb47045c80b954216639 Mon Sep 17 00:00:00 2001
From: Kevin Schildhorn <kevin.schildhorn@gmail.com>
Date: Wed, 29 Oct 2025 11:42:26 -0400
Subject: [PATCH 6/7] Update build.yml

---
 .github/workflows/build.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2bd01e6..e524eef 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,6 +10,9 @@ jobs:
   deploy:
     runs-on: macos-latest
     steps:
+      - name: Install Rosetta
+        run: softwareupdate --install-rosetta --agree-to-license
+
       - name: Checkout the repo
         uses: actions/checkout@v3
 

From fd419213fa89d2094c7efde20f13cff1b593ded3 Mon Sep 17 00:00:00 2001
From: Kevin Schildhorn <kevin.schildhorn@gmail.com>
Date: Wed, 29 Oct 2025 12:30:45 -0400
Subject: [PATCH 7/7] Update build.yml

---
 .github/workflows/build.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e524eef..a17a862 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,11 +8,8 @@ on:
 
 jobs:
   deploy:
-    runs-on: macos-latest
+    runs-on: macos-13
     steps:
-      - name: Install Rosetta
-        run: softwareupdate --install-rosetta --agree-to-license
-
       - name: Checkout the repo
         uses: actions/checkout@v3