Skip to content
This repository was archived by the owner on Jun 23, 2020. It is now read-only.

Commit a08e017

Browse files
authored
Merge pull request #42 from SethTisue/version-bumps
assorted version bumps
2 parents 68e2fa0 + 47caeb1 commit a08e017

File tree

3 files changed

+18
-8
lines changed

3 files changed

+18
-8
lines changed

.travis.yml

+13-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
language: scala
22

3+
# Needed for openjdk6
4+
dist: precise
5+
sudo: required
6+
addons:
7+
hosts:
8+
- localhost
9+
hostname: localhost.local
10+
311
env:
412
global:
513
# PGP_PASSPHRASE
@@ -9,11 +17,10 @@ env:
917
# SONA_PASS
1018
- secure: "E6OE1MoZ4VQHRNtEyyKfmnj8Bj7uGpgHLmlvJR/iy7qdxBbNA8cEz/Qs64uTft5zfZ9bJsQhiuxLcTtFKYKFP4qvExz8FyilhmUwKjD5Eux4FAeBjDBeXBETM1JYFB+JYP9l8dcQecMeGpd46I52pLjYYmNyQQ1YpOvK29GIQLA="
1119

12-
before_install:
13-
- sudo hostname "$(hostname | cut -c1-63)"
14-
- sed -e "s/^\\(127\\.0\\.0\\.1.*\\)/\\1 $(hostname | cut -c1-63)/" /etc/hosts > /tmp/hosts
15-
- sudo mv /tmp/hosts /etc/hosts
1620
script:
21+
# work around https://github.com/travis-ci/travis-ci/issues/9713
22+
- if [[ $JAVA_HOME = *java-6* ]]; then jdk_switcher use openjdk6; fi
23+
- java -version
1724
- admin/build.sh
1825

1926
addons:
@@ -24,7 +31,9 @@ addons:
2431
jdk:
2532
- openjdk6
2633
- oraclejdk8
34+
- openjdk11
2735
notifications:
2836
email:
2937
3038
39+

build.sbt

+4-3
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,17 @@ import ScalaModulePlugin._
44
// plugin logic of build based on https://github.com/retronym/boxer
55

66
scalaVersionsByJvm in ThisBuild := {
7-
val j67 = List("2.11.8", "2.11.11")
8-
val j89 = List("2.12.0", "2.12.1", "2.12.2", "2.13.0-M1")
7+
val j67 = List("2.11.12")
8+
val j89 = List("2.12.6", "2.12.8", "2.13.0-M1")
99
// Map[JvmVersion, List[(ScalaVersion, UseForPublishing)]]
1010
Map(
1111
6 -> j67.map(_ -> true),
1212
7 -> j67.map(_ -> false),
1313
8 -> j89.map(_ -> true),
1414
9 -> j89.map(_ -> false),
1515
10 -> j89.map(_ -> false),
16-
11 -> j89.map(_ -> false)
16+
11 -> j89.map(_ -> false),
17+
12 -> j89.map(_ -> false)
1718
)
1819
}
1920

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.17
1+
sbt.version=0.13.18

0 commit comments

Comments
 (0)