Merge branch 'main' into update/iglu-scala-client-1.5.0

opensnowcat · Feb 22, 2024 · 9a719eb · 9a719eb
2 parents ffe732c + 3a93380
commit 9a719eb
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 65 deletions.
diff --git a/project/BuildSettings.scala b/project/BuildSettings.scala
@@ -36,17 +36,19 @@ object BuildSettings {
 
   lazy val buildInfoSettings = Seq(
     buildInfoKeys := Seq[BuildInfoKey](
-      organization, name, version,
-      BuildInfoKey.constant("SwaggerUI", Dependencies.V.SwaggerUi)    // Necessary for StaticService
+      organization,
+      name,
+      version,
+      BuildInfoKey.constant("SwaggerUI", Dependencies.V.SwaggerUi) // Necessary for StaticService
     ),
     buildInfoPackage := "com.snowplowanalytics.iglu.server.generated"
   )
 
   lazy val assemblySettings = Seq(
     assembly / assemblyJarName := { s"${name.value}-${version.value}.jar" },
     assembly / assemblyMergeStrategy := {
-      case x if x.endsWith("module-info.class") => MergeStrategy.first
-      case x if x.endsWith("nowarn.class") => MergeStrategy.first
+      case x if x.endsWith("module-info.class")                    => MergeStrategy.first
+      case x if x.endsWith("nowarn.class")                         => MergeStrategy.first
       case PathList("scala", "jdk", "CollectionConverters$.class") => MergeStrategy.first
       case x =>
         val oldStrategy = (assembly / assemblyMergeStrategy).value
@@ -56,7 +58,7 @@ object BuildSettings {
 
   lazy val dynVerSettings = Seq(
     ThisBuild / dynverVTagPrefix := false, // Otherwise git tags required to have v-prefix
-    ThisBuild / dynverSeparator := "-" // to be compatible with docker
+    ThisBuild / dynverSeparator := "-"     // to be compatible with docker
   )
 
   lazy val testsSettings = Seq(
@@ -66,54 +68,55 @@ object BuildSettings {
 
   lazy val compilerSettings = Seq(
     javacOptions := Seq("-source", "11", "-target", "11"),
-    addCompilerPlugin("org.spire-math" %% "kind-projector" % "0.9.9"),
+    addCompilerPlugin("org.spire-math" %% "kind-projector" % "0.9.10"),
     Compile / console / scalacOptions --= Seq("-Ywarn-unused:imports", "-Xfatal-warnings"),
     scalacOptions ++= Seq(
-      "-deprecation",                      // Emit warning and location for usages of deprecated APIs.
-      "-encoding", "utf-8",                // Specify character encoding used by source files.
-      "-explaintypes",                     // Explain type errors in more detail.
-      "-feature",                          // Emit warning and location for usages of features that should be imported explicitly.
-      "-language:existentials",            // Existential types (besides wildcard types) can be written and inferred
-      "-language:experimental.macros",     // Allow macro definition (besides implementation and application)
-      "-language:higherKinds",             // Allow higher-kinded types
-      "-language:implicitConversions",     // Allow definition of implicit functions called views
-      "-unchecked",                        // Enable additional warnings where generated code depends on assumptions.
-      "-Xcheckinit",                       // Wrap field accessors to throw an exception on uninitialized access.
-      "-Xfatal-warnings",                  // Fail the compilation if there are any warnings.
-      "-Xfuture",                          // Turn on future language features.
-      "-Xlint:adapted-args",               // Warn if an argument list is modified to match the receiver.
-      "-Xlint:by-name-right-associative",  // By-name parameter of right associative operator.
-      "-Xlint:constant",                   // Evaluation of a constant arithmetic expression results in an error.
-      "-Xlint:delayedinit-select",         // Selecting member of DelayedInit.
-      "-Xlint:doc-detached",               // A Scaladoc comment appears to be detached from its element.
-      "-Xlint:inaccessible",               // Warn about inaccessible types in method signatures.
-      "-Xlint:infer-any",                  // Warn when a type argument is inferred to be `Any`.
-      "-Xlint:missing-interpolator",       // A string literal appears to be missing an interpolator id.
-      "-Xlint:nullary-override",           // Warn when non-nullary `def f()' overrides nullary `def f'.
-      "-Xlint:nullary-unit",               // Warn when nullary methods return Unit.
-      "-Xlint:option-implicit",            // Option.apply used implicit view.
-      "-Xlint:package-object-classes",     // Class or object defined in package object.
-      "-Xlint:poly-implicit-overload",     // Parameterized overloaded implicit methods are not visible as view bounds.
-      "-Xlint:private-shadow",             // A private field (or class parameter) shadows a superclass field.
-      "-Xlint:stars-align",                // Pattern sequence wildcard must align with sequence component.
-      "-Xlint:type-parameter-shadow",      // A local type parameter shadows a type already in scope.
-      "-Xlint:unsound-match",              // Pattern match may not be typesafe.
-      "-Yno-adapted-args",                 // Do not adapt an argument list (either by inserting () or creating a tuple) to match the receiver.
-      "-Ypartial-unification",             // Enable partial unification in type constructor inference
-      "-Ywarn-dead-code",                  // Warn when dead code is identified.
-      "-Ywarn-extra-implicit",             // Warn when more than one implicit parameter section is defined.
-      "-Ywarn-inaccessible",               // Warn about inaccessible types in method signatures.
-      "-Ywarn-infer-any",                  // Warn when a type argument is inferred to be `Any`.
-      "-Ywarn-nullary-override",           // Warn when non-nullary `def f()' overrides nullary `def f'.
-      "-Ywarn-nullary-unit",               // Warn when nullary methods return Unit.
-      "-Ywarn-numeric-widen",              // Warn when numerics are widened.
-      "-Ywarn-unused:implicits",           // Warn if an implicit parameter is unused.
-      "-Ywarn-unused:imports",             // Warn if an import selector is not referenced.
-      "-Ywarn-unused:locals",              // Warn if a local definition is unused.
-      "-Ywarn-unused:params",              // Warn if a value parameter is unused.
-      "-Ywarn-unused:patvars",             // Warn if a variable bound in a pattern is unused.
-      "-Ywarn-unused:privates",            // Warn if a private member is unused.
-      "-Ywarn-value-discard"               // Warn when non-Unit expression results are unused.
+      "-deprecation", // Emit warning and location for usages of deprecated APIs.
+      "-encoding",
+      "utf-8",                            // Specify character encoding used by source files.
+      "-explaintypes",                    // Explain type errors in more detail.
+      "-feature",                         // Emit warning and location for usages of features that should be imported explicitly.
+      "-language:existentials",           // Existential types (besides wildcard types) can be written and inferred
+      "-language:experimental.macros",    // Allow macro definition (besides implementation and application)
+      "-language:higherKinds",            // Allow higher-kinded types
+      "-language:implicitConversions",    // Allow definition of implicit functions called views
+      "-unchecked",                       // Enable additional warnings where generated code depends on assumptions.
+      "-Xcheckinit",                      // Wrap field accessors to throw an exception on uninitialized access.
+      "-Xfatal-warnings",                 // Fail the compilation if there are any warnings.
+      "-Xfuture",                         // Turn on future language features.
+      "-Xlint:adapted-args",              // Warn if an argument list is modified to match the receiver.
+      "-Xlint:by-name-right-associative", // By-name parameter of right associative operator.
+      "-Xlint:constant",                  // Evaluation of a constant arithmetic expression results in an error.
+      "-Xlint:delayedinit-select",        // Selecting member of DelayedInit.
+      "-Xlint:doc-detached",              // A Scaladoc comment appears to be detached from its element.
+      "-Xlint:inaccessible",              // Warn about inaccessible types in method signatures.
+      "-Xlint:infer-any",                 // Warn when a type argument is inferred to be `Any`.
+      "-Xlint:missing-interpolator",      // A string literal appears to be missing an interpolator id.
+      "-Xlint:nullary-override",          // Warn when non-nullary `def f()' overrides nullary `def f'.
+      "-Xlint:nullary-unit",              // Warn when nullary methods return Unit.
+      "-Xlint:option-implicit",           // Option.apply used implicit view.
+      "-Xlint:package-object-classes",    // Class or object defined in package object.
+      "-Xlint:poly-implicit-overload",    // Parameterized overloaded implicit methods are not visible as view bounds.
+      "-Xlint:private-shadow",            // A private field (or class parameter) shadows a superclass field.
+      "-Xlint:stars-align",               // Pattern sequence wildcard must align with sequence component.
+      "-Xlint:type-parameter-shadow",     // A local type parameter shadows a type already in scope.
+      "-Xlint:unsound-match",             // Pattern match may not be typesafe.
+      "-Yno-adapted-args",                // Do not adapt an argument list (either by inserting () or creating a tuple) to match the receiver.
+      "-Ypartial-unification",            // Enable partial unification in type constructor inference
+      "-Ywarn-dead-code",                 // Warn when dead code is identified.
+      "-Ywarn-extra-implicit",            // Warn when more than one implicit parameter section is defined.
+      "-Ywarn-inaccessible",              // Warn about inaccessible types in method signatures.
+      "-Ywarn-infer-any",                 // Warn when a type argument is inferred to be `Any`.
+      "-Ywarn-nullary-override",          // Warn when non-nullary `def f()' overrides nullary `def f'.
+      "-Ywarn-nullary-unit",              // Warn when nullary methods return Unit.
+      "-Ywarn-numeric-widen",             // Warn when numerics are widened.
+      "-Ywarn-unused:implicits",          // Warn if an implicit parameter is unused.
+      "-Ywarn-unused:imports",            // Warn if an import selector is not referenced.
+      "-Ywarn-unused:locals",             // Warn if a local definition is unused.
+      "-Ywarn-unused:params",             // Warn if a value parameter is unused.
+      "-Ywarn-unused:patvars",            // Warn if a variable bound in a pattern is unused.
+      "-Ywarn-unused:privates",           // Warn if a private member is unused.
+      "-Ywarn-value-discard"              // Warn when non-Unit expression results are unused.
     )
   )
 }
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -18,24 +18,26 @@ object Dependencies {
 
   object V {
     val IgluCore   = "1.1.2"
-    val SchemaDdl  = "0.18.0"
+    val SchemaDdl  = "0.18.2"
     val IgluClient = "1.5.0"
+    val SchemaDdl  = "0.18.2"
+    val IgluClient = "1.1.1"
 
     val Http4s     = "0.21.34"
     val Rho        = "0.21.0"
     val Doobie     = "0.13.4"
     val Decline    = "1.4.0"
-    val Log4Cats   = "1.3.0"
-    val Circe      = "0.14.3"
+    val Log4Cats   = "1.3.1"
+    val Circe      = "0.14.6"
     val CirceFs2   = "0.13.0"
-    val Refined    = "0.9.24"
+    val Refined    = "0.9.29"
     val PureConfig = "0.15.0"
-    val SwaggerUi  = "4.15.5"
-    val Slf4j      = "1.7.36"
+    val SwaggerUi  = "4.19.1"
+    val Slf4j      = "2.0.12"
     val ScalaCache = "0.28.0"
-    val Postgresql = "42.5.1"
+    val Postgresql = "42.5.4"
     val Jackson    = "2.14.1"
-    val Snakeyaml  = "2.0"
+    val Snakeyaml  = "2.2"
     val Guava      = "32.0.0-jre"
 
     val Specs2  = "4.5.1"

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.5.4
+sbt.version=1.5.8
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,8 +1,8 @@
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.9")
-addSbtPlugin("io.spray" % "sbt-revolver" % "0.9.1")
+addSbtPlugin("io.spray"     % "sbt-revolver" % "0.10.0")
 // Figure out how to setup new permissions https://github.com/sbt/sbt-native-packager/pull/1190
-addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.7.3")
-addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0")
-addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
+addSbtPlugin("com.typesafe.sbt"      % "sbt-native-packager"  % "1.7.6")
+addSbtPlugin("com.eed3si9n"          % "sbt-buildinfo"        % "0.9.0")
+addSbtPlugin("com.github.sbt"        % "sbt-dynver"           % "5.0.1")
+addSbtPlugin("org.scalameta"         % "sbt-scalafmt"         % "2.4.2")
 addSbtPlugin("com.snowplowanalytics" % "sbt-snowplow-release" % "0.3.1")