Skip to content
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
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ object AsciidoctorPlugin extends AutoPlugin {
override def projectSettings = asciidoctorSettings(Asciidoctor)

/** Creates settings necessary for running Asciidoctor in the given configuration. */
def asciidoctorSettings(config: Configuration): Seq[Setting[_]] =
def asciidoctorSettings(config: Configuration): Seq[Setting[?]] =
inConfig(config)(
Seq(
includeFilter := AllPassFilter,
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/com/typesafe/sbt/site/Compat.scala
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ object Compat {
}
}

def watchSettings(scope: Scope): Seq[Setting[_]] =
def watchSettings(scope: Scope): Seq[Setting[?]] =
Seq(
ConfigGlobal / watchSources += new Source(
base = (scope / sourceDirectory).value,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ object SitePreviewPlugin extends AutoPlugin {
import SitePlugin.autoImport._
import autoImport._

override val projectSettings: Seq[Setting[_]] = Seq(
override val projectSettings: Seq[Setting[?]] = Seq(
previewSite := {
val file = makeSite.value
val portOption = previewFixedPort.value
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ object SiteScaladocPlugin extends AutoPlugin {
config: Configuration,
scaladocMappings: TaskKey[Seq[(File, String)]] = Compile / packageDoc / mappings,
scaladocDir: String = "latest/api"
): Seq[Setting[_]] =
): Seq[Setting[?]] =
inConfig(config)(
Seq(
siteSubdirName := scaladocDir,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ object PreprocessPlugin extends AutoPlugin {

override def projectSettings = preprocessSettings(Preprocess)

def preprocessSettings(config: Configuration): Seq[Setting[_]] =
def preprocessSettings(config: Configuration): Seq[Setting[?]] =
inConfig(config)(
Seq(
siteSourceDirectory := siteSourceDirectory.value,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ object SiteHelpers {
/** Convenience functions to add a task of mappings to a site under a nested directory. */
def addMappingsToSiteDir(
mappings: Def.Initialize[Task[Seq[(File, String)]]],
nestedDirectory: SettingKey[String]): Setting[_] =
nestedDirectory: SettingKey[String]): Setting[?] =
siteMappings ++= {
for ((f, d) <- mappings.value) yield (f, nestedDirectory.value + "/" + d)
}
Expand All @@ -36,17 +36,17 @@ object SiteHelpers {
zipPath
}

def directorySettings(config: Configuration): Seq[Setting[_]] =
def directorySettings(config: Configuration): Seq[Setting[?]] =
inConfig(config)(
Seq(
sourceDirectory := sourceDirectory.value / config.name,
target := target.value / config.name
))

def watchSettings(config: Configuration): Seq[Setting[_]] =
def watchSettings(config: Configuration): Seq[Setting[?]] =
Compat.watchSettings(ThisScope.in(config))

def watchSettings(scope: Scope): Seq[Setting[_]] =
def watchSettings(scope: Scope): Seq[Setting[?]] =
Compat.watchSettings(scope)

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ object GitBookPlugin extends AutoPlugin {
override def projectSettings = gitbookSettings(GitBook)

/** Creates settings necessary for running GitBook in the given configuration. */
def gitbookSettings(config: Configuration): Seq[Setting[_]] =
def gitbookSettings(config: Configuration): Seq[Setting[?]] =
inConfig(config)(
Seq(
includeFilter := AllPassFilter,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ object ParadoxSitePlugin extends AutoPlugin {
import autoImport._
import ParadoxPlugin.autoImport._
override def projectSettings = paradoxSettings(Compile)
def paradoxSettings(config: Configuration): Seq[Setting[_]] = {
def paradoxSettings(config: Configuration): Seq[Setting[?]] = {
val siteNameConfig = if (config == Compile) Paradox else config
List(
siteNameConfig / siteSubdirName := ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ object SphinxPlugin extends AutoPlugin {
import autoImport._
override def projectSettings = sphinxSettings(Sphinx)

def sphinxSettings(config: Configuration): Seq[Setting[_]] =
def sphinxSettings(config: Configuration): Seq[Setting[?]] =
inConfig(config)(
Seq(
sphinxPackages := Seq.empty,
Expand Down
Loading