diff --git a/scala/Dockerfile b/scala/Dockerfile index 0fb35924c29..c1b6b01c045 100644 --- a/scala/Dockerfile +++ b/scala/Dockerfile @@ -1,4 +1,10 @@ -FROM hseeberger/scala-sbt:11.0.13_1.6.1_2.13.8 AS build +{{#provider.default.image-version}} + FROM sbtscala/scala-sbt:eclipse-temurin-jammy-11.0.17_8_1.8.2_{{#provider.default.image-version}}{{{.}}}{{/provider.default.image-version}} AS build +{{/provider.default.image-version}} +{{^provider.default.image-version}} + FROM sbtscala/scala-sbt:eclipse-temurin-jammy-11.0.17_8_1.8.2_3.2.2 AS build +{{/provider.default.image-version}} + WORKDIR /usr/src/app @@ -6,7 +12,7 @@ COPY . ./ RUN sbt universal:packageZipTarball -FROM openjdk:11.0.16-jre +FROM eclipse-temurin:11-jre-jammy WORKDIR /usr/src/app diff --git a/scala/akkahttp/build.sbt b/scala/akkahttp/build.sbt index 74df4bb35ba..5e076d08873 100644 --- a/scala/akkahttp/build.sbt +++ b/scala/akkahttp/build.sbt @@ -1,5 +1,5 @@ name := "server" -scalaVersion := "2.13.10" +scalaVersion := "3.2.2" libraryDependencies ++= Seq( "com.typesafe.akka" %% "akka-http" % "[10.5,10.6)", diff --git a/scala/finatra/config.yaml b/scala/finatra/config.yaml index c08102b077e..30b05400a21 100644 --- a/scala/finatra/config.yaml +++ b/scala/finatra/config.yaml @@ -1,3 +1,9 @@ +provider: + default: + language: 2.13 + + image-version: 2.13.10 + framework: website: twitter.github.io/finatra/ version: 22.12 diff --git a/scala/finch/build.sbt b/scala/finch/build.sbt index 58cb6b98054..76b9d79e646 100644 --- a/scala/finch/build.sbt +++ b/scala/finch/build.sbt @@ -8,4 +8,4 @@ lazy val root = (project in file(".")) libraryDependencies ++= Seq( "com.github.finagle" %% "finch-core" % FinagleVersionRange ) - ).enablePlugins(JavaAppPackaging) \ No newline at end of file + ).enablePlugins(JavaAppPackaging) diff --git a/scala/finch/config.yaml b/scala/finch/config.yaml index df226804366..35b749b4eaf 100644 --- a/scala/finch/config.yaml +++ b/scala/finch/config.yaml @@ -1,3 +1,9 @@ +provider: + default: + language: 2.13 + + image-version: 2.13.10 + framework: website: finagle.github.io/finch/ version: 0.34 diff --git a/scala/http4s/build.sbt b/scala/http4s/build.sbt index fda923637df..a6699d19d01 100644 --- a/scala/http4s/build.sbt +++ b/scala/http4s/build.sbt @@ -1,7 +1,7 @@ val Http4sVersionRange = "[0.23,0.24)" name := "server" -scalaVersion := "2.13.10" +scalaVersion := "3.2.2" lazy val root = (project in file(".")) .settings( diff --git a/scala/play/config.yaml b/scala/play/config.yaml index c640e88ffa7..e23e34574be 100644 --- a/scala/play/config.yaml +++ b/scala/play/config.yaml @@ -1,3 +1,9 @@ +provider: + default: + language: 2.13 + + image-version: 2.13.10 + framework: website: playframework.com version: 2.8