Skip to content

Commit

Permalink
Merge pull request #3 from SethTisue/march-towards-glorious-emoji-future
Browse files Browse the repository at this point in the history
build improvements
  • Loading branch information
wsargent authored Mar 17, 2017
2 parents 6fe4477 + 3e50d66 commit 8c6024e
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 8 deletions.
14 changes: 14 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
sudo: false
cache:
directories:
- $HOME/.ivy2
- $HOME/.sbt/boot
- $HOME/.sbt/launchers
- $HOME/.coursier
jdk: oraclejdk8
language: scala
script:
- sbt test package
before_cache:
- find $HOME/.sbt -name "*.lock" | xargs rm
- find $HOME/.ivy2 -name "ivydata-*.properties" | xargs rm
11 changes: 3 additions & 8 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ organization := "com.typesafe"

version := "1.1.0"

lazy val scala210Version = "2.10.5"
lazy val scala210Version = "2.10.6"
lazy val scala211Version = "2.11.8"
lazy val scala212Version = "2.12.1"

Expand All @@ -22,17 +22,12 @@ publishTo := Some(typesafeIvyReleases)

publishMavenStyle := false

scalacOptions <<= (scalaVersion) map { sv =>
Seq("-unchecked", "-deprecation") ++
{ if (sv.startsWith("2.9")) Seq.empty else Seq("-feature") }
}

javacOptions in (Compile, doc) := Seq("-target", "1.6", "-source", "1.6")
scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature", "-Xfatal-warnings")

licenses += ("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0.html"))

libraryDependencies ++= Seq(
"org.scalatest" %% "scalatest" % "3.0.0" % Test
"org.scalatest" %% "scalatest" % "3.0.1" % Test
)

initialCommands in console := {
Expand Down

0 comments on commit 8c6024e

Please sign in to comment.