Skip to content

Commit

Permalink
modified build.sbt and plugins in preparation for cross-compilation
Browse files Browse the repository at this point in the history
  • Loading branch information
pnerg committed Nov 21, 2018
1 parent d562e8d commit e56a35f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 21 deletions.
19 changes: 3 additions & 16 deletions build.sbt
Expand Up @@ -5,9 +5,9 @@ sbtPlugin := true
name := "sbt-publish-settings-plugin"
organization := "org.dmonix.sbt"

//sbt 13.x is built using Scala 2.10 hence we can't use 2.11 to build plugins
scalaVersion := "2.10.6"

crossScalaVersions := Seq("2.10.6", "2.12.3")
crossSbtVersions := Seq("0.13.17", "1.1.6")

//---------------------------------------
// Compiler directives
Expand All @@ -18,20 +18,7 @@ scalacOptions ++= Seq("-deprecation", "-unchecked", "-feature", "-language:impli

scalacOptions in (Compile, doc) ++= Seq("-doc-title", "SBT Publish Settings Plugin")
scalacOptions in (Compile, doc) ++= Seq("-doc-root-content", baseDirectory.value+"/src/main/scaladoc/overview.txt")
scalacOptions in (Compile, doc) ++= Seq("-doc-footer", "Copyright (c) 2017 Peter Nerg, Apache License v2.0.")

//---------------------------------------

libraryDependencies ++= Seq(
"org.scalatest" %% "scalatest" % "2.2.4" % "test"
)

//---------------------------------------

ScoverageSbtPlugin.ScoverageKeys.coverageHighlighting := {
if (scalaBinaryVersion.value == "2.10") false
else false
}
scalacOptions in (Compile, doc) ++= Seq("-doc-footer", "Copyright (c) 2018 Peter Nerg, Apache License v2.0.")

//----------------------------
//info for where and how to publish artifacts
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
@@ -1 +1 @@
sbt.version=0.13.7
sbt.version=0.13.17
4 changes: 0 additions & 4 deletions project/plugins.sbt
@@ -1,11 +1,7 @@
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.1.0")

addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")

addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "0.5.1")

addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.4")

addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.0.0")

// This project is its own plugin :)
Expand Down

0 comments on commit e56a35f

Please sign in to comment.