From ff34aa9d558b3c0dedae888fc32dbbdae2cd86bb Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Fri, 25 Jan 2019 08:51:05 -0800 Subject: [PATCH] sbt 0.13.18, Scala 2.10.7 --- .travis.yml | 4 ++-- project/build.properties | 2 +- project/plugins.sbt | 2 +- .../sbt-test/dependency-management/dynamic-revision/build.sbt | 2 +- sbt/src/sbt-test/dependency-management/pom-type/build.sbt | 2 +- sbt/src/sbt-test/project/cross-plugins-defaults/build.sbt | 4 ++-- .../source-dependencies/macro-arg-dep-nested/build.sbt | 2 +- sbt/src/sbt-test/source-dependencies/macro-arg-dep/build.sbt | 2 +- sbt/src/sbt-test/tests/nested-subproc/build.sbt | 2 +- src/main/conscript/scalas/launchconfig | 2 +- src/main/conscript/screpl/launchconfig | 2 +- src/main/conscript/xsbt/launchconfig | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9040b2f22..d10cc0653 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,8 +44,8 @@ before_install: - curl -sL https://raw.githubusercontent.com/shyiko/jabba/0.10.1/install.sh | bash && . ~/.jabba/jabba.sh install: - - curl -L --fail https://piccolo.link/sbt-0.13.17.tgz > sbt-0.13.17.tgz - - tar zxf ./sbt-0.13.17.tgz -C $HOME/ + - curl -L --fail https://piccolo.link/sbt-0.13.18.tgz > sbt-0.13.18.tgz + - tar zxf ./sbt-0.13.18.tgz -C $HOME/ - export PATH="$HOME/sbt/bin:$PATH" - export SBT_OPTS="-Xms2048M -Xmx2048M -Xss2M -XX:MaxPermSize=512M" - sbt about diff --git a/project/build.properties b/project/build.properties index 133a8f197..8e682c526 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.17 +sbt.version=0.13.18 diff --git a/project/plugins.sbt b/project/plugins.sbt index b2a0bbf29..9a7e2f88e 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -scalaVersion := "2.10.6" +scalaVersion := "2.10.7" addSbtPlugin("com.eed3si9n" % "sbt-doge" % "0.1.5") addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.5.4") diff --git a/sbt/src/sbt-test/dependency-management/dynamic-revision/build.sbt b/sbt/src/sbt-test/dependency-management/dynamic-revision/build.sbt index 35901facc..d775cda99 100644 --- a/sbt/src/sbt-test/dependency-management/dynamic-revision/build.sbt +++ b/sbt/src/sbt-test/dependency-management/dynamic-revision/build.sbt @@ -3,7 +3,7 @@ lazy val check = taskKey[Unit]("Runs the check") def commonSettings: Seq[Def.Setting[_]] = Seq( ivyPaths := new IvyPaths( (baseDirectory in ThisBuild).value, Some((target in LocalRootProject).value / "ivy-cache")), - scalaVersion := "2.10.6" + scalaVersion := "2.10.7" ) lazy val root = (project in file(".")). diff --git a/sbt/src/sbt-test/dependency-management/pom-type/build.sbt b/sbt/src/sbt-test/dependency-management/pom-type/build.sbt index b83e9fbbb..8f22820f3 100644 --- a/sbt/src/sbt-test/dependency-management/pom-type/build.sbt +++ b/sbt/src/sbt-test/dependency-management/pom-type/build.sbt @@ -2,7 +2,7 @@ lazy val checkPom = taskKey[Unit]("check pom to ensure no sections are ge lazy val root = (project in file(".")). settings( - scalaVersion := "2.10.6", + scalaVersion := "2.10.7", libraryDependencies += "org.scala-tools.sbinary" %% "sbinary" % "0.4.1" withSources() withJavadoc(), libraryDependencies += "org.scala-sbt" % "io" % "0.13.8" intransitive(), checkPom := { diff --git a/sbt/src/sbt-test/project/cross-plugins-defaults/build.sbt b/sbt/src/sbt-test/project/cross-plugins-defaults/build.sbt index a70f0506d..d6045fd01 100644 --- a/sbt/src/sbt-test/project/cross-plugins-defaults/build.sbt +++ b/sbt/src/sbt-test/project/cross-plugins-defaults/build.sbt @@ -1,7 +1,7 @@ val baseSbt = "0.13" -val buildCrossList = List("2.10.6", "2.11.11", "2.12.2") -scalaVersion in ThisBuild := "2.10.6" +val buildCrossList = List("2.10.7", "2.11.11", "2.12.2") +scalaVersion in ThisBuild := "2.10.7" crossScalaVersions in ThisBuild := buildCrossList addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0") diff --git a/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/build.sbt b/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/build.sbt index 264dd3d57..e0849125d 100644 --- a/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/build.sbt +++ b/sbt/src/sbt-test/source-dependencies/macro-arg-dep-nested/build.sbt @@ -1,5 +1,5 @@ val defaultSettings = Seq( - scalaVersion := "2.10.6", + scalaVersion := "2.10.7", libraryDependencies += scalaVersion("org.scala-lang" % "scala-reflect" % _ ).value ) diff --git a/sbt/src/sbt-test/source-dependencies/macro-arg-dep/build.sbt b/sbt/src/sbt-test/source-dependencies/macro-arg-dep/build.sbt index 264dd3d57..e0849125d 100644 --- a/sbt/src/sbt-test/source-dependencies/macro-arg-dep/build.sbt +++ b/sbt/src/sbt-test/source-dependencies/macro-arg-dep/build.sbt @@ -1,5 +1,5 @@ val defaultSettings = Seq( - scalaVersion := "2.10.6", + scalaVersion := "2.10.7", libraryDependencies += scalaVersion("org.scala-lang" % "scala-reflect" % _ ).value ) diff --git a/sbt/src/sbt-test/tests/nested-subproc/build.sbt b/sbt/src/sbt-test/tests/nested-subproc/build.sbt index 7b57c16d7..725fec5e0 100644 --- a/sbt/src/sbt-test/tests/nested-subproc/build.sbt +++ b/sbt/src/sbt-test/tests/nested-subproc/build.sbt @@ -1,6 +1,6 @@ lazy val root = (project in file(".")) .settings( - scalaVersion := "2.10.6", + scalaVersion := "2.10.7", libraryDependencies += "org.scalatest" %% "scalatest" % "2.0.M6-SNAP28", testOptions in Test += Tests.Argument("-r", "custom.CustomReporter"), fork := true, diff --git a/src/main/conscript/scalas/launchconfig b/src/main/conscript/scalas/launchconfig index c44956d4c..e66b92242 100644 --- a/src/main/conscript/scalas/launchconfig +++ b/src/main/conscript/scalas/launchconfig @@ -4,7 +4,7 @@ [app] org: ${sbt.organization-org.scala-sbt} name: sbt - version: ${sbt.version-read(sbt.version)[0.13.17]} + version: ${sbt.version-read(sbt.version)[0.13.18]} class: sbt.ScriptMain components: xsbti,extra cross-versioned: ${sbt.cross.versioned-false} diff --git a/src/main/conscript/screpl/launchconfig b/src/main/conscript/screpl/launchconfig index d0ebde8f0..f7b236153 100644 --- a/src/main/conscript/screpl/launchconfig +++ b/src/main/conscript/screpl/launchconfig @@ -4,7 +4,7 @@ [app] org: ${sbt.organization-org.scala-sbt} name: sbt - version: ${sbt.version-read(sbt.version)[0.13.17]} + version: ${sbt.version-read(sbt.version)[0.13.18]} class: sbt.ConsoleMain components: xsbti,extra cross-versioned: ${sbt.cross.versioned-false} diff --git a/src/main/conscript/xsbt/launchconfig b/src/main/conscript/xsbt/launchconfig index 3e441fd7d..a8539b1f5 100644 --- a/src/main/conscript/xsbt/launchconfig +++ b/src/main/conscript/xsbt/launchconfig @@ -4,7 +4,7 @@ [app] org: ${sbt.organization-org.scala-sbt} name: sbt - version: ${sbt.version-read(sbt.version)[0.13.17]} + version: ${sbt.version-read(sbt.version)[0.13.18]} class: sbt.xMain components: xsbti,extra cross-versioned: ${sbt.cross.versioned-false}