From d59e4bc3cb1a7d7e3be72ba8f86199cb4cd51d4c Mon Sep 17 00:00:00 2001 From: "gu-scala-steward-public-repos[bot]" <108136057+gu-scala-steward-public-repos[bot]@users.noreply.github.com> Date: Wed, 5 Jul 2023 17:57:14 +0000 Subject: [PATCH 1/7] Update sbt-assembly to 0.15.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index b4cb7fc..ed95ffb 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,3 @@ -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10") +addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.15.0") addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.3") From 30548736d0c6b96fd4bd09208e1c670757f31a3d Mon Sep 17 00:00:00 2001 From: "gu-scala-steward-public-repos[bot]" <108136057+gu-scala-steward-public-repos[bot]@users.noreply.github.com> Date: Wed, 5 Jul 2023 17:57:16 +0000 Subject: [PATCH 2/7] Update jackson-databind to 2.15.2 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 9cc00f7..fa21348 100644 --- a/build.sbt +++ b/build.sbt @@ -21,7 +21,7 @@ libraryDependencies ++= Seq( "com.squareup.okhttp3" % "okhttp" % "3.14.9", "com.amazonaws" % "aws-java-sdk-cloudwatch" % awsSdkVersion, "com.amazonaws" % "aws-java-sdk-ec2" % awsSdkVersion, - "com.fasterxml.jackson.core" % "jackson-databind" % "2.14.3", + "com.fasterxml.jackson.core" % "jackson-databind" % "2.15.2", ) assembly / assemblyMergeStrategy := { From ce05b87a9d01e3e59183938d03b9c0cda2d65b55 Mon Sep 17 00:00:00 2001 From: "gu-scala-steward-public-repos[bot]" <108136057+gu-scala-steward-public-repos[bot]@users.noreply.github.com> Date: Wed, 5 Jul 2023 17:57:17 +0000 Subject: [PATCH 3/7] Update okhttp to 4.11.0 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index fa21348..4edbbd0 100644 --- a/build.sbt +++ b/build.sbt @@ -18,7 +18,7 @@ scalacOptions ++= Seq( libraryDependencies ++= Seq( "com.amazonaws" % "aws-lambda-java-core" % "1.2.2", "org.slf4j" % "slf4j-simple" % "1.7.36", - "com.squareup.okhttp3" % "okhttp" % "3.14.9", + "com.squareup.okhttp3" % "okhttp" % "4.11.0", "com.amazonaws" % "aws-java-sdk-cloudwatch" % awsSdkVersion, "com.amazonaws" % "aws-java-sdk-ec2" % awsSdkVersion, "com.fasterxml.jackson.core" % "jackson-databind" % "2.15.2", From 9131bf10f06304c0460bdfd2a976778fa3d360b7 Mon Sep 17 00:00:00 2001 From: "gu-scala-steward-public-repos[bot]" <108136057+gu-scala-steward-public-repos[bot]@users.noreply.github.com> Date: Wed, 5 Jul 2023 17:57:17 +0000 Subject: [PATCH 4/7] Update scala3-library to 3.3.0 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 4edbbd0..ef3c49b 100644 --- a/build.sbt +++ b/build.sbt @@ -6,7 +6,7 @@ description:= "Monitors your elastic search cluster and reports metrics to cloud version := "1.0" -scalaVersion := "3.1.3" +scalaVersion := "3.3.0" val awsSdkVersion = "1.12.501" From d30aeffb60323d7063a603e2af0d1cab8735d5fb Mon Sep 17 00:00:00 2001 From: "gu-scala-steward-public-repos[bot]" <108136057+gu-scala-steward-public-repos[bot]@users.noreply.github.com> Date: Wed, 5 Jul 2023 17:57:18 +0000 Subject: [PATCH 5/7] Update sbt to 1.9.1 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index e64c208..3c0b78a 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.5.8 +sbt.version=1.9.1 From d0c72f55d5e8eab82fa4695503eab70ebc760abe Mon Sep 17 00:00:00 2001 From: "gu-scala-steward-public-repos[bot]" <108136057+gu-scala-steward-public-repos[bot]@users.noreply.github.com> Date: Wed, 5 Jul 2023 17:57:18 +0000 Subject: [PATCH 6/7] Update slf4j-simple to 2.0.7 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index ef3c49b..51782c9 100644 --- a/build.sbt +++ b/build.sbt @@ -17,7 +17,7 @@ scalacOptions ++= Seq( libraryDependencies ++= Seq( "com.amazonaws" % "aws-lambda-java-core" % "1.2.2", - "org.slf4j" % "slf4j-simple" % "1.7.36", + "org.slf4j" % "slf4j-simple" % "2.0.7", "com.squareup.okhttp3" % "okhttp" % "4.11.0", "com.amazonaws" % "aws-java-sdk-cloudwatch" % awsSdkVersion, "com.amazonaws" % "aws-java-sdk-ec2" % awsSdkVersion, From 3ac026c636bb2ccc0490753ba79b1519eb295749 Mon Sep 17 00:00:00 2001 From: akash1810 Date: Wed, 19 Jul 2023 09:18:01 +0100 Subject: [PATCH 7/7] Tweak merge strategy This resolves the following `assembly` error: ``` [error] 1 error was encountered during merge [error] java.lang.RuntimeException: deduplicate: different file contents found in the following: [error] /home/runner/.cache/coursier/v1/https/repo1.maven.org/maven2/com/squareup/okio/okio-jvm/3.2.0/okio-jvm-3.2.0.jar:META-INF/okio.kotlin_module [error] /home/runner/.cache/coursier/v1/https/repo1.maven.org/maven2/com/squareup/okio/okio/3.2.0/okio-3.2.0.jar:META-INF/okio.kotlin_module [error] at sbtassembly.Assembly$.applyStrategies(Assembly.scala:161) [error] at sbtassembly.Assembly$.x$1$lzycompute$1(Assembly.scala:43) [error] at sbtassembly.Assembly$.x$1$1(Assembly.scala:41) [error] at sbtassembly.Assembly$.stratMapping$lzycompute$1(Assembly.scala:41) [error] at sbtassembly.Assembly$.stratMapping$1(Assembly.scala:41) [error] at sbtassembly.Assembly$.inputs$lzycompute$1(Assembly.scala:86) [error] at sbtassembly.Assembly$.inputs$1(Assembly.scala:76) [error] at sbtassembly.Assembly$.apply(Assembly.scala:103) [error] at sbtassembly.Assembly$.$anonfun$assemblyTask$1(Assembly.scala:278) [error] at scala.Function1.$anonfun$compose$1(Function1.scala:49) [error] at sbt.internal.util.$tilde$greater.$anonfun$$u2219$1(TypeFunctions.scala:63) [error] at sbt.std.Transform$$anon$4.work(Transform.scala:69) [error] at sbt.Execute.$anonfun$submit$2(Execute.scala:283) [error] at sbt.internal.util.ErrorHandling$.wideConvert(ErrorHandling.scala:24) [error] at sbt.Execute.work(Execute.scala:292) [error] at sbt.Execute.$anonfun$submit$1(Execute.scala:283) [error] at sbt.ConcurrentRestrictions$$anon$4.$anonfun$submitValid$1(ConcurrentRestrictions.scala:265) [error] at sbt.CompletionService$$anon$2.call(CompletionService.scala:65) [error] at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264) [error] at java.base/java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:515) [error] at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264) [error] at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128) [error] at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628) [error] at java.base/java.lang.Thread.run(Thread.java:829) [error] (assembly) deduplicate: different file contents found in the following: [error] /home/runner/.cache/coursier/v1/https/repo1.maven.org/maven2/com/squareup/okio/okio-jvm/3.2.0/okio-jvm-3.2.0.jar:META-INF/okio.kotlin_module [error] /home/runner/.cache/coursier/v1/https/repo1.maven.org/maven2/com/squareup/okio/okio/3.2.0/okio-3.2.0.jar:META-INF/okio.kotlin_module [error] Total time: 2 s, completed Jul 5, 2023, 5:59:37 PM ``` --- build.sbt | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sbt b/build.sbt index 51782c9..ae5cb87 100644 --- a/build.sbt +++ b/build.sbt @@ -25,6 +25,7 @@ libraryDependencies ++= Seq( ) assembly / assemblyMergeStrategy := { + case PathList("META-INF", _*) => MergeStrategy.discard case x if x.endsWith("module-info.class") => MergeStrategy.first case y => val oldStrategy = (assembly / assemblyMergeStrategy).value