Merge pull request #818 from OpenOlitor/dev/dep_updates

Dep Updates and minor Scala Version Update
OpenOlitor · Dec 4, 2024 · 70fa3d8 · 70fa3d8
2 parents f5f16be + b67a837
commit 70fa3d8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 26 deletions.
diff --git a/build.sbt b/build.sbt
@@ -1,4 +1,4 @@
-scalaVersion := "2.13.13"
+scalaVersion := "2.13.15"
 
 enablePlugins(JavaServerAppPackaging)
 enablePlugins(DockerPlugin)
@@ -34,16 +34,16 @@ val sprayV = "1.3.+"
 val scalalikeV = "4.3.2"
 val akkaHttpVersion = "10.5.3"
 val akkaVersion = "2.8.5"
-val testContainersVersion = "1.20.3"
+val testContainersVersion = "1.20.4"
 
 resolvers += Resolver.typesafeRepo("releases")
 
 val buildSettings = Seq(
   scalariformPreferences := scalariformPreferences.value
   .setPreference(DanglingCloseParenthesis, Force)
   .setPreference(AlignSingleLineCaseStatements, true),
-  version := "2.6.41",
-  scalaVersion := "2.13.13",
+  version := "2.6.42",
+  scalaVersion := "2.13.15",
   crossScalaVersions := Seq("2.13.8", "2.13.13"),
   resolvers ++= Resolver.sonatypeOssRepos("snapshots"),
   resolvers ++= Resolver.sonatypeOssRepos("releases"),
@@ -87,14 +87,14 @@ val buildSettings = Seq(
     "org.testcontainers"           %  "mariadb"                            % testContainersVersion                   % "test",
     "io.findify"                   %% "s3mock"                             % "0.2.6"                                 % "test",
     "ch.qos.logback"  	           %  "logback-classic"    		  		       % "1.5.12",
-    "org.mariadb.jdbc"	           %  "mariadb-java-client"                % "3.5.0",
+    "org.mariadb.jdbc"	           %  "mariadb-java-client"                % "3.5.1",
     "com.mysql"	                       %  "mysql-connector-j"               % "9.1.0",
     // Libreoffice document API
     "org.odftoolkit"               %  "simple-odf"					               % "0.9.0" withSources(),
     "com.scalapenos"               %% "stamina-json"                       % "0.1.6", // ### NO Scala 3
     "net.virtual-void"             %% "json-lenses"                        % "0.6.2",
     // s3
-    "com.amazonaws"                %  "aws-java-sdk-s3"                    % "1.12.772",
+    "com.amazonaws"                %  "aws-java-sdk-s3"                    % "1.12.779",
     "de.svenkubiak"                %  "jBCrypt"                            % "0.4.1",
     "com.github.daddykotex"        %% "courier"                            % "3.2.0", // ### Scala 3
     "com.github.nscala-time"       %% "nscala-time"                        % "2.34.0", // ### Scala 3
@@ -118,9 +118,9 @@ val buildSettings = Seq(
     "org.scala-lang.modules" %% "scala-parser-combinators" % "2.4.0",
     "xerces" % "xercesImpl" % "2.12.2",
     "org.apache.commons" % "commons-compress" % "1.26.2",
-    "io.netty" % "netty-handler" % "4.1.114.Final",
+    "io.netty" % "netty-handler" % "4.1.115.Final",
     "org.apache.jena" % "jena-core" % "5.2.0",
-    "com.google.protobuf" % "protobuf-java" % "3.21.12",
+    "com.google.protobuf" % "protobuf-java" % "4.29.0",
     "com.google.guava" % "guava" % "33.0.0-jre"
   )
 )

diff --git a/manifest.yml b/manifest.yml
diff --git a/project/build.properties b/project/build.properties
@@ -1,2 +1,2 @@
-sbt.version=1.9.9
+sbt.version=1.10.6
 
diff --git a/src/main/scala/ch/openolitor/arbeitseinsatz/ArbeitseinsatzDeleteService.scala b/src/main/scala/ch/openolitor/arbeitseinsatz/ArbeitseinsatzDeleteService.scala
@@ -66,7 +66,7 @@ class ArbeitseinsatzDeleteService(override val sysConfig: SystemConfig) extends
   def deleteArbeitsangebot(meta: EventMetadata, id: ArbeitsangebotId)(implicit personId: PersonId = meta.originator) = {
     DB localTxPostPublish { implicit session => implicit publisher =>
       arbeitseinsatzWriteRepository.getArbeitseinsatzDetailByArbeitsangebot(id) map { arbeitseinsatzeDetail =>
-        arbeitseinsatzWriteRepository.deleteEntity[Arbeitseinsatz, ArbeitseinsatzId](arbeitseinsatzeDetail.id,{ arbeitseinsatz: Arbeitseinsatz => arbeitseinsatz.arbeitsangebotStatus == InVorbereitung })
+        arbeitseinsatzWriteRepository.deleteEntity[Arbeitseinsatz, ArbeitseinsatzId](arbeitseinsatzeDetail.id, { arbeitseinsatz: Arbeitseinsatz => arbeitseinsatz.arbeitsangebotStatus == InVorbereitung })
       }
       arbeitseinsatzWriteRepository.deleteEntity[Arbeitsangebot, ArbeitsangebotId](id, { arbeitsangebot: Arbeitsangebot => arbeitsangebot.status == InVorbereitung })
     }