bump libraries and gradle

Author: CharlieTap

gradle.properties

@@ -1,6 +1,6 @@
 org.gradle.caching=true
 org.gradle.parallel=true
-org.gradle.unsafe.configuration-cache=true
+org.gradle.configuration-cache=true
 
 kotlin.code.style=official
 kotlin.mpp.stability.nowarn=true

gradle/libs.versions.toml

@@ -1,24 +1,22 @@
 [versions]
 
-kotlin = "1.7.20"
-ksp = "1.7.20-1.0.6"
-kotlinter = "3.11.1"
+kotlin = "1.8.21"
+kotlinter = "3.14.0"
 
-kotlinx-coroutines = "1.6.4"
+kotlinx-coroutines = "1.7.0-RC"
 kotlinx-datetime = "0.4.0"
-kotlinx-serialization = "1.4.1"
+kotlinx-serialization = "1.5.0"
 
-okio="3.1.0"
-result = "1.1.16"
-uuid = "0.5.0"
+okio="3.3.0"
+result = "1.1.17"
+uuid = "0.7.0"
 
 [plugins]
 
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
-kotlin-symbol-processing = { id = "com.google.devtools.ksp", version.ref = "ksp"  }
 kotlinter = { id = "org.jmailen.kotlinter", version.ref = "kotlinter"  }
 
 [libraries]

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/commonMain/kotlin/com/tap/hlc/HybridLogicalClock.kt

@@ -6,11 +6,11 @@ import com.github.michaelbull.result.Result
 import com.github.michaelbull.result.flatMap
 import com.github.michaelbull.result.getOr
 import kotlinx.datetime.Clock
+import okio.FileSystem
+import okio.Path
 import kotlin.math.abs
 import kotlin.math.max
 import kotlin.math.pow
-import okio.FileSystem
-import okio.Path
 
 /**
  * Implementation of a HLC [1][2]
@@ -24,7 +24,7 @@ import okio.Path
 data class HybridLogicalClock(
     val timestamp: Timestamp = Timestamp.now(Clock.System),
     val node: NodeID = NodeID.mint(),
-    val counter: Int = 0
+    val counter: Int = 0,
 ) : Comparable<HybridLogicalClock> {
 
     companion object {
@@ -37,12 +37,14 @@ data class HybridLogicalClock(
         fun localTick(
             local: HybridLogicalClock,
             wallClockTime: Timestamp = Timestamp.now(Clock.System),
-            maxClockDrift: Int = 1000 * 60
+            maxClockDrift: Int = 1000 * 60,
         ): Result<HybridLogicalClock, HLCError> {
             return if (wallClockTime.epochMillis > local.timestamp.epochMillis) {
                 Ok(local.copy(timestamp = wallClockTime))
-            } else Ok(local.copy(counter = local.counter + 1)).flatMap { clock ->
-                validate(clock, wallClockTime, maxClockDrift)
+            } else {
+                Ok(local.copy(counter = local.counter + 1)).flatMap { clock ->
+                    validate(clock, wallClockTime, maxClockDrift)
+                }
             }
         }
 
@@ -53,7 +55,7 @@ data class HybridLogicalClock(
             local: HybridLogicalClock,
             remote: HybridLogicalClock,
             wallClockTime: Timestamp = Timestamp.now(Clock.System),
-            maxClockDrift: Int = 1000 * 60
+            maxClockDrift: Int = 1000 * 60,
         ): Result<HybridLogicalClock, HLCError> {
             return when {
                 local.node.identifier == remote.node.identifier -> {
@@ -119,7 +121,7 @@ data class HybridLogicalClock(
          * val directory = "/Users/alice".toPath()
          * HybridLogicalClock.store(hlc, path)
          */
-        fun store(hlc: HybridLogicalClock, directory: Path, fileSystem: FileSystem = FileSystem.SYSTEM, fileName : String = CLOCK_FILE) {
+        fun store(hlc: HybridLogicalClock, directory: Path, fileSystem: FileSystem = FileSystem.SYSTEM, fileName: String = CLOCK_FILE) {
             fileSystem.createDirectories(directory)
             val filepath = directory / fileName
             fileSystem.write(filepath) {
@@ -136,9 +138,9 @@ data class HybridLogicalClock(
          * val directory = "/Users/alice".toPath()
          * val nullableClock = HybridLogicalClock.load(path)
          */
-        fun load(directory: Path, fileSystem: FileSystem = FileSystem.SYSTEM, fileName: String = CLOCK_FILE) : HybridLogicalClock? {
+        fun load(directory: Path, fileSystem: FileSystem = FileSystem.SYSTEM, fileName: String = CLOCK_FILE): HybridLogicalClock? {
             val filepath = directory / fileName
-            if(!fileSystem.exists(filepath)) {
+            if (!fileSystem.exists(filepath)) {
                 return null
             }
             val encoded = fileSystem.read(filepath) { readUtf8() }

src/commonTest/kotlin/com/tap/hlc/HLCPersistTest.kt

@@ -1,17 +1,16 @@
 package com.tap.hlc
 
 import com.benasher44.uuid.uuid4
+import okio.Path.Companion.toPath
+import okio.fakefilesystem.FakeFileSystem
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertNotNull
-import okio.Path.Companion.toPath
-import okio.fakefilesystem.FakeFileSystem
 
 class HLCPersistTest {
 
     @Test
     fun `can store the hlc into a file at a given path`() {
-
         val fileSystem = FakeFileSystem()
 
         val epochMillis = 943920000000L
@@ -35,7 +34,6 @@ class HLCPersistTest {
 
     @Test
     fun `can load a hlc from a given path`() {
-
         val fileSystem = FakeFileSystem()
         val path = "/Users/alice".toPath()
         fileSystem.createDirectories(path)
@@ -62,7 +60,6 @@ class HLCPersistTest {
 
     @Test
     fun `can store and load a hlc to and from a given path`() {
-
         val fileSystem = FakeFileSystem()
         val path = "/Users/alice".toPath()
         fileSystem.createDirectories(path)