Bump version of scala-libs to use buildElasticClientConfig (#2800)

* bump version of scala-libs to use buildElasticClientConfig * Apply auto-formatting rules --------- Co-authored-by: Github on behalf of Wellcome Collection <wellcomedigitalplatform@wellcome.ac.uk>
wellcomecollection · Jan 8, 2025 · b5505a9 · b5505a9
1 parent c3e21d0
commit b5505a9
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 104 deletions.
diff --git a/common/lambda/src/main/scala/weco/lambda/ElasticBuilder.scala b/common/lambda/src/main/scala/weco/lambda/ElasticBuilder.scala
diff --git a/...der/relation_embedder/src/main/scala/weco/pipeline/relation_embedder/BatchProcessor.scala b/...der/relation_embedder/src/main/scala/weco/pipeline/relation_embedder/BatchProcessor.scala
@@ -18,7 +18,8 @@ import weco.pipeline_storage.elastic.ElasticIndexer
 import scala.concurrent.{ExecutionContext, Future}
 import scala.util.{Failure, Success}
 import weco.catalogue.internal_model.Implicits._
-import weco.lambda.{Downstream, ElasticBuilder}
+import weco.elasticsearch.typesafe.ElasticBuilder
+import weco.lambda.Downstream
 import weco.pipeline.relation_embedder.lib.RelationEmbedderConfig
 
 class BatchProcessor(

diff --git a/..._embedder/src/main/scala/weco/pipeline/relation_embedder/lib/RelationEmbedderConfig.scala b/..._embedder/src/main/scala/weco/pipeline/relation_embedder/lib/RelationEmbedderConfig.scala
@@ -1,7 +1,8 @@
 package weco.pipeline.relation_embedder.lib
 
 import com.typesafe.config.Config
-import weco.lambda.ElasticBuilder.buildElasticClientConfig
+import weco.elasticsearch.typesafe.ElasticBuilder.buildElasticClientConfig
+import weco.elasticsearch.typesafe.ElasticConfig
 import weco.lambda._
 import weco.messaging.typesafe.SNSBuilder.buildSNSConfig
 

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -1,16 +1,17 @@
 import sbt._
 import scala.language.reflectiveCalls
 object WellcomeDependencies {
+  lazy val defaultVersion = "32.43.4"
   lazy val versions = new {
-    val typesafe = "32.43.2"
-    val fixtures = "32.43.2"
-    val http = "32.43.2"
-    val json = "32.43.2"
-    val messaging = "32.43.2"
-    val monitoring = "32.43.2"
-    val storage = "32.43.2"
-    val elasticsearch = "32.43.2"
-    val sierra = "32.43.2"
+    val typesafe = defaultVersion
+    val fixtures = defaultVersion
+    val http = defaultVersion
+    val json = defaultVersion
+    val messaging = defaultVersion
+    val monitoring = defaultVersion
+    val storage = defaultVersion
+    val elasticsearch = defaultVersion
+    val sierra = defaultVersion
   }
 
   val jsonLibrary: Seq[ModuleID] = Seq(