From 1fa286b0ea682ed514290bf321ed95650eb5ee7d Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Fri, 22 Mar 2019 05:54:56 +0000 Subject: [PATCH 1/3] Drop sbt 0.13 support ... as well as Scala 2.10 support. Fixes #291 --- .travis.yml | 2 +- build.sbt | 3 +-- project/Common.scala | 16 +--------------- 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index acf63fac..30432730 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ language: scala jobs: include: - stage: check - script: sbt ^headerCheck + script: sbt headerCheck name: "Copyright header check" - stage: test diff --git a/build.sbt b/build.sbt index 7cc67b47..04183db2 100644 --- a/build.sbt +++ b/build.sbt @@ -21,7 +21,6 @@ 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"), organizationName := "lightbend", organizationHomepage := Some(url("https://lightbend.com/")), homepage := Some(url("https://developer.lightbend.com/docs/paradox/current/")), @@ -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") diff --git a/project/Common.scala b/project/Common.scala index 9aed814b..e1437d96 100644 --- a/project/Common.scala +++ b/project/Common.scala @@ -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.6", 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 From 4e0b50ff8fc6279830684bfbd08c0cdac4f59b31 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Fri, 22 Mar 2019 05:57:16 +0000 Subject: [PATCH 2/3] Upgrade to Scala 2.12.8 --- build.sbt | 2 +- project/Common.scala | 2 +- project/plugins.sbt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 04183db2..67866116 100644 --- a/build.sbt +++ b/build.sbt @@ -20,7 +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", + scalaVersion := "2.12.8", organizationName := "lightbend", organizationHomepage := Some(url("https://lightbend.com/")), homepage := Some(url("https://developer.lightbend.com/docs/paradox/current/")), diff --git a/project/Common.scala b/project/Common.scala index e1437d96..f681da88 100644 --- a/project/Common.scala +++ b/project/Common.scala @@ -32,7 +32,7 @@ object Common extends AutoPlugin { // AutomateHeaderPlugin is not an allRequirements-AutoPlugin, so explicitly add settings here: override def projectSettings = AutomateHeaderPlugin.projectSettings ++ Seq( - scalaVersion := "2.12.6", + scalaVersion := "2.12.8", scalacOptions ++= Seq("-encoding", "UTF-8", "-unchecked", "-deprecation", "-feature"), javacOptions ++= Seq("-encoding", "UTF-8"), resolvers += Resolver.typesafeIvyRepo("releases"), diff --git a/project/plugins.sbt b/project/plugins.sbt index f1fc97d0..714abb2c 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -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") From 2d5f48dabf4d2a3f18619911abf28054bb6f2fea Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Fri, 22 Mar 2019 05:57:48 +0000 Subject: [PATCH 3/3] Upgrade to sbt 1.2.8 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 7c58a83a..c0bab049 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.2.6 +sbt.version=1.2.8