Skip to content

[asm-cherry-pick] [move to start] Use JDK8 to build #6

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jun 7, 2018
Merged

[asm-cherry-pick] [move to start] Use JDK8 to build #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 1 addition & 7 deletions .travis.yml
View file
Open in desktop
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
View file
Open in desktop
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}")