Skip to content

Commit

Permalink
Merge pull request #6 from retronym/topic/jdk8
Browse files Browse the repository at this point in the history
[asm-cherry-pick] [move to start] Use JDK8 to build
  • Loading branch information
retronym authored Jun 7, 2018
2 parents 5207e51 + db110bb commit 29c0456
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 11 deletions.
8 changes: 1 addition & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,7 @@ env:

script: admin/build.sh

# https://github.com/travis-ci/travis-ci/issues/8199#issuecomment-327246053
addons:
apt:
packages:
- openjdk-6-jdk

jdk: openjdk6
jdk: openjdk8

notifications:
email: lukas.rytz@lightbend.com
8 changes: 4 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ git.useGitDescribe := true
scalaVersionsByJvm in ThisBuild := {
val vs = List("2.11.11")
Map(
6 -> vs.map(_ -> true),
6 -> vs.map(_ -> false),
7 -> vs.map(_ -> false),
8 -> vs.map(_ -> false),
8 -> vs.map(_ -> true),
9 -> vs.map(_ -> false))
}

Expand All @@ -37,9 +37,9 @@ autoScalaLibrary := false
// Don't add `_<scala-version>` to the jar file name - it's a Java-only project, no Scala cross-versioning needed
crossPaths := false

javacOptions ++= Seq("-g", "-source", "1.5", "-target", "1.6")
javacOptions ++= Seq("-g", "-source", "1.6", "-target", "1.6")

// javadoc fails if we pass all of the above
javacOptions in doc := Seq("-source", "1.5")
javacOptions in doc := Seq("-source", "1.6")

OsgiKeys.exportPackage := Seq(s"scala.tools.asm.*;version=${version.value}")

0 comments on commit 29c0456

Please sign in to comment.