Skip to content

Commit 29c0456

Browse files
authored
Merge pull request #6 from retronym/topic/jdk8
[asm-cherry-pick] [move to start] Use JDK8 to build
2 parents 5207e51 + db110bb commit 29c0456

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

.travis.yml

+1-7
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,7 @@ env:
1111

1212
script: admin/build.sh
1313

14-
# https://github.com/travis-ci/travis-ci/issues/8199#issuecomment-327246053
15-
addons:
16-
apt:
17-
packages:
18-
- openjdk-6-jdk
19-
20-
jdk: openjdk6
14+
jdk: openjdk8
2115

2216
notifications:
2317

build.sbt

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ git.useGitDescribe := true
2525
scalaVersionsByJvm in ThisBuild := {
2626
val vs = List("2.11.11")
2727
Map(
28-
6 -> vs.map(_ -> true),
28+
6 -> vs.map(_ -> false),
2929
7 -> vs.map(_ -> false),
30-
8 -> vs.map(_ -> false),
30+
8 -> vs.map(_ -> true),
3131
9 -> vs.map(_ -> false))
3232
}
3333

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

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

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

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

0 commit comments

Comments
 (0)