Skip to content

Commit

Permalink
Merge pull request #304 from dwijnand/drop-sbt-0.13
Browse files Browse the repository at this point in the history
Drop sbt 0.13 support
  • Loading branch information
dwijnand authored Mar 25, 2019
2 parents 18e81b6 + 2d5f48d commit adf2ef9
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ install: jabba install "$TRAVIS_JDK" && jabba use $_ && java -Xmx32m -version
jobs:
include:
- stage: check
script: sbt ^headerCheck
script: sbt headerCheck
name: "Copyright header check"

- stage: test
Expand Down
5 changes: 2 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ import java.lang.management.ManagementFactory
inThisBuild(List(
organization := "com.lightbend.paradox",
licenses += "Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0.html"),
scalaVersion := "2.12.7",
crossScalaVersions := Seq("2.10.7", "2.12.7"),
scalaVersion := "2.12.8",
organizationName := "lightbend",
organizationHomepage := Some(url("https://lightbend.com/")),
homepage := Some(url("https://developer.lightbend.com/docs/paradox/current/")),
Expand Down Expand Up @@ -136,4 +135,4 @@ lazy val docs = (project in file("docs"))
publish / skip := true
)

addCommandAlias("verify", ";^ test:compile ;^ compile:doc ;^ test ;^ scripted ;docs/paradox")
addCommandAlias("verify", ";test:compile ;compile:doc ;test ;scripted ;docs/paradox")
16 changes: 1 addition & 15 deletions project/Common.scala
Original file line number Diff line number Diff line change
Expand Up @@ -32,23 +32,9 @@ object Common extends AutoPlugin {

// AutomateHeaderPlugin is not an allRequirements-AutoPlugin, so explicitly add settings here:
override def projectSettings = AutomateHeaderPlugin.projectSettings ++ Seq(
scalaVersion := { (sbtBinaryVersion in pluginCrossBuild).value match {
case "0.13" => "2.10.7"
case _ => "2.12.6"
}},
crossSbtVersions := Seq("0.13.17", "1.0.4"),
// fixed in https://github.com/sbt/sbt/pull/3397 (for sbt 0.13.17)
sbtBinaryVersion in update := (sbtBinaryVersion in pluginCrossBuild).value,
scalaVersion := "2.12.8",
scalacOptions ++= Seq("-encoding", "UTF-8", "-unchecked", "-deprecation", "-feature"),
scalacOptions ++= { (sbtBinaryVersion in pluginCrossBuild).value match {
case "0.13" => Seq("-target:jvm-1.6")
case _ => Seq.empty
}},
javacOptions ++= Seq("-encoding", "UTF-8"),
javacOptions ++= { (sbtBinaryVersion in pluginCrossBuild).value match {
case "0.13" => Seq("-source", "1.6", "-target", "1.6")
case _ => Seq.empty
}},
resolvers += Resolver.typesafeIvyRepo("releases"),
// Scalariform settings
ScalariformKeys.preferences := ScalariformKeys.preferences.value
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.2.6
sbt.version=1.2.8
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ lazy val metaroot = (project in file(".")).
lazy val metaThemePlugin = (project in file("theme-plugin"))
.settings(
sbtPlugin := true,
scalaVersion := "2.12.6",
scalaVersion := "2.12.8",
addSbtPlugin("com.typesafe.sbt" % "sbt-web" % "1.4.4"),
unmanagedSourceDirectories in Compile :=
mirrorScalaSource((baseDirectory in ThisBuild).value.getParentFile / "theme-plugin")
Expand Down

0 comments on commit adf2ef9

Please sign in to comment.