Skip to content
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
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM hseeberger/scala-sbt:8u265_1.3.13_2.13.3
FROM sbtscala/scala-sbt:eclipse-temurin-21.0.6_7_1.10.11_2.13.16

WORKDIR /akka-http-slick-postgres

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ lazy val commonSettings =
Seq(
organization := "net.benchmark.akka.http",
organizationName := "Akka",
scalaVersion := "2.13.3",
scalaVersion := "2.13.16",
scalacOptions ++= Seq(
"-deprecation",
"-encoding",
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version = 1.3.13
sbt.version=1.10.11
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0")
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.3.16")
addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.15")
addSbtPlugin("org.wartremover" % "sbt-wartremover" % "2.4.10")
addSbtPlugin("org.wartremover" % "sbt-wartremover" % "3.3.2")
addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.3")

libraryDependencies += "org.slf4j" % "slf4j-nop" % "1.7.25" // Needed by sbt-git
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ object FortuneRoute {

class FortuneRoute(fr: FortuneRepository, sd: ExecutionContextExecutor)(implicit val system: ActorSystem) {

private implicit val fmar = FortuneRoute.fm
private implicit val fmar: ToEntityMarshaller[Seq[Fortune]] = FortuneRoute.fm

private def source(p: DatabasePublisher[Fortune]): Source[Fortune, NotUsed] = {
Source
Expand Down
4 changes: 2 additions & 2 deletions frameworks/Scala/akka-http/akka-http.dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM hseeberger/scala-sbt:8u265_1.3.13_2.13.3
FROM sbtscala/scala-sbt:eclipse-temurin-21.0.6_7_1.10.11_2.13.16

WORKDIR /akka-http

Expand All @@ -23,4 +23,4 @@ RUN sbt clean compile stage

EXPOSE 9000

CMD ["target/universal/stage/bin/akka-http-benchmark", "-Dakka.http.benchmark.mysql.dbhost=tfb-database", "-J-server", "-J-Xms2g", "-J-Xmx2g", "-J-XX:NewSize=1g", "-J-XX:MaxNewSize=1g", "-J-XX:InitialCodeCacheSize=256m", "-J-XX:ReservedCodeCacheSize=256m", "-J-XX:+UseParallelGC", "-J-XX:-UseBiasedLocking", "-J-XX:+AlwaysPreTouch", "-J-XX:+UseNUMA", "-J-XX:+AggressiveOpts"]
CMD ["target/universal/stage/bin/akka-http-benchmark", "-Dakka.http.benchmark.mysql.dbhost=tfb-database", "-J-server", "-J-Xms2g", "-J-Xmx2g", "-J-XX:NewSize=1g", "-J-XX:MaxNewSize=1g", "-J-XX:InitialCodeCacheSize=256m", "-J-XX:ReservedCodeCacheSize=256m", "-J-XX:+UseParallelGC", "-J-XX:+AlwaysPreTouch", "-J-XX:+UseNUMA"]
2 changes: 1 addition & 1 deletion frameworks/Scala/akka-http/akka-http/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ name := "akka-http-benchmark"

version := "0.1.0-SNAPSHOT"

scalaVersion := "2.13.8"
scalaVersion := "2.13.16"

val akkaV = "2.6.19"
val akkaHttpV = "10.2.9"
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.5.4
sbt.version=1.10.11
8 changes: 4 additions & 4 deletions frameworks/Scala/blaze/blaze.dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM openjdk:15
FROM sbtscala/scala-sbt:eclipse-temurin-21.0.6_7_1.10.11_2.13.16

WORKDIR /blaze
COPY project project
COPY src src
COPY build.sbt build.sbt
COPY sbt sbt
RUN ./sbt assembly -batch && \
RUN sbt assembly -batch && \
mv target/blaze-assembly-1.0.jar . && \
rm -Rf target && \
rm -Rf project/target && \
Expand All @@ -14,4 +14,4 @@ RUN ./sbt assembly -batch && \

EXPOSE 8080

CMD ["java", "-server", "-Xms2g", "-Xmx2g", "-XX:NewSize=1g", "-XX:MaxNewSize=1g", "-XX:InitialCodeCacheSize=256m", "-XX:ReservedCodeCacheSize=256m", "-XX:+UseParallelGC", "-XX:+UseNUMA", "-XX:-UseBiasedLocking", "-XX:+AlwaysPreTouch", "-jar", "blaze-assembly-1.0.jar", "tfb-database"]
CMD ["java", "-server", "-Xms2g", "-Xmx2g", "-XX:NewSize=1g", "-XX:MaxNewSize=1g", "-XX:InitialCodeCacheSize=256m", "-XX:ReservedCodeCacheSize=256m", "-XX:+UseParallelGC", "-XX:+UseNUMA", "-XX:+AlwaysPreTouch", "-jar", "blaze-assembly-1.0.jar", "tfb-database"]
17 changes: 12 additions & 5 deletions frameworks/Scala/blaze/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,19 @@ name := "blaze"

version := "1.0"

scalaVersion := "2.13.5"
scalaVersion := "2.13.16"

libraryDependencies ++= Seq(
"org.http4s" %% "blaze-http" % "0.14.16",
"com.github.plokhotnyuk.jsoniter-scala" %% "jsoniter-scala-macros" % "2.7.3",
"ch.qos.logback" % "logback-classic" % "1.2.3"
"org.http4s" %% "blaze-http" % "0.14.18",
"com.github.plokhotnyuk.jsoniter-scala" %% "jsoniter-scala-macros" % "2.34.0",
"ch.qos.logback" % "logback-classic" % "1.5.18"
)

crossPaths := false
crossPaths := false

assembly / assemblyMergeStrategy := {
case x if x.contains("module-info.class") => MergeStrategy.discard
case x =>
val oldStrategy = (assembly / assemblyMergeStrategy).value
oldStrategy(x)
}
2 changes: 1 addition & 1 deletion frameworks/Scala/blaze/project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.5.1
sbt.version=1.10.11
Loading
Loading