Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update sbt to 1.10.1 #368

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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
46 changes: 23 additions & 23 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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"
)
)

Expand Down Expand Up @@ -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"[email protected]:HBPMedical/${name.value}.git")),
(ThisBuild / scmInfo) := Some(ScmInfo(url(s"https://github.com/HBPMedical/${name.value}"), s"[email protected]:HBPMedical/${name.value}.git")),
scalacOptions ++= Seq(
"-unchecked",
"-deprecation",
Expand All @@ -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 =
Expand All @@ -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
Expand All @@ -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)
}

Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.2.8
sbt.version=1.10.1