Skip to content

Commit

Permalink
update scala version (#170)
Browse files Browse the repository at this point in the history
* update scala version

* scapegoat disabled

* update new dependencies

* sbt update
  • Loading branch information
biandratti authored May 19, 2024
1 parent cdf48c2 commit ff4e58c
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 30 deletions.
3 changes: 2 additions & 1 deletion app5/src/main/scala/MainApp.scala
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ object MainApp extends ZIOAppDefault {

val globalOpenTelemetry = GlobalOpenTelemetry.get()

override val bootstrap = SLF4J.slf4j(LogLevel.All, LogFormat.colored)
override val bootstrap: ZLayer[ZIOAppArgs, Any, Any] =
SLF4J.slf4j(LogLevel.All, LogFormat.colored)

override def run: ZIO[Any, Throwable, Nothing] =
Server
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import zhttp.http._
import zio.test.*

object HealthCheckControllerSpec extends ZIOSpecDefault {
def spec =
def spec: Spec[Any, Option[Nothing]] =
suite("HealthCheckControllerSpec")(
test("ok status") {
HealthCheckController
Expand Down
6 changes: 2 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ import com.typesafe.sbt.packager.docker.{

Global / dependencyCheckFormats := Seq("HTML", "JSON")

lazy val scalaV = "2.13.11"
scalaVersion := scalaV
name := """agents"""
organization := "com.example"

Expand All @@ -15,9 +13,9 @@ lazy val dockerBaseImageName = "adoptopenjdk/openjdk11:jre-11.0.9_11.1-alpine"

lazy val commonSettings = Seq(
organization := "biandratti",
scalaVersion := scalaV,
scalaVersion := "2.13.14",
scalacOptions += "-Xsource:3",
ThisBuild / scapegoatVersion := "2.1.4",
// ThisBuild / scapegoatVersion := "2.1.4",
// wartremoverErrors ++= Warts.unsafe.diff(Seq(Wart.Any)),
// wartremoverExcluded ++= (Compile / routes).value,
coverageFailOnMinimum := true,
Expand Down
27 changes: 4 additions & 23 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ object Dependencies {
lazy val playDependencies: Seq[ModuleID] = {
Seq(
"com.softwaremill.macwire" %% "macros" % "2.5.9" % "provided",
"org.scalatestplus.play" %% "scalatestplus-play" % "6.0.1" % Test
"org.scalatestplus.play" %% "scalatestplus-play" % "7.0.1" % Test
)
}

Expand All @@ -15,7 +15,7 @@ object Dependencies {
"dev.zio" %% "zio-logging" % "2.0.0-RC10",
"dev.zio" %% "zio-logging-slf4j" % "2.0.0-RC10",
"ch.qos.logback" % "logback-classic" % "1.5.6",
"dev.zio" %% "zio-json" % "0.3.0-RC8",
"dev.zio" %% "zio-json" % "0.6.2",
"io.d11" %% "zhttp" % "2.0.0-RC9",
"dev.zio" %% "zio-test" % "2.0.10" % Test,
"dev.zio" %% "zio-test-sbt" % "2.0.10" % Test,
Expand All @@ -39,30 +39,11 @@ object Dependencies {
)
}

/*lazy val openTelemetryDependencies = {
val version = "1.24.0"
val alphaVersion = s"$version-alpha"
Seq(
"io.opentelemetry" % "opentelemetry-bom" % version pomOnly (),
"io.opentelemetry" % "opentelemetry-api" % version,
"io.opentelemetry" % "opentelemetry-sdk" % version,
"io.opentelemetry.instrumentation" % "opentelemetry-logback-appender-1.0" % alphaVersion % "runtime",
"io.opentelemetry" % "opentelemetry-exporter-jaeger" % version,
"io.opentelemetry" % "opentelemetry-sdk-extension-autoconfigure" % alphaVersion,
"io.opentelemetry" % "opentelemetry-exporter-prometheus" % alphaVersion,
// "io.opentelemetry" % "opentelemetry-exporter-zipkin" % version,
"io.opentelemetry" % "opentelemetry-exporter-jaeger" % version,
"io.opentelemetry" % "opentelemetry-exporter-otlp" % version,
"io.opentelemetry.javaagent" % "opentelemetry-javaagent" % version % "runtime"
)
}*/

lazy val openTelemetryDependencies = {
val version = "1.32.0"
val alphaVersion = s"$version-alpha"
val version = "1.38.0"
Seq(
"io.opentelemetry" % "opentelemetry-api" % version,
"io.opentelemetry.instrumentation" % "opentelemetry-logback-appender-1.0" % alphaVersion % "runtime"
"io.opentelemetry.instrumentation" % "opentelemetry-logback-appender-1.0" % "2.4.0-alpha" % "runtime"
)
}

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.9.9
sbt.version=1.10.0

0 comments on commit ff4e58c

Please sign in to comment.