Преглед изворни кода

Update NGINX Unit to 1.28.0 (#7579)

- Update SNUnit to 0.0.24
- Update Sbt to 1.7.1
Lorenzo Gabriele пре 3 година
родитељ
комит
929f883cd7

+ 1 - 1
frameworks/Scala/snunit/build.sbt

@@ -2,7 +2,7 @@ import scala.scalanative.build._
 
 
 scalaVersion := "2.13.8"
 scalaVersion := "2.13.8"
 
 
-val snunitVersion = "0.0.22"
+val snunitVersion = "0.0.24"
 libraryDependencies ++= Seq(
 libraryDependencies ++= Seq(
   "com.github.lolgab" %%% "snunit" % snunitVersion,
   "com.github.lolgab" %%% "snunit" % snunitVersion,
   "com.lihaoyi" %%% "upickle" % "2.0.0"
   "com.lihaoyi" %%% "upickle" % "2.0.0"

+ 1 - 1
frameworks/Scala/snunit/config.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #!/usr/bin/env bash
 
 
-processes=$(expr $(nproc) / 2)
+processes=$(("$(nproc)" / 2))
 
 
 config='{'
 config='{'
 config+='  "listeners": {'
 config+='  "listeners": {'

+ 1 - 1
frameworks/Scala/snunit/project/build.properties

@@ -1 +1 @@
-sbt.version=1.6.2
+sbt.version=1.7.1

+ 2 - 2
frameworks/Scala/snunit/snunit.dockerfile

@@ -6,7 +6,7 @@ RUN apt-get update && apt-get install -y curl gnupg && \
   curl -sL https://nginx.org/keys/nginx_signing.key | apt-key add - && \
   curl -sL https://nginx.org/keys/nginx_signing.key | apt-key add - && \
   echo "deb https://packages.nginx.org/unit/debian/ bullseye unit" > /etc/apt/sources.list.d/unit.list && \
   echo "deb https://packages.nginx.org/unit/debian/ bullseye unit" > /etc/apt/sources.list.d/unit.list && \
   echo "deb-src https://packages.nginx.org/unit/debian/ bullseye unit" >> /etc/apt/sources.list.d/unit.list && \
   echo "deb-src https://packages.nginx.org/unit/debian/ bullseye unit" >> /etc/apt/sources.list.d/unit.list && \
-  apt-get update && apt-get install -y clang unit-dev openjdk-11-jdk sbt && \
+  apt-get update && apt-get install -y clang unit-dev=1.28* openjdk-11-jdk sbt && \
   apt-get purge -y gnupg
   apt-get purge -y gnupg
 
 
 WORKDIR /workdir
 WORKDIR /workdir
@@ -15,7 +15,7 @@ COPY . .
 
 
 RUN sbt nativeLink
 RUN sbt nativeLink
 
 
-FROM nginx/unit:1.27.0-minimal
+FROM nginx/unit:1.28.0-minimal
 
 
 COPY /config.sh /docker-entrypoint.d/
 COPY /config.sh /docker-entrypoint.d/
 COPY --from=builder /workdir/target/scala-2.13/workdir-out /app/example
 COPY --from=builder /workdir/target/scala-2.13/workdir-out /app/example

+ 2 - 2
frameworks/Scala/snunit/src/main/scala/Main.scala

@@ -1,10 +1,10 @@
 import snunit._
 import snunit._
 import upickle.default._
 import upickle.default._
 
 
-case class Message(message: String)
+final case class Message(message: String)
 
 
 object Message {
 object Message {
-  implicit val messageRW: ReadWriter[Message] = macroRW[Message]
+  implicit final val messageRW: ReadWriter[Message] = macroRW[Message]
 }
 }
 
 
 object Main {
 object Main {