From e8f280f9db32bf66320eb1ee7a945a6539a53b87 Mon Sep 17 00:00:00 2001 From: Nicolas Vollmar Date: Fri, 26 Jan 2024 15:34:04 +0100 Subject: [PATCH] Upgrades kryo from 5.5.0 to 5.6.0 and switches to library version --- README.md | 1 + build.sbt | 4 ++-- .../kryo/scala/ScalaVersionSerializers.scala | 2 +- .../kryo/scala/serializer/ScalaCollectionSerializer.scala | 8 ++++---- .../kryo/scala/ScalaVersionSerializers.scala | 2 +- .../kryo/scala/serializer/ScalaCollectionSerializer.scala | 4 ++-- .../kryo/scala/ScalaVersionSerializers.scala | 2 +- .../kryo/scala/serializer/ScalaCollectionSerializer.scala | 4 ++-- .../kryo/scala/serializer/ScalaEnumNameSerializer.scala | 4 ++-- .../serialization/kryo/scala/DefaultKryoInitializer.scala | 8 ++++---- .../altoo/serialization/kryo/scala/KryoSerializer.scala | 8 ++++---- .../serialization/kryo/scala/KryoSerializerBackend.scala | 6 +++--- .../kryo/scala/serializer/EnumerationNameSerializer.scala | 4 ++-- .../kryo/scala/serializer/KryoClassResolver.scala | 4 ++-- .../serialization/kryo/scala/serializer/ScalaKryo.scala | 4 ++-- .../kryo/scala/serializer/ScalaMapSerializers.scala | 4 ++-- .../kryo/scala/serializer/ScalaObjectSerializer.scala | 4 ++-- .../kryo/scala/serializer/ScalaSetSerializers.scala | 4 ++-- .../kryo/scala/serializer/ScalaUnitSerializer.scala | 4 ++-- .../kryo/scala/serializer/SubclassResolver.scala | 4 ++-- .../kryo/scala/serializer/ScalaVersionRegistry.scala | 2 +- .../kryo/scala/serializer/ScalaVersionRegistry.scala | 2 +- .../scala/serializer/ScalaEnumSerializationTest.scala | 2 +- .../kryo/scala/serializer/ScalaVersionRegistry.scala | 2 +- .../scala/CompressionEffectivenessSerializationTest.scala | 2 +- .../kryo/scala/serializer/EnumerationSerializerTest.scala | 4 ++-- .../kryo/scala/serializer/MapSerializerTest.scala | 6 +++--- .../kryo/scala/serializer/ScalaKryoTest.scala | 2 +- .../kryo/scala/testkit/AbstractKryoTest.scala | 8 ++++---- 29 files changed, 58 insertions(+), 57 deletions(-) diff --git a/README.md b/README.md index 75d678a..31ec7c3 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,7 @@ We provide several versions of the library: | Version | Kryo Compatibility | Available Scala Versions | Tested with | |---------|--------------------|--------------------------|---------------------------------------------------------------------| +| v1.2.x | Kryo-5.6 | 2.12,2.13,3 | JDK: OpenJdk11,OpenJdk17,OpenJdk21 Scala: 2.12.18,2.13.11,3.3.1 | | v1.1.x | Kryo-5.5 | 2.12,2.13,3 | JDK: OpenJdk11,OpenJdk17,OpenJdk21 Scala: 2.12.18,2.13.11,3.3.1 | | v1.0.x | Kryo-5.4 | 2.12,2.13,3 | JDK: OpenJdk11,OpenJdk17 Scala: 2.12.18,2.13.11,3.3.1 | diff --git a/build.sbt b/build.sbt index 36d1b83..10e2fa2 100644 --- a/build.sbt +++ b/build.sbt @@ -7,7 +7,7 @@ import sbtrelease.ReleasePlugin.autoImport.ReleaseTransformations._ val mainScalaVersion = "3.3.1" val secondaryScalaVersions = Seq("2.12.18", "2.13.12") -val kryoVersion = "5.5.0" +val kryoVersion = "5.6.0" enablePlugins(ReleasePlugin) addCommandAlias("validatePullRequest", ";+test") @@ -41,7 +41,7 @@ lazy val core: Project = project.in(file("core")) // Dependencies lazy val coreDeps = Seq( - "com.esotericsoftware" % "kryo" % kryoVersion, + "com.esotericsoftware" % "kryo5" % kryoVersion, "com.typesafe" % "config" % "1.4.2", "org.lz4" % "lz4-java" % "1.8.0", "org.agrona" % "agrona" % "1.15.1", // should match pekko-remote/aeron inherited version diff --git a/core/src/main/scala-2.12/io/altoo/serialization/kryo/scala/ScalaVersionSerializers.scala b/core/src/main/scala-2.12/io/altoo/serialization/kryo/scala/ScalaVersionSerializers.scala index 9a16490..1eac6cf 100644 --- a/core/src/main/scala-2.12/io/altoo/serialization/kryo/scala/ScalaVersionSerializers.scala +++ b/core/src/main/scala-2.12/io/altoo/serialization/kryo/scala/ScalaVersionSerializers.scala @@ -1,6 +1,6 @@ package io.altoo.serialization.kryo.scala -import com.esotericsoftware.kryo.Kryo +import com.esotericsoftware.kryo.kryo5.Kryo import io.altoo.serialization.kryo.scala.serializer.{ScalaCollectionSerializer, ScalaImmutableMapSerializer, ScalaImmutableSetSerializer} private[kryo] object ScalaVersionSerializers { diff --git a/core/src/main/scala-2.12/io/altoo/serialization/kryo/scala/serializer/ScalaCollectionSerializer.scala b/core/src/main/scala-2.12/io/altoo/serialization/kryo/scala/serializer/ScalaCollectionSerializer.scala index c292439..35a8eff 100644 --- a/core/src/main/scala-2.12/io/altoo/serialization/kryo/scala/serializer/ScalaCollectionSerializer.scala +++ b/core/src/main/scala-2.12/io/altoo/serialization/kryo/scala/serializer/ScalaCollectionSerializer.scala @@ -20,10 +20,10 @@ package io.altoo.serialization.kryo.scala.serializer import scala.collection.Traversable -import com.esotericsoftware.kryo.Kryo -import com.esotericsoftware.kryo.Serializer -import com.esotericsoftware.kryo.io.Input -import com.esotericsoftware.kryo.io.Output +import com.esotericsoftware.kryo.kryo5.Kryo +import com.esotericsoftware.kryo.kryo5.Serializer +import com.esotericsoftware.kryo.kryo5.io.Input +import com.esotericsoftware.kryo.kryo5.io.Output /** * Generic serializer for traversable collections diff --git a/core/src/main/scala-2.13/io/altoo/serialization/kryo/scala/ScalaVersionSerializers.scala b/core/src/main/scala-2.13/io/altoo/serialization/kryo/scala/ScalaVersionSerializers.scala index b4b0b75..11625aa 100644 --- a/core/src/main/scala-2.13/io/altoo/serialization/kryo/scala/ScalaVersionSerializers.scala +++ b/core/src/main/scala-2.13/io/altoo/serialization/kryo/scala/ScalaVersionSerializers.scala @@ -1,6 +1,6 @@ package io.altoo.serialization.kryo.scala -import com.esotericsoftware.kryo.Kryo +import com.esotericsoftware.kryo.kryo5.Kryo import io.altoo.serialization.kryo.scala.serializer.{ScalaCollectionSerializer, ScalaImmutableMapSerializer} private[kryo] object ScalaVersionSerializers { diff --git a/core/src/main/scala-2.13/io/altoo/serialization/kryo/scala/serializer/ScalaCollectionSerializer.scala b/core/src/main/scala-2.13/io/altoo/serialization/kryo/scala/serializer/ScalaCollectionSerializer.scala index 7476f97..a408c84 100644 --- a/core/src/main/scala-2.13/io/altoo/serialization/kryo/scala/serializer/ScalaCollectionSerializer.scala +++ b/core/src/main/scala-2.13/io/altoo/serialization/kryo/scala/serializer/ScalaCollectionSerializer.scala @@ -18,8 +18,8 @@ package io.altoo.serialization.kryo.scala.serializer -import com.esotericsoftware.kryo.io.{Input, Output} -import com.esotericsoftware.kryo.{Kryo, Serializer} +import com.esotericsoftware.kryo.kryo5.io.{Input, Output} +import com.esotericsoftware.kryo.kryo5.{Kryo, Serializer} /** * Generic serializer for traversable collections diff --git a/core/src/main/scala-3/io/altoo/serialization/kryo/scala/ScalaVersionSerializers.scala b/core/src/main/scala-3/io/altoo/serialization/kryo/scala/ScalaVersionSerializers.scala index c113301..e1c2bea 100644 --- a/core/src/main/scala-3/io/altoo/serialization/kryo/scala/ScalaVersionSerializers.scala +++ b/core/src/main/scala-3/io/altoo/serialization/kryo/scala/ScalaVersionSerializers.scala @@ -1,6 +1,6 @@ package io.altoo.serialization.kryo.scala -import com.esotericsoftware.kryo.Kryo +import com.esotericsoftware.kryo.kryo5.Kryo import io.altoo.serialization.kryo.scala.serializer.{ScalaCollectionSerializer, ScalaEnumNameSerializer, ScalaImmutableMapSerializer} private[kryo] object ScalaVersionSerializers { diff --git a/core/src/main/scala-3/io/altoo/serialization/kryo/scala/serializer/ScalaCollectionSerializer.scala b/core/src/main/scala-3/io/altoo/serialization/kryo/scala/serializer/ScalaCollectionSerializer.scala index 1a9b640..55cb4c9 100644 --- a/core/src/main/scala-3/io/altoo/serialization/kryo/scala/serializer/ScalaCollectionSerializer.scala +++ b/core/src/main/scala-3/io/altoo/serialization/kryo/scala/serializer/ScalaCollectionSerializer.scala @@ -18,8 +18,8 @@ package io.altoo.serialization.kryo.scala.serializer -import com.esotericsoftware.kryo.io.{Input, Output} -import com.esotericsoftware.kryo.{Kryo, Serializer} +import com.esotericsoftware.kryo.kryo5.io.{Input, Output} +import com.esotericsoftware.kryo.kryo5.{Kryo, Serializer} /** * Generic serializer for traversable collections diff --git a/core/src/main/scala-3/io/altoo/serialization/kryo/scala/serializer/ScalaEnumNameSerializer.scala b/core/src/main/scala-3/io/altoo/serialization/kryo/scala/serializer/ScalaEnumNameSerializer.scala index 1a1876b..ad8f9e3 100644 --- a/core/src/main/scala-3/io/altoo/serialization/kryo/scala/serializer/ScalaEnumNameSerializer.scala +++ b/core/src/main/scala-3/io/altoo/serialization/kryo/scala/serializer/ScalaEnumNameSerializer.scala @@ -1,7 +1,7 @@ package io.altoo.serialization.kryo.scala.serializer -import com.esotericsoftware.kryo.io.{Input, Output} -import com.esotericsoftware.kryo.{Kryo, Serializer} +import com.esotericsoftware.kryo.kryo5.io.{Input, Output} +import com.esotericsoftware.kryo.kryo5.{Kryo, Serializer} import scala.runtime.EnumValue diff --git a/core/src/main/scala/io/altoo/serialization/kryo/scala/DefaultKryoInitializer.scala b/core/src/main/scala/io/altoo/serialization/kryo/scala/DefaultKryoInitializer.scala index a077348..a503435 100644 --- a/core/src/main/scala/io/altoo/serialization/kryo/scala/DefaultKryoInitializer.scala +++ b/core/src/main/scala/io/altoo/serialization/kryo/scala/DefaultKryoInitializer.scala @@ -1,8 +1,8 @@ package io.altoo.serialization.kryo.scala -import com.esotericsoftware.kryo.{ClassResolver, ReferenceResolver} -import com.esotericsoftware.kryo.serializers.FieldSerializer -import com.esotericsoftware.kryo.util.{DefaultClassResolver, ListReferenceResolver, MapReferenceResolver} +import com.esotericsoftware.kryo.kryo5.{ClassResolver, ReferenceResolver} +import com.esotericsoftware.kryo.kryo5.serializers.FieldSerializer +import com.esotericsoftware.kryo.kryo5.util.{DefaultClassResolver, ListReferenceResolver, MapReferenceResolver} import io.altoo.serialization.kryo.scala.serializer.* import scala.util.{Failure, Success} @@ -34,7 +34,7 @@ class DefaultKryoInitializer { * Note: register custom classes/serializer in `postInit`, otherwise default order might break. */ def preInit(kryo: ScalaKryo): Unit = { - kryo.setDefaultSerializer(classOf[com.esotericsoftware.kryo.serializers.FieldSerializer[?]]) + kryo.setDefaultSerializer(classOf[com.esotericsoftware.kryo.kryo5.serializers.FieldSerializer[?]]) } /** diff --git a/core/src/main/scala/io/altoo/serialization/kryo/scala/KryoSerializer.scala b/core/src/main/scala/io/altoo/serialization/kryo/scala/KryoSerializer.scala index 433c1f2..c6052f4 100644 --- a/core/src/main/scala/io/altoo/serialization/kryo/scala/KryoSerializer.scala +++ b/core/src/main/scala/io/altoo/serialization/kryo/scala/KryoSerializer.scala @@ -18,12 +18,12 @@ package io.altoo.serialization.kryo.scala -import com.esotericsoftware.kryo.Kryo -import com.esotericsoftware.kryo.util.* -import com.esotericsoftware.minlog.Log as MiniLog +import com.esotericsoftware.kryo.kryo5.Kryo +import com.esotericsoftware.kryo.kryo5.minlog.Log as MiniLog +import com.esotericsoftware.kryo.kryo5.objenesis.strategy.StdInstantiatorStrategy +import com.esotericsoftware.kryo.kryo5.util.* import com.typesafe.config.Config import io.altoo.serialization.kryo.scala.serializer.* -import org.objenesis.strategy.StdInstantiatorStrategy import org.slf4j.LoggerFactory import java.nio.ByteBuffer diff --git a/core/src/main/scala/io/altoo/serialization/kryo/scala/KryoSerializerBackend.scala b/core/src/main/scala/io/altoo/serialization/kryo/scala/KryoSerializerBackend.scala index 9cfe46f..26facaf 100644 --- a/core/src/main/scala/io/altoo/serialization/kryo/scala/KryoSerializerBackend.scala +++ b/core/src/main/scala/io/altoo/serialization/kryo/scala/KryoSerializerBackend.scala @@ -1,8 +1,8 @@ package io.altoo.serialization.kryo.scala -import com.esotericsoftware.kryo.Kryo -import com.esotericsoftware.kryo.io.{ByteBufferInput, ByteBufferOutput, Input, Output} -import com.esotericsoftware.kryo.unsafe.{UnsafeInput, UnsafeOutput} +import com.esotericsoftware.kryo.kryo5.Kryo +import com.esotericsoftware.kryo.kryo5.io.{ByteBufferInput, ByteBufferOutput, Input, Output} +import com.esotericsoftware.kryo.kryo5.unsafe.{UnsafeInput, UnsafeOutput} import org.slf4j.Logger import java.nio.ByteBuffer diff --git a/core/src/main/scala/io/altoo/serialization/kryo/scala/serializer/EnumerationNameSerializer.scala b/core/src/main/scala/io/altoo/serialization/kryo/scala/serializer/EnumerationNameSerializer.scala index de6312e..d227d4e 100644 --- a/core/src/main/scala/io/altoo/serialization/kryo/scala/serializer/EnumerationNameSerializer.scala +++ b/core/src/main/scala/io/altoo/serialization/kryo/scala/serializer/EnumerationNameSerializer.scala @@ -1,7 +1,7 @@ package io.altoo.serialization.kryo.scala.serializer -import com.esotericsoftware.kryo.io.{Input, Output} -import com.esotericsoftware.kryo.{Kryo, Serializer} +import com.esotericsoftware.kryo.kryo5.io.{Input, Output} +import com.esotericsoftware.kryo.kryo5.{Kryo, Serializer} import java.lang.reflect.Field diff --git a/core/src/main/scala/io/altoo/serialization/kryo/scala/serializer/KryoClassResolver.scala b/core/src/main/scala/io/altoo/serialization/kryo/scala/serializer/KryoClassResolver.scala index 3358f8a..8702e55 100644 --- a/core/src/main/scala/io/altoo/serialization/kryo/scala/serializer/KryoClassResolver.scala +++ b/core/src/main/scala/io/altoo/serialization/kryo/scala/serializer/KryoClassResolver.scala @@ -18,8 +18,8 @@ package io.altoo.serialization.kryo.scala.serializer -import com.esotericsoftware.kryo.Registration -import com.esotericsoftware.kryo.util.DefaultClassResolver +import com.esotericsoftware.kryo.kryo5.Registration +import com.esotericsoftware.kryo.kryo5.util.DefaultClassResolver class KryoClassResolver(val logImplicits: Boolean) extends DefaultClassResolver { override def registerImplicit(typ: Class[?]): Registration = { diff --git a/core/src/main/scala/io/altoo/serialization/kryo/scala/serializer/ScalaKryo.scala b/core/src/main/scala/io/altoo/serialization/kryo/scala/serializer/ScalaKryo.scala index cad420e..6a4d3ff 100644 --- a/core/src/main/scala/io/altoo/serialization/kryo/scala/serializer/ScalaKryo.scala +++ b/core/src/main/scala/io/altoo/serialization/kryo/scala/serializer/ScalaKryo.scala @@ -17,8 +17,8 @@ */ package io.altoo.serialization.kryo.scala.serializer -import com.esotericsoftware.kryo.* -import com.esotericsoftware.kryo.serializers.FieldSerializer +import com.esotericsoftware.kryo.kryo5.* +import com.esotericsoftware.kryo.kryo5.serializers.FieldSerializer class ScalaKryo(classResolver: ClassResolver, referenceResolver: ReferenceResolver) extends Kryo(classResolver, referenceResolver) { diff --git a/core/src/main/scala/io/altoo/serialization/kryo/scala/serializer/ScalaMapSerializers.scala b/core/src/main/scala/io/altoo/serialization/kryo/scala/serializer/ScalaMapSerializers.scala index 0d3d8c0..93888ca 100644 --- a/core/src/main/scala/io/altoo/serialization/kryo/scala/serializer/ScalaMapSerializers.scala +++ b/core/src/main/scala/io/altoo/serialization/kryo/scala/serializer/ScalaMapSerializers.scala @@ -18,8 +18,8 @@ package io.altoo.serialization.kryo.scala.serializer -import com.esotericsoftware.kryo.io.{Input, Output} -import com.esotericsoftware.kryo.{Kryo, Serializer} +import com.esotericsoftware.kryo.kryo5.io.{Input, Output} +import com.esotericsoftware.kryo.kryo5.{Kryo, Serializer} import java.lang.reflect.Constructor import scala.collection.immutable.{Map as IMap, SortedMap} diff --git a/core/src/main/scala/io/altoo/serialization/kryo/scala/serializer/ScalaObjectSerializer.scala b/core/src/main/scala/io/altoo/serialization/kryo/scala/serializer/ScalaObjectSerializer.scala index 1915ed6..4ba5d30 100644 --- a/core/src/main/scala/io/altoo/serialization/kryo/scala/serializer/ScalaObjectSerializer.scala +++ b/core/src/main/scala/io/altoo/serialization/kryo/scala/serializer/ScalaObjectSerializer.scala @@ -18,8 +18,8 @@ package io.altoo.serialization.kryo.scala.serializer -import com.esotericsoftware.kryo.io.{Input, Output} -import com.esotericsoftware.kryo.{Kryo, Serializer} +import com.esotericsoftware.kryo.kryo5.io.{Input, Output} +import com.esotericsoftware.kryo.kryo5.{Kryo, Serializer} import _root_.java.lang.reflect.Field import scala.collection.mutable.Map as MMap diff --git a/core/src/main/scala/io/altoo/serialization/kryo/scala/serializer/ScalaSetSerializers.scala b/core/src/main/scala/io/altoo/serialization/kryo/scala/serializer/ScalaSetSerializers.scala index 6618852..ed8c9b5 100644 --- a/core/src/main/scala/io/altoo/serialization/kryo/scala/serializer/ScalaSetSerializers.scala +++ b/core/src/main/scala/io/altoo/serialization/kryo/scala/serializer/ScalaSetSerializers.scala @@ -18,8 +18,8 @@ package io.altoo.serialization.kryo.scala.serializer -import com.esotericsoftware.kryo.io.{Input, Output} -import com.esotericsoftware.kryo.{Kryo, Serializer} +import com.esotericsoftware.kryo.kryo5.io.{Input, Output} +import com.esotericsoftware.kryo.kryo5.{Kryo, Serializer} import java.lang.reflect.Constructor import scala.collection.immutable.{Set as imSet, SortedSet as imSSet} diff --git a/core/src/main/scala/io/altoo/serialization/kryo/scala/serializer/ScalaUnitSerializer.scala b/core/src/main/scala/io/altoo/serialization/kryo/scala/serializer/ScalaUnitSerializer.scala index 8924777..082b4f5 100644 --- a/core/src/main/scala/io/altoo/serialization/kryo/scala/serializer/ScalaUnitSerializer.scala +++ b/core/src/main/scala/io/altoo/serialization/kryo/scala/serializer/ScalaUnitSerializer.scala @@ -18,8 +18,8 @@ package io.altoo.serialization.kryo.scala.serializer -import com.esotericsoftware.kryo.io.{Input, Output} -import com.esotericsoftware.kryo.{Kryo, Serializer} +import com.esotericsoftware.kryo.kryo5.io.{Input, Output} +import com.esotericsoftware.kryo.kryo5.{Kryo, Serializer} class ScalaUnitSerializer extends Serializer[Unit] { def write(kryo: Kryo, output: Output, obj: Unit): Unit = { diff --git a/core/src/main/scala/io/altoo/serialization/kryo/scala/serializer/SubclassResolver.scala b/core/src/main/scala/io/altoo/serialization/kryo/scala/serializer/SubclassResolver.scala index c57c08a..29dd449 100644 --- a/core/src/main/scala/io/altoo/serialization/kryo/scala/serializer/SubclassResolver.scala +++ b/core/src/main/scala/io/altoo/serialization/kryo/scala/serializer/SubclassResolver.scala @@ -1,7 +1,7 @@ package io.altoo.serialization.kryo.scala.serializer -import com.esotericsoftware.kryo.Registration -import com.esotericsoftware.kryo.util.DefaultClassResolver +import com.esotericsoftware.kryo.kryo5.Registration +import com.esotericsoftware.kryo.kryo5.util.DefaultClassResolver import java.util.Collections diff --git a/core/src/test/scala-2.12/io/altoo/serialization/kryo/scala/serializer/ScalaVersionRegistry.scala b/core/src/test/scala-2.12/io/altoo/serialization/kryo/scala/serializer/ScalaVersionRegistry.scala index a1a5b47..5d442e9 100644 --- a/core/src/test/scala-2.12/io/altoo/serialization/kryo/scala/serializer/ScalaVersionRegistry.scala +++ b/core/src/test/scala-2.12/io/altoo/serialization/kryo/scala/serializer/ScalaVersionRegistry.scala @@ -1,6 +1,6 @@ package io.altoo.serialization.kryo.scala.serializer -import com.esotericsoftware.kryo.Kryo +import com.esotericsoftware.kryo.kryo5.Kryo object ScalaVersionRegistry { final val immutableHashMapImpl = "scala.collection.immutable.HashMap$HashTrieMap" diff --git a/core/src/test/scala-2.13/io/altoo/serialization/kryo/scala/serializer/ScalaVersionRegistry.scala b/core/src/test/scala-2.13/io/altoo/serialization/kryo/scala/serializer/ScalaVersionRegistry.scala index 62df224..f6765a8 100644 --- a/core/src/test/scala-2.13/io/altoo/serialization/kryo/scala/serializer/ScalaVersionRegistry.scala +++ b/core/src/test/scala-2.13/io/altoo/serialization/kryo/scala/serializer/ScalaVersionRegistry.scala @@ -1,6 +1,6 @@ package io.altoo.serialization.kryo.scala.serializer -import com.esotericsoftware.kryo.Kryo +import com.esotericsoftware.kryo.kryo5.Kryo object ScalaVersionRegistry { final val immutableHashMapImpl = "scala.collection.immutable.HashMap" diff --git a/core/src/test/scala-3/io/altoo/serialization/kryo/scala/serializer/ScalaEnumSerializationTest.scala b/core/src/test/scala-3/io/altoo/serialization/kryo/scala/serializer/ScalaEnumSerializationTest.scala index f1fe90f..4bd94b2 100644 --- a/core/src/test/scala-3/io/altoo/serialization/kryo/scala/serializer/ScalaEnumSerializationTest.scala +++ b/core/src/test/scala-3/io/altoo/serialization/kryo/scala/serializer/ScalaEnumSerializationTest.scala @@ -1,6 +1,6 @@ package io.altoo.serialization.kryo.scala.serializer -import com.esotericsoftware.kryo.util.{DefaultClassResolver, ListReferenceResolver} +import com.esotericsoftware.kryo.kryo5.util.{DefaultClassResolver, ListReferenceResolver} import io.altoo.serialization.kryo.scala.testkit.KryoSerializationTesting import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers diff --git a/core/src/test/scala-3/io/altoo/serialization/kryo/scala/serializer/ScalaVersionRegistry.scala b/core/src/test/scala-3/io/altoo/serialization/kryo/scala/serializer/ScalaVersionRegistry.scala index 62df224..f6765a8 100644 --- a/core/src/test/scala-3/io/altoo/serialization/kryo/scala/serializer/ScalaVersionRegistry.scala +++ b/core/src/test/scala-3/io/altoo/serialization/kryo/scala/serializer/ScalaVersionRegistry.scala @@ -1,6 +1,6 @@ package io.altoo.serialization.kryo.scala.serializer -import com.esotericsoftware.kryo.Kryo +import com.esotericsoftware.kryo.kryo5.Kryo object ScalaVersionRegistry { final val immutableHashMapImpl = "scala.collection.immutable.HashMap" diff --git a/core/src/test/scala/io/altoo/serialization/kryo/scala/CompressionEffectivenessSerializationTest.scala b/core/src/test/scala/io/altoo/serialization/kryo/scala/CompressionEffectivenessSerializationTest.scala index 1345a9d..8adae9c 100644 --- a/core/src/test/scala/io/altoo/serialization/kryo/scala/CompressionEffectivenessSerializationTest.scala +++ b/core/src/test/scala/io/altoo/serialization/kryo/scala/CompressionEffectivenessSerializationTest.scala @@ -16,7 +16,7 @@ limitations under the License. package io.altoo.serialization.kryo.scala -import com.esotericsoftware.minlog.Log +import com.esotericsoftware.kryo.kryo5.minlog.Log import com.typesafe.config.ConfigFactory import org.scalatest.concurrent.ScalaFutures import org.scalatest.flatspec.AnyFlatSpec diff --git a/core/src/test/scala/io/altoo/serialization/kryo/scala/serializer/EnumerationSerializerTest.scala b/core/src/test/scala/io/altoo/serialization/kryo/scala/serializer/EnumerationSerializerTest.scala index 40310c3..870cb59 100644 --- a/core/src/test/scala/io/altoo/serialization/kryo/scala/serializer/EnumerationSerializerTest.scala +++ b/core/src/test/scala/io/altoo/serialization/kryo/scala/serializer/EnumerationSerializerTest.scala @@ -1,8 +1,8 @@ package io.altoo.serialization.kryo.scala.serializer -import com.esotericsoftware.kryo.Kryo -import com.esotericsoftware.kryo.io.{Input, Output} +import com.esotericsoftware.kryo.kryo5.Kryo +import com.esotericsoftware.kryo.kryo5.io.{Input, Output} import org.scalatest.flatspec.AnyFlatSpec import scala.language.implicitConversions diff --git a/core/src/test/scala/io/altoo/serialization/kryo/scala/serializer/MapSerializerTest.scala b/core/src/test/scala/io/altoo/serialization/kryo/scala/serializer/MapSerializerTest.scala index a140358..02232a7 100644 --- a/core/src/test/scala/io/altoo/serialization/kryo/scala/serializer/MapSerializerTest.scala +++ b/core/src/test/scala/io/altoo/serialization/kryo/scala/serializer/MapSerializerTest.scala @@ -1,8 +1,8 @@ package io.altoo.serialization.kryo.scala.serializer -import com.esotericsoftware.kryo.io.{Input, Output} -import com.esotericsoftware.kryo.serializers.MapSerializer -import com.esotericsoftware.kryo.{Kryo, Serializer} +import com.esotericsoftware.kryo.kryo5.io.{Input, Output} +import com.esotericsoftware.kryo.kryo5.serializers.MapSerializer +import com.esotericsoftware.kryo.kryo5.{Kryo, Serializer} import io.altoo.serialization.kryo.scala.testkit.AbstractKryoTest import java.util diff --git a/core/src/test/scala/io/altoo/serialization/kryo/scala/serializer/ScalaKryoTest.scala b/core/src/test/scala/io/altoo/serialization/kryo/scala/serializer/ScalaKryoTest.scala index 601ff04..96586d8 100644 --- a/core/src/test/scala/io/altoo/serialization/kryo/scala/serializer/ScalaKryoTest.scala +++ b/core/src/test/scala/io/altoo/serialization/kryo/scala/serializer/ScalaKryoTest.scala @@ -1,6 +1,6 @@ package io.altoo.serialization.kryo.scala.serializer -import com.esotericsoftware.kryo.util.{DefaultClassResolver, ListReferenceResolver} +import com.esotericsoftware.kryo.kryo5.util.{DefaultClassResolver, ListReferenceResolver} import io.altoo.serialization.kryo.scala.testkit.KryoSerializationTesting import org.scalatest.flatspec.AnyFlatSpec diff --git a/core/src/test/scala/io/altoo/serialization/kryo/scala/testkit/AbstractKryoTest.scala b/core/src/test/scala/io/altoo/serialization/kryo/scala/testkit/AbstractKryoTest.scala index 177b42d..f60fb04 100644 --- a/core/src/test/scala/io/altoo/serialization/kryo/scala/testkit/AbstractKryoTest.scala +++ b/core/src/test/scala/io/altoo/serialization/kryo/scala/testkit/AbstractKryoTest.scala @@ -1,10 +1,10 @@ package io.altoo.serialization.kryo.scala.testkit -import com.esotericsoftware.kryo.Kryo -import com.esotericsoftware.kryo.io.{Input, Output} -import com.esotericsoftware.kryo.util.MapReferenceResolver +import com.esotericsoftware.kryo.kryo5.Kryo +import com.esotericsoftware.kryo.kryo5.io.{Input, Output} +import com.esotericsoftware.kryo.kryo5.objenesis.strategy.StdInstantiatorStrategy +import com.esotericsoftware.kryo.kryo5.util.MapReferenceResolver import io.altoo.serialization.kryo.scala.serializer.SubclassResolver -import org.objenesis.strategy.StdInstantiatorStrategy import org.scalatest.Outcome import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers