From 775cad68fe15bb8a63a13d392c73633129d22492 Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Mon, 5 Jun 2017 23:05:55 +0900 Subject: [PATCH 1/2] remove sbt-cross-building --- build.sbt | 25 +++---------------------- project/plugins.sbt | 4 ++-- 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/build.sbt b/build.sbt index 59deabbe9..6b4943943 100644 --- a/build.sbt +++ b/build.sbt @@ -1,28 +1,9 @@ -crossBuildingSettings - -CrossBuilding.crossSbtVersions := Seq("0.13") - -CrossBuilding.scriptedSettings +ScriptedPlugin.scriptedSettings libraryDependencies += "com.github.mdr" %% "ascii-graphs" % "0.0.3" -libraryDependencies <++= scalaVersion { version => - if (version startsWith "2.1") Seq("org.scala-lang" % "scala-reflect" % version % "provided") - else Nil -} - -libraryDependencies <+= scalaVersion { version => - if (version startsWith "2.9") "org.specs2" % "specs2_2.9.3" % "1.12.4.1" % "test" - else "org.specs2" %% "specs2" % "2.3.11" % "test" -} +libraryDependencies += "org.specs2" %% "specs2" % "2.3.11" % "test" scalacOptions ++= Seq("-deprecation", "-unchecked") -sbt.CrossBuilding.latestCompatibleVersionMapper ~= { - original => { - case "0.13" => "0.13.6" - case x => original(x) - } -} - -ScalariformSupport.formatSettings \ No newline at end of file +ScalariformSupport.formatSettings diff --git a/project/plugins.sbt b/project/plugins.sbt index df57f0cef..0a919c7d8 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,3 @@ -addSbtPlugin("net.virtual-void" % "sbt-cross-building" % "0.8.1") +libraryDependencies += "org.scala-sbt" % "scripted-plugin" % sbtVersion.value -addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.2.1") \ No newline at end of file +addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.2.1") From 78092eb193e4ac2845738038bfd71c2b5937a87c Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Mon, 5 Jun 2017 23:09:23 +0900 Subject: [PATCH 2/2] add .travis.yml --- .travis.yml | 5 +++++ .../sbt-dependency-graph/intervalRangedVersions/build.sbt | 2 ++ 2 files changed, 7 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..30f872264 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,5 @@ +sudo: false +language: scala +jdk: oraclejdk7 +script: +- sbt test scripted diff --git a/src/sbt-test/sbt-dependency-graph/intervalRangedVersions/build.sbt b/src/sbt-test/sbt-dependency-graph/intervalRangedVersions/build.sbt index b73285b94..2cec07ae8 100644 --- a/src/sbt-test/sbt-dependency-graph/intervalRangedVersions/build.sbt +++ b/src/sbt-test/sbt-dependency-graph/intervalRangedVersions/build.sbt @@ -1,5 +1,7 @@ scalaVersion := "2.9.1" +resolvers += "typesafe maven" at "http://repo.typesafe.com/typesafe/maven-releases/" + libraryDependencies ++= Seq( "com.codahale" % "jerkson_2.9.1" % "0.5.0" )