Skip to content

Commit 9173fc3

Browse files
committed
use new slash syntax instead of deprecated in
1 parent 1334d59 commit 9173fc3

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

mdoc-sbt/src/main/scala/mdoc/DocusaurusPlugin.scala

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ object DocusaurusPlugin extends AutoPlugin {
2727
import autoImport._
2828
def website: Def.Initialize[File] =
2929
Def.setting {
30-
baseDirectory.in(ThisBuild).value / "website"
30+
(ThisBuild / baseDirectory).value / "website"
3131
}
3232

3333
def listJarFiles(root: Path): List[(File, String)] = {
@@ -95,8 +95,8 @@ object DocusaurusPlugin extends AutoPlugin {
9595

9696
override def projectSettings: Seq[Def.Setting[_]] =
9797
List(
98-
aggregate.in(docusaurusPublishGhpages) := false,
99-
aggregate.in(docusaurusCreateSite) := false,
98+
(docusaurusPublishGhpages / aggregate) := false,
99+
(docusaurusCreateSite / aggregate) := false,
100100
docusaurusProjectName := moduleName.value.stripSuffix("-docs"),
101101
MdocPlugin.mdocInternalVariables ++= List(
102102
"js-out-prefix" -> "assets"
@@ -146,7 +146,7 @@ object DocusaurusPlugin extends AutoPlugin {
146146
Relativize.htmlSite(out.toPath)
147147
out
148148
},
149-
packageDoc.in(Compile) := {
149+
(Compile / packageDoc) := {
150150
val directory = doc.value
151151
val jar = target.value / "docusaurus.jar"
152152
val files = listJarFiles(directory.toPath)

mdoc-sbt/src/main/scala/mdoc/MdocPlugin.scala

+12-12
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ object MdocPlugin extends AutoPlugin {
7878

7979
override def projectSettings: Seq[Def.Setting[_]] =
8080
List(
81-
mdocIn := baseDirectory.in(ThisBuild).value / "docs",
82-
mdocOut := target.in(Compile).value / "mdoc",
81+
mdocIn := (ThisBuild / baseDirectory).value / "docs",
82+
mdocOut := (Compile / target).value / "mdoc",
8383
mdocVariables := Map.empty,
8484
mdocExtraArguments := Nil,
8585
mdocJS := None,
@@ -96,7 +96,7 @@ object MdocPlugin extends AutoPlugin {
9696
parsed
9797
).flatten.mkString(" ")
9898
Def.taskDyn {
99-
runMain.in(Compile).toTask(s" mdoc.SbtMain $args")
99+
(Compile / runMain).toTask(s" mdoc.SbtMain $args")
100100
}
101101
}.evaluated,
102102
dependencyOverrides ++= List(
@@ -114,9 +114,9 @@ object MdocPlugin extends AutoPlugin {
114114
List()
115115
}
116116
},
117-
resourceGenerators.in(Compile) += Def.task {
117+
(Compile / resourceGenerators) += Def.task {
118118
val out =
119-
managedResourceDirectories.in(Compile).value.head / "mdoc.properties"
119+
(Compile / managedResourceDirectories).value.head / "mdoc.properties"
120120
val props = new java.util.Properties()
121121
mdocVariables.value.foreach { case (key, value) =>
122122
props.put(key, value)
@@ -126,9 +126,9 @@ object MdocPlugin extends AutoPlugin {
126126
}
127127
def getJars(mid: ModuleID) = {
128128

129-
val depRes = dependencyResolution.in(update).value
130-
val updc = updateConfiguration.in(update).value
131-
val uwconfig = unresolvedWarningConfiguration.in(update).value
129+
val depRes = (update / dependencyResolution).value
130+
val updc = (update / updateConfiguration).value
131+
val uwconfig = (update / unresolvedWarningConfiguration).value
132132
val modDescr = depRes.wrapDependencyInModule(mid)
133133

134134
depRes
@@ -190,21 +190,21 @@ object MdocPlugin extends AutoPlugin {
190190
props.put("out", mdocOut.value.toString)
191191
props.put(
192192
"scalacOptions",
193-
scalacOptions.in(Compile).value.mkString(" ")
193+
(Compile / scalacOptions).value.mkString(" ")
194194
)
195195
val classpath = ListBuffer.empty[File]
196196
// Can't use fullClasspath.value because it introduces cyclic dependency between
197197
// compilation and resource generation.
198-
classpath ++= dependencyClasspath.in(Compile).value.iterator.map(_.data)
199-
classpath += classDirectory.in(Compile).value
198+
classpath ++= (Compile / dependencyClasspath).value.iterator.map(_.data)
199+
classpath += (Compile / classDirectory).value
200200
props.put(
201201
"classpath",
202202
classpath.mkString(java.io.File.pathSeparator)
203203
)
204204
IO.write(props, "mdoc properties", out)
205205
val esVersion = props.clone().asInstanceOf[java.util.Properties]
206206
esVersion.put("js-module-kind", "ESModule")
207-
val esOut = managedResourceDirectories.in(Compile).value.head / "es.properties"
207+
val esOut = (Compile / managedResourceDirectories).value.head / "es.properties"
208208
IO.write(
209209
esVersion,
210210
"mdoc esmoddule properties",

0 commit comments

Comments
 (0)