Skip to content

Commit 838280a

Browse files
committed
Update to SBT 1.5.3
1 parent 73c1b41 commit 838280a

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

build.sbt

+15-15
Original file line numberDiff line numberDiff line change
@@ -66,24 +66,24 @@ lazy val docs = project
6666
dontPublish,
6767
description := "Api Documentation",
6868
autoAPIMappings := true,
69-
scalacOptions in Compile := scaladocOptions(
70-
(baseDirectory in ThisBuild).value,
69+
(Compile / scalacOptions) := scaladocOptions(
70+
(ThisBuild / baseDirectory).value,
7171
version.value,
7272
apiVersion.value
7373
),
74-
scalacOptions in (ScalaUnidoc, unidoc) ++= versionSpecificEnabledFlags(scalaVersion.value),
75-
unidocProjectFilter in (ScalaUnidoc, unidoc) := inProjects(
74+
(ScalaUnidoc / unidoc / scalacOptions) ++= versionSpecificEnabledFlags(scalaVersion.value),
75+
(ScalaUnidoc / unidoc / unidocProjectFilter) := inProjects(
7676
`rho-core`,
7777
`rho-hal`,
7878
`rho-swagger`
7979
),
8080
git.remoteRepo := "git@github.com:http4s/rho.git",
8181
ghpagesCleanSite := VersionedGhPages.cleanSite0.value,
8282
ghpagesSynchLocal := VersionedGhPages.synchLocal0.value,
83-
mappings in makeSite := {
83+
(makeSite / mappings) := {
8484
val (major, minor) = apiVersion.value
8585
for {
86-
(f, d) <- (mappings in (ScalaUnidoc, packageDoc)).value
86+
(f, d) <- (ScalaUnidoc / packageDoc / mappings).value
8787
} yield (f, s"api/$major.$minor/$d")
8888
}
8989
)
@@ -120,7 +120,7 @@ def versionSpecificEnabledFlags(version: String) = CrossVersion.partialVersion(v
120120
/* Don't publish setting */
121121
lazy val dontPublish = packagedArtifacts := Map.empty
122122

123-
lazy val license = licenses in ThisBuild := Seq(
123+
lazy val license = (ThisBuild / licenses) := Seq(
124124
"Apache License, Version 2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0.txt")
125125
)
126126

@@ -130,9 +130,9 @@ lazy val buildSettings = publishing ++
130130
crossScalaVersions := Seq(scala_213, scala_212),
131131
scalacOptions := compilerFlags ++ versionSpecificEnabledFlags(scalaVersion.value),
132132
resolvers += Resolver.sonatypeRepo("snapshots"),
133-
fork in run := true,
134-
organization in ThisBuild := "org.http4s",
135-
homepage in ThisBuild := Some(url(homepageUrl)),
133+
(run / fork) := true,
134+
(ThisBuild / organization) := "org.http4s",
135+
(ThisBuild / homepage) := Some(url(homepageUrl)),
136136
description := "A self documenting DSL build upon the http4s framework",
137137
license,
138138
libraryDependencies ++= Seq(
@@ -147,20 +147,20 @@ lazy val buildSettings = publishing ++
147147
)
148148

149149
// to keep REPL usable
150-
scalacOptions in (Compile, console) --= Seq("-Ywarn-unused:imports", "-Xfatal-warnings")
150+
(Compile / console / scalacOptions) --= Seq("-Ywarn-unused:imports", "-Xfatal-warnings")
151151

152152
lazy val publishing = Seq(
153153
extras,
154154
// Don't publish root pom. It's not needed.
155-
packagedArtifacts in LocalRootProject := Map.empty,
156-
publishArtifact in Test := false,
157-
scmInfo in ThisBuild := {
155+
(LocalRootProject / packagedArtifacts) := Map.empty,
156+
(Test / publishArtifact) := false,
157+
(ThisBuild / scmInfo) := {
158158
val base = "github.com/http4s/rho"
159159
Some(ScmInfo(url(s"https://$base"), s"scm:git:https://$base", Some(s"scm:git:git@$base")))
160160
}
161161
)
162162

163-
lazy val extras = pomExtra in ThisBuild := (
163+
lazy val extras = (ThisBuild / pomExtra) := (
164164
<developers>
165165
<developer>
166166
<id>brycelane</id>

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.5.2
1+
sbt.version=1.5.3

rho.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
organization in ThisBuild := "org.http4s"
2-
apiVersion in ThisBuild := RhoPlugin.extractApiVersion(version.value)
1+
(ThisBuild / organization) := "org.http4s"
2+
(ThisBuild / apiVersion) := RhoPlugin.extractApiVersion(version.value)

0 commit comments

Comments
 (0)