From bea3fac13ed27f8a8e0733ff1e139fde5335e49b Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Mon, 22 Aug 2016 11:25:30 +0100 Subject: [PATCH 1/4] Misc email/URL updates --- .travis.yml | 2 +- README.md | 2 +- build.sbt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index aa8cfbbd0..5cc2bc743 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ jdk: - openjdk6 notifications: email: - - qbranch@typesafe.com + - sbt-dev-bot@googlegroups.com before_install: - cat /etc/hosts # optionally check the content *before* - sudo hostname "$(hostname | cut -c1-63)" diff --git a/README.md b/README.md index 8d55860a2..76a62c377 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ sbt: the launcher ================== -An alternative script for running [sbt](https://github.com/harrah/xsbt). +An alternative script for running [sbt](https://github.com/sbt/sbt). It works with sbt 0.7.x projects as well as 0.10+. If you're in an sbt project directory, the runner will figure out the versions of sbt and scala required by the project and download them if necessary. diff --git a/build.sbt b/build.sbt index 39514c050..71f16dd60 100644 --- a/build.sbt +++ b/build.sbt @@ -50,7 +50,7 @@ val root = (project in file(".")). file }, // GENERAL LINUX PACKAGING STUFFS - maintainer := "Eugene Yokota ", + maintainer := "Eugene Yokota ", packageSummary := "sbt, the interactive build tool", packageDescription := """This script provides a native way to run sbt, a build tool for Scala and more.""", From cffb8e044173210e1abd6a535aa04dd6e0926ea0 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Mon, 22 Aug 2016 11:33:23 +0100 Subject: [PATCH 2/4] Upgrade to sbt-native-packager 1.1.1. Fixes #76. The upgrade includes this fix https://github.com/sbt/sbt-native-packager/pull/169 --- build.sbt | 8 ++------ project/project/plugins.scala | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/build.sbt b/build.sbt index 71f16dd60..9148dc361 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,4 @@ -import com.typesafe.sbt.packager.Keys._ -import com.typesafe.sbt.SbtNativePackager._ -import util.control.Exception.catching +import scala.util.control.Exception.catching import _root_.bintray.InternalBintrayKeys._ import _root_.bintray.{BintrayRepo, Bintray} @@ -25,15 +23,13 @@ val windowsBuildId = settingKey[Int]("build id for Windows installer") // This build creates a SBT plugin with handy features *and* bundles the SBT script for distribution. val root = (project in file(".")). + enablePlugins(UniversalPlugin, LinuxPlugin, DebianPlugin, RpmPlugin, WindowsPlugin). settings( organization := "org.scala-sbt", name := "sbt-launcher-packaging", version := "0.1.0", crossTarget <<= target, - packagerSettings, deploymentSettings, - mapGenericFilesToLinux, - mapGenericFilesToWindows, publishToSettings, sbtLaunchJarUrl := downloadUrlForVersion(sbtVersionToRelease), sbtLaunchJarLocation <<= target apply (_ / "sbt-launch.jar"), diff --git a/project/project/plugins.scala b/project/project/plugins.scala index ddc50a0f4..44a311937 100644 --- a/project/project/plugins.scala +++ b/project/project/plugins.scala @@ -6,7 +6,7 @@ object PluginBuild extends Build { val root = Project("root", file(".")) settings( resolvers += Resolver.url("scalasbt", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases"))(Resolver.ivyStylePatterns), - addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "0.6.3"), + addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.1.1"), libraryDependencies += "net.databinder" %% "dispatch-http" % "0.8.10" ) //dependsOn(nativePackager) From acc734e66960e82bd5ed50b9a8e2f71d897344db Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Mon, 22 Aug 2016 12:13:25 +0100 Subject: [PATCH 3/4] Switch Travis to Oracle JDK 7 .. required by the newer sbt-native-packager. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5cc2bc743..fce30a8be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ script: scala: - 2.10.3 jdk: - - openjdk6 + - oraclejdk7 notifications: email: - sbt-dev-bot@googlegroups.com From a1e1a570e0b7e45c8d8a215f10c84ef891581f85 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Mon, 22 Aug 2016 12:22:29 +0100 Subject: [PATCH 4/4] Add sbt.build.version from CONTRIBUTING to Travis config --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fce30a8be..e8c434f57 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: scala script: - - sbt ++$TRAVIS_SCALA_VERSION rpm:packageBin debian:packageBin universal:packageBin + - sbt -Dsbt.build.version=1.0.0-M1 ++$TRAVIS_SCALA_VERSION rpm:packageBin debian:packageBin universal:packageBin scala: - 2.10.3 jdk: