From ab35a12d716c624bf7034a81fe83bc35d8c74869 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 10 Jul 2024 17:12:52 +0000 Subject: [PATCH 1/2] Applied Scalafix rule(s) https://gist.githubusercontent.com/eed3si9n/57e83f5330592d968ce49f0d5030d4d5/raw/7f576f16a90e432baa49911c9a66204c354947bb/Sbt0_13BuildSyntax.scala See https://eed3si9n.com/syntactic-scalafix-rule-for-unified-slash-syntax for details --- build.sbt | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/build.sbt b/build.sbt index 459d716..209508e 100644 --- a/build.sbt +++ b/build.sbt @@ -12,7 +12,7 @@ lazy val `woken-validation` = .settings(settings) .settings( Seq( - mainClass in Runtime := Some("ch.chuv.lren.woken.validation.Main"), + (Runtime / mainClass) := Some("ch.chuv.lren.woken.validation.Main"), libraryDependencies ++= Seq( library.akkaActor, library.akkaRemote, @@ -44,11 +44,11 @@ lazy val `woken-validation` = library.scalaMock % Test, library.akkaTestkit % Test ), - includeFilter in (Compile, unmanagedResources) := "*.xml" || "*.conf", - includeFilter in (Test, unmanagedResources) := "*.json", + (Compile / unmanagedResources / includeFilter) := "*.xml" || "*.conf", + (Test / unmanagedResources / includeFilter) := "*.json", // Use the customMergeStrategy in your settings - assemblyMergeStrategy in assembly := customMergeStrategy, - assemblyJarName in assembly := "woken-validation-all.jar" + (assembly / assemblyMergeStrategy) := customMergeStrategy, + (assembly / assemblyJarName) := "woken-validation-all.jar" ) ) @@ -144,17 +144,17 @@ lazy val settings = commonSettings ++ gitSettings ++ scalafmtSettings lazy val commonSettings = Seq( scalaVersion := "2.11.12", - organization in ThisBuild := "ch.chuv.lren.woken", - organizationName in ThisBuild := "LREN CHUV for Human Brain Project", - homepage in ThisBuild := Some(url(s"https://github.com/HBPMedical/${name.value}/#readme")), - licenses in ThisBuild := Seq("AGPL-3.0" -> + (ThisBuild / organization) := "ch.chuv.lren.woken", + (ThisBuild / organizationName) := "LREN CHUV for Human Brain Project", + (ThisBuild / homepage) := Some(url(s"https://github.com/HBPMedical/${name.value}/#readme")), + (ThisBuild / licenses) := Seq("AGPL-3.0" -> url(s"https://github.com/LREN-CHUV/${name.value}/blob/${version.value}/LICENSE")), - startYear in ThisBuild := Some(2017), - description in ThisBuild := "Cross validation module for Woken", - developers in ThisBuild := List( + (ThisBuild / startYear) := Some(2017), + (ThisBuild / description) := "Cross validation module for Woken", + (ThisBuild / developers) := List( Developer("ludovicc", "Ludovic Claude", "@ludovicc", url("https://github.com/ludovicc")) ), - scmInfo in ThisBuild := Some(ScmInfo(url(s"https://github.com/HBPMedical/${name.value}"), s"git@github.com:HBPMedical/${name.value}.git")), + (ThisBuild / scmInfo) := Some(ScmInfo(url(s"https://github.com/HBPMedical/${name.value}"), s"git@github.com:HBPMedical/${name.value}.git")), scalacOptions ++= Seq( "-unchecked", "-deprecation", @@ -169,13 +169,13 @@ lazy val commonSettings = "UTF-8" ), javacOptions ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint"), - unmanagedSourceDirectories.in(Compile) := Seq(scalaSource.in(Compile).value), - unmanagedSourceDirectories.in(Test) := Seq(scalaSource.in(Test).value), - wartremoverWarnings in (Compile, compile) ++= Warts.unsafe, - fork in run := true, - test in assembly := {}, - fork in Test := true, - parallelExecution in Test := false + (Compile / unmanagedSourceDirectories) := Seq((Compile / scalaSource).value), + (Test / unmanagedSourceDirectories) := Seq((Test / scalaSource).value), + (Compile / compile / wartremoverWarnings) ++= Warts.unsafe, + (run / fork) := true, + (assembly / test) := {}, + (Test / fork) := true, + (Test / parallelExecution) := false ) lazy val gitSettings = @@ -190,11 +190,11 @@ lazy val gitSettings = lazy val scalafmtSettings = Seq( scalafmtOnCompile := true, - scalafmtOnCompile.in(Sbt) := false, + (Sbt / scalafmtOnCompile) := false, scalafmtVersion := "1.5.1" ) - assemblyMergeStrategy in assembly := { + (assembly / assemblyMergeStrategy) := { case PathList("io", "hydrosphere", xs @ _*) => MergeStrategy.first case PathList("org","aopalliance", xs @ _*) => MergeStrategy.last case PathList("javax", "inject", xs @ _*) => MergeStrategy.last @@ -215,7 +215,7 @@ lazy val scalafmtSettings = case "plugin.properties" => MergeStrategy.last case "log4j.properties" => MergeStrategy.last case x => - val oldStrategy = (assemblyMergeStrategy in assembly).value + val oldStrategy = ((assembly / assemblyMergeStrategy)).value oldStrategy(x) } From 095e7a1ef55711b683b22758c1eca06e91fc3f12 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 10 Jul 2024 17:12:52 +0000 Subject: [PATCH 2/2] Update sbt to 1.10.1 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index c0bab04..ee4c672 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.2.8 +sbt.version=1.10.1