update dependencies

Author: rmgk

Modules/Examples/Misc JVM/src/main/scala/ex2021encfixtodo/sync/DataManagerConnectionManager.scala

@@ -4,7 +4,7 @@ import channels.NioTCP
 import com.github.plokhotnyuk.jsoniter_scala.core.JsonValueCodec
 import com.github.plokhotnyuk.jsoniter_scala.macros.JsonCodecMaker
 import com.google.crypto.tink.aead.AeadConfig
-import com.google.crypto.tink.{Aead, CleartextKeysetHandle, JsonKeysetReader, JsonKeysetWriter, KeyTemplates, KeysetHandle, LegacyKeysetSerialization}
+import com.google.crypto.tink.{Aead, CleartextKeysetHandle, JsonKeysetReader, JsonKeysetWriter, KeyTemplates, KeysetHandle, LegacyKeysetSerialization, RegistryConfiguration}
 import rdts.base.{Bottom, Lattice, LocalUid}
 import rdts.dotted.{Dotted, HasDots, Obrem}
 import replication.DeltaDissemination
@@ -40,7 +40,7 @@ class DataManagerConnectionManager[State: {JsonValueCodec, Lattice, Bottom, HasD
 
   private val keyset =
     CleartextKeysetHandle.read(JsonKeysetReader.withInputStream(Files.newInputStream(keysetFilePath)))
-  private val aead: Aead = keyset.getPrimitive(classOf[Aead])
+  private val aead: Aead = keyset.getPrimitive(RegistryConfiguration.get(), classOf[Aead])
 
   println(LegacyKeysetSerialization.getKeysetInfo(keyset))
 

Modules/Microbenchmarks/src/main/scala/benchmarks/encrdt/Helper.scala

@@ -1,7 +1,7 @@
 package benchmarks.encrdt
 
 import com.google.crypto.tink.aead.AeadConfig
-import com.google.crypto.tink.{Aead, KeyTemplates, KeysetHandle}
+import com.google.crypto.tink.{Aead, KeyTemplates, KeysetHandle, RegistryConfiguration}
 import org.conscrypt.Conscrypt
 
 import java.security.Security
@@ -24,6 +24,6 @@ object Helper {
       System.err.println("Conscrypt could not be loaded, continuing anyway")
     AeadConfig.register()
     val keyset: KeysetHandle = KeysetHandle.generateNew(KeyTemplates.get(keyTemplateString))
-    keyset.getPrimitive(classOf[Aead])
+    keyset.getPrimitive(RegistryConfiguration.get, classOf[Aead])
   }
 }

project/Dependencies.scala

@@ -18,7 +18,7 @@ object Dependencies {
   val scalaXml    = libraryDependencies += "org.scala-lang.modules" %% "scala-xml"              % "2.3.0"
   val slf4jSimple = libraryDependencies += "org.slf4j"               % "slf4j-simple"           % "2.0.17" % Test
   val sttpCore = libraryDependencies += "com.softwaremill.sttp.client4" %%% "core" % "4.0.0-RC1"
-  val tink     = libraryDependencies += "com.google.crypto.tink"          % "tink" % "1.15.0"
+  val tink     = libraryDependencies += "com.google.crypto.tink"          % "tink" % "1.17.0"
 
   val bouncyCastle = libraryDependencies ++=
     List(
@@ -30,8 +30,8 @@ object Dependencies {
     )
 
   def borer = libraryDependencies ++= Seq(
-    "io.bullet" %%% "borer-core"       % "1.15.0",
-    "io.bullet" %%% "borer-derivation" % "1.15.0"
+    "io.bullet" %%% "borer-core"       % "1.16.0",
+    "io.bullet" %%% "borer-derivation" % "1.16.0"
   )
 
   def jetty = {

project/Settings.scala

@@ -128,7 +128,8 @@ object Settings {
   }
 
   val resolverJitpack = resolvers += "jitpack" at "https://jitpack.io"
-  val resolverS01     = resolvers += "sonatype staging" at "https://s01.oss.sonatype.org/content/groups/staging/"
+  val resolverS01     = resolvers += "sonatype staging S01" at "https://s01.oss.sonatype.org/content/groups/staging/"
+  val resolverOss     = resolvers += "sonatype staging OSS" at "https://oss.sonatype.org/content/groups/staging/"
 
   // this is a tool to analyse memory consumption/layout
   val jolSettings = Seq(