Reorganize build.sbt into better settings categories
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/commit/d8be0380 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/tree/d8be0380 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/diff/d8be0380 Branch: refs/heads/master Commit: d8be0380e4e143cdb8e18990a34cfed5770da6d1 Parents: d245e72 Author: Matt Sicker <boa...@gmail.com> Authored: Fri Mar 30 17:45:16 2018 -0500 Committer: Matt Sicker <boa...@gmail.com> Committed: Fri Mar 30 17:45:16 2018 -0500 ---------------------------------------------------------------------- build.sbt | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j-scala/blob/d8be0380/build.sbt ---------------------------------------------------------------------- diff --git a/build.sbt b/build.sbt index 00993c0..39f8ac7 100644 --- a/build.sbt +++ b/build.sbt @@ -76,15 +76,26 @@ lazy val publishSettings = Seq( } yield Credentials("Sonatype Nexus Repository Manager", "repository.apache.org", username, password) }.toList, // FIXME: https://github.com/sbt/sbt/issues/3519 - updateOptions := updateOptions.value.withGigahorse(false), + updateOptions := updateOptions.value.withGigahorse(false) +) + +lazy val packagingSettings = Seq( extraResources := Seq( (baseDirectory.value / "LICENSE.txt", "META-INF/LICENSE"), (baseDirectory.value / "NOTICE.txt", "META-INF/NOTICE") - ) + ), + unmanagedSources in Compile := { + val Some((_, minor)) = CrossVersion.partialVersion(scalaVersion.value) + val extras = if (minor > 10) ((baseDirectory.value / "src" / "main" / "scala-2.11+") ** "*.scala").get else Nil + (unmanagedSources in Compile).value ++ extras + } ) lazy val releaseSettings = Seq( - releaseCrossBuild := true, + releaseCrossBuild := true +) + +lazy val siteSettings = Seq( apiURL := Some(url(s"https://logging.apache.org/log4j/scala/api/${version.value}/";)), siteSubdirName in SiteScaladoc := s"api/${version.value}" ) @@ -101,14 +112,6 @@ lazy val apiDependencies = Seq( ) ) -lazy val apiInputFiles = Seq( - unmanagedSources in Compile := { - val Some((_, minor)) = CrossVersion.partialVersion(scalaVersion.value) - val extras = if (minor > 10) ((baseDirectory.value / "src" / "main" / "scala-2.11+") ** "*.scala").get else Nil - (unmanagedSources in Compile).value ++ extras - } -) - //lazy val bundleSettings = osgiSettings ++ Seq( // bundleSymbolicName := "org.apache.logging.log4j.scala", // exportPackage := Seq("org.apache.logging.log4j.scala") @@ -119,9 +122,10 @@ lazy val root = (project in file(".")) .settings(metadataSettings: _*) .settings(compileSettings: _*) .settings(publishSettings: _*) + .settings(packagingSettings: _*) .settings(releaseSettings: _*) + .settings(siteSettings: _*) .settings(apiDependencies: _*) - .settings(apiInputFiles: _*) .enablePlugins(AsciidoctorPlugin) .enablePlugins(SiteScaladocPlugin) // .enablePlugins(SbtOsgi)
