Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Non-AWS dependency updates #44

Merged
merged 7 commits into from
Jul 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -17,14 +17,15 @@ 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",
"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,
"com.fasterxml.jackson.core" % "jackson-databind" % "2.14.3",
"com.fasterxml.jackson.core" % "jackson-databind" % "2.15.2",
)

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
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.5.8
sbt.version=1.9.1
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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")