Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Cross build using sbt 0.13.16 #102

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
language: scala
scala:
- 2.10.6
jdk:
- openjdk7
jdk: oraclejdk8

before_script:
- export PATH=$PATH:$HOME/bin/

script:
- sbt ++$TRAVIS_SCALA_VERSION --warn update compile scripted make-site
- sbt --warn ";$SBT_CROSS_ENV update; compile; scripted; make-site"

sudo: false
dist: trusty
env:
matrix:
- SBT_CROSS_ENV=""
- SBT_CROSS_ENV="^^1.0.0-RC3;"

addons:
apt:
Expand Down
22 changes: 10 additions & 12 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,21 @@ licenses += ("BSD 3-Clause", url("http://opensource.org/licenses/BSD-3-Clause"))
scmInfo := Some(ScmInfo(url("https://github.com/sbt/sbt-site"), "git@github.com:sbt/sbt-site.git"))
//#scm-info

scalaVersion := "2.10.6"

scalaVersion in Global := "2.10.6"

scalacOptions ++= Seq("-deprecation", "-unchecked")

resolvers += Resolver.sonatypeRepo("releases")

val unfilteredVersion = "0.9.1"

libraryDependencies ++= Seq(
"net.databinder" %% "unfiltered-directives" % "0.8.4",
"net.databinder" %% "unfiltered-filter" % "0.8.4",
"net.databinder" %% "unfiltered-jetty" % "0.8.4",
"net.databinder" %% "unfiltered-specs2" % "0.8.4" % "test",
"org.foundweekends" %% "pamflet-library" % "0.7.1",
"org.yaml" % "snakeyaml" % "1.13",
"com.typesafe" % "config" % "1.2.1", // Last version to support Java 1.6
"org.asciidoctor" % "asciidoctorj" % "1.5.4"
"ws.unfiltered" %% "unfiltered-directives" % unfilteredVersion,
"ws.unfiltered" %% "unfiltered-filter" % unfilteredVersion,
"ws.unfiltered" %% "unfiltered-jetty" % unfilteredVersion,
"ws.unfiltered" %% "unfiltered-specs2" % unfilteredVersion % Test,
"org.foundweekends" %% "pamflet-library" % "0.7.1",
"org.yaml" % "snakeyaml" % "1.13",
"com.typesafe" % "config" % "1.2.1", // Last version to support Java 1.6
"org.asciidoctor" % "asciidoctorj" % "1.5.4"
)

addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.2.12")
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=0.13.15
sbt.version=0.13.16
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ object SphinxPlugin extends AutoPlugin {
}

def defaultVersionProperties(version: String) = {
val binV = CrossVersion.binaryVersion(version, "")
val binV = CrossVersion.binarySbtVersion(version)
Map("version" -> binV, "release" -> version)
}

Expand Down