EVA-PIMP bump versions may 2024

razz-team · May 24, 2024 · e315a96 · e315a96
1 parent 1e0853f
commit e315a96
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 44 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("com.github.ben-manes.versions") version "0.50.0"
+    id("com.github.ben-manes.versions") version "0.51.0"
 }
 
 fun isNonStable(version: String): Boolean {

diff --git a/buildSrc/src/main/kotlin/CI.kt b/buildSrc/src/main/kotlin/CI.kt
@@ -2,7 +2,7 @@ import java.lang.Boolean.parseBoolean
 
 object Ci {
 
-    private const val SNAPSHOT_BASE = "0.7.0"
+    private const val SNAPSHOT_BASE = "0.7.1"
     private const val RELEASE_VERSION = "0.6.8"
     private val githubSha = System.getenv("GITHUB_SHA") ?: "latest"
 

diff --git a/buildSrc/src/main/kotlin/dependencies.kt b/buildSrc/src/main/kotlin/dependencies.kt
@@ -1,24 +1,24 @@
 object versions {
     val java = org.gradle.api.JavaVersion.VERSION_21
     val jvm = "21"
-    val kotlin = "1.9.21"
-    val kotlin_coroutines = "1.7.3"
+    val kotlin = "1.9.24"
+    val kotlin_coroutines = "1.8.1"
     val kotlin_serialization_json = "1.6.3"
-    val kotest = "5.8.0"
-    val jooq = "3.19.6"
-    val flywaydb = "10.1.0"
+    val kotest = "5.9.0"
+    val jooq = "3.19.8"
+    val flywaydb = "10.13.0"
     val opentracing = "0.33.0"
     val jaeger = "1.8.1"
-    val micrometer = "1.12.0"
-    val detekt = "1.22.0"
-    val logback = "1.4.12"
+    val micrometer = "1.13.0"
+    val detekt = "1.23.6"
+    val logback = "1.5.6"
     val kotlin_logging = "3.0.5"
-    val kotlin_slf4 = "1.7.3"
-    val jackson = "2.16.0"
-    val mockk = "1.13.8"
-    val testcontainers = "1.19.3"
-    val postgresql = "42.7.0"
-    val vertx = "4.5.0"
+    val kotlin_slf4 = "1.8.1"
+    val jackson = "2.17.1"
+    val mockk = "1.13.11"
+    val testcontainers = "1.19.8"
+    val postgresql = "42.7.3"
+    val vertx = "4.5.8"
     val ongres_scram = "2.1"
     val hikari = "5.1.0"
     val kafka_clients = "3.1.0"

diff --git a/eva-repository/src/main/kotlin/com/razz/eva/repository/JooqStatefulModelRepository.kt b/eva-repository/src/main/kotlin/com/razz/eva/repository/JooqStatefulModelRepository.kt
@@ -25,11 +25,11 @@ abstract class JooqStatefulModelRepository<ID, MID, M, ME, R, S>(
 ) : JooqBaseModelRepository<ID, MID, M, ME, R>(
     queryExecutor, dslContext, table, tableId, dbId, version, createdAt
 ) where ID : Comparable<ID>,
-        MID : ModelId<out Comparable<*>>,
-        ME : ModelEvent<MID>,
-        M : Model<MID, ME>,
-        R : TypedStatefulEntityRecord<ID, S>,
-        S : Enum<S> {
+      MID : ModelId<out Comparable<*>>,
+      ME : ModelEvent<MID>,
+      M : Model<MID, ME>,
+      R : TypedStatefulEntityRecord<ID, S>,
+      S : Enum<S> {
 
     protected abstract fun stateOf(model: M): S
 

diff --git a/eva-repository/src/main/kotlin/com/razz/eva/repository/ModelPagingStrategy.kt b/eva-repository/src/main/kotlin/com/razz/eva/repository/ModelPagingStrategy.kt
@@ -8,11 +8,11 @@ import org.jooq.Record
 abstract class ModelPagingStrategy<ID, MID, M, S, P, R>(
     private val modelClass: KClass<S>
 ) : PagingStrategy<ID, M, S, P, R>() where ID : Comparable<ID>,
-        MID : ModelId<out Comparable<*>>,
-        M : Model<MID, *>,
-        S : M,
-        P : Comparable<P>,
-        R : Record {
+      MID : ModelId<out Comparable<*>>,
+      M : Model<MID, *>,
+      S : M,
+      P : Comparable<P>,
+      R : Record {
 
     protected open fun failOnWrongModel(): Boolean = false
 

diff --git a/eva-uow/src/main/kotlin/com/razz/eva/uow/Change.kt b/eva-uow/src/main/kotlin/com/razz/eva/uow/Change.kt
@@ -85,7 +85,7 @@ internal data class Noop(
 }
 
 private infix fun <E : ModelEvent<out ModelId<out Comparable<*>>>> List<E>
-.isSuccessorOf(modelEvents: List<E>): Boolean {
+    .isSuccessorOf(modelEvents: List<E>): Boolean {
     if (this.size < modelEvents.size) {
         return false
     }

diff --git a/eva-uow/src/main/kotlin/com/razz/eva/uow/UnitOfWorkExecutor.kt b/eva-uow/src/main/kotlin/com/razz/eva/uow/UnitOfWorkExecutor.kt
@@ -31,9 +31,9 @@ data class InstantiationContext internal constructor(
 infix fun <PRINCIPAL, PARAMS, RESULT, UOW> KClass<UOW>.withFactory(
     factory: () -> UOW
 ) where PRINCIPAL : Principal<*>,
-        PARAMS : UowParams<PARAMS>,
-        UOW : BaseUnitOfWork<PRINCIPAL, PARAMS, RESULT, *>,
-        RESULT : Any =
+      PARAMS : UowParams<PARAMS>,
+      UOW : BaseUnitOfWork<PRINCIPAL, PARAMS, RESULT, *>,
+      RESULT : Any =
     ClassToUow(this, factory)
 
 class UnitOfWorkExecutor(
@@ -47,9 +47,9 @@ class UnitOfWorkExecutor(
         internal val uowClass: KClass<UOW>,
         internal val uowFactory: () -> UOW
     ) where PRINCIPAL : Principal<*>,
-            UOW : BaseUnitOfWork<PRINCIPAL, PARAMS, RESULT, *>,
-            PARAMS : UowParams<PARAMS>,
-            RESULT : Any
+          UOW : BaseUnitOfWork<PRINCIPAL, PARAMS, RESULT, *>,
+          PARAMS : UowParams<PARAMS>,
+          RESULT : Any
 
     private val logger = KotlinLogging.logger {}
     private val classToFactory = factories.groupBy(ClassToUow<*, *, *, *>::uowClass).mapValues {
@@ -61,8 +61,8 @@ class UnitOfWorkExecutor(
         uowFactory: () -> UOW,
         params: InstantiationContext.() -> PARAMS
     ): RESULT where PRINCIPAL : Principal<*>,
-                    PARAMS : UowParams<PARAMS>,
-                    UOW : BaseUnitOfWork<PRINCIPAL, PARAMS, RESULT, *> {
+          PARAMS : UowParams<PARAMS>,
+          UOW : BaseUnitOfWork<PRINCIPAL, PARAMS, RESULT, *> {
         val startTime = System.nanoTime()
         val activeSpan = coroutineContext[ActiveSpanElement]?.span
         if (activeSpan == null) {
@@ -170,8 +170,8 @@ class UnitOfWorkExecutor(
         principal: PRINCIPAL,
         params: InstantiationContext.() -> PARAMS
     ): RESULT where PRINCIPAL : Principal<*>,
-                    PARAMS : UowParams<PARAMS>,
-                    UOW : BaseUnitOfWork<PRINCIPAL, PARAMS, RESULT, *> {
+          PARAMS : UowParams<PARAMS>,
+          UOW : BaseUnitOfWork<PRINCIPAL, PARAMS, RESULT, *> {
         return execute(principal, { create(target) }, params)
     }
 

diff --git a/eva-uow/src/main/kotlin/com/razz/eva/uow/composable/ChangesDsl.kt b/eva-uow/src/main/kotlin/com/razz/eva/uow/composable/ChangesDsl.kt
@@ -19,7 +19,7 @@ class ChangesDsl internal constructor(initial: ChangesAccumulator) {
 
     // Under no circumstances should this method accept a model that is not new
     fun <MID, E, M> add(model: M): M
-    where M : Model<MID, E>, E : ModelEvent<MID>, MID : ModelId<out Comparable<*>> {
+        where M : Model<MID, E>, E : ModelEvent<MID>, MID : ModelId<out Comparable<*>> {
         require(model.isNew()) {
             "Attempted to register ${if (model.isDirty()) "changed" else "unchanged"} " +
                 "model [${model.id().stringValue()}] as new"
@@ -49,7 +49,7 @@ class ChangesDsl internal constructor(initial: ChangesAccumulator) {
     //     }
     //
     fun <MID, E, M> update(model: M): M
-    where M : Model<MID, E>, E : ModelEvent<MID>, MID : ModelId<out Comparable<*>> {
+        where M : Model<MID, E>, E : ModelEvent<MID>, MID : ModelId<out Comparable<*>> {
         require(model.isDirty() || model.isNew()) {
             "Attempted to register unchanged model [${model.id().stringValue()}] as changed"
         }
@@ -78,7 +78,7 @@ class ChangesDsl internal constructor(initial: ChangesAccumulator) {
     //     }
     //
     fun <MID, E, M> notChanged(model: M): M
-    where M : Model<MID, E>, E : ModelEvent<MID>, MID : ModelId<out Comparable<*>> {
+        where M : Model<MID, E>, E : ModelEvent<MID>, MID : ModelId<out Comparable<*>> {
         require(model.isPersisted() || model.isNew()) {
             "Attempted to register changed model [${model.id().stringValue()}] as unchanged"
         }
@@ -91,10 +91,10 @@ class ChangesDsl internal constructor(initial: ChangesAccumulator) {
         principal: PRINCIPAL,
         params: () -> PARAMS,
     ): RESULT
-    where PRINCIPAL : Principal<*>,
-          PARAMS : UowParams<PARAMS>,
-          RESULT : Any,
-          UOW : BaseUnitOfWork<PRINCIPAL, PARAMS, RESULT, *> {
+        where PRINCIPAL : Principal<*>,
+              PARAMS : UowParams<PARAMS>,
+              RESULT : Any,
+              UOW : BaseUnitOfWork<PRINCIPAL, PARAMS, RESULT, *> {
         val subChanges = uow.tryPerform(principal, params())
         tail = tail?.merge(head.merge(subChanges)) ?: head.merge(subChanges)
         head = ChangesAccumulator()