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

Commit 151a50d

Browse files
authored
Merge pull request #47 from SethTisue/drop-openjdk6
drop support for Java 6
2 parents 3209f04 + 8e91a06 commit 151a50d

File tree

7 files changed

+29
-29
lines changed

7 files changed

+29
-29
lines changed

.travis.yml

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
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-
113
env:
124
global:
135
# PGP_PASSPHRASE
@@ -18,20 +10,12 @@ env:
1810
- secure: "E6OE1MoZ4VQHRNtEyyKfmnj8Bj7uGpgHLmlvJR/iy7qdxBbNA8cEz/Qs64uTft5zfZ9bJsQhiuxLcTtFKYKFP4qvExz8FyilhmUwKjD5Eux4FAeBjDBeXBETM1JYFB+JYP9l8dcQecMeGpd46I52pLjYYmNyQQ1YpOvK29GIQLA="
1911

2012
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
2413
- admin/build.sh
2514

26-
addons:
27-
apt:
28-
packages:
29-
- openjdk-6-jdk
30-
3115
jdk:
32-
- openjdk6
3316
- oraclejdk8
3417
- openjdk11
18+
3519
notifications:
3620
email:
3721

CODE_OF_CONDUCT.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
all repositories in these organizations:
2+
3+
* [scala](https://github.com/scala)
4+
* [scalacenter](https://github.com/scalacenter)
5+
* [lampepfl](https://github.com/lampepfl)
6+
7+
are covered by the Scala Code of Conduct: https://scala-lang.org/conduct/

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,4 +198,4 @@
198198
distributed under the License is distributed on an "AS IS" BASIS,
199199
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200200
See the License for the specific language governing permissions and
201-
limitations under the License.
201+
limitations under the License.

NOTICE

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
Scala continuations
2+
Copyright (c) 2010-2019 EPFL
3+
Copyright (c) 2011-2019 Lightbend, Inc.
4+
5+
Scala includes software developed at
6+
LAMP/EPFL (https://lamp.epfl.ch/) and
7+
Lightbend, Inc. (https://www.lightbend.com/).
8+
9+
Licensed under the Apache License, Version 2.0 (the "License").
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.

build.sbt

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,12 @@ 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.12")
8-
val j89 = List("2.12.6", "2.12.8", "2.13.0-M1")
7+
val vs = List("2.11.12", "2.12.8")
98
// Map[JvmVersion, List[(ScalaVersion, UseForPublishing)]]
109
Map(
11-
6 -> j67.map(_ -> true),
12-
7 -> j67.map(_ -> false),
13-
8 -> j89.map(_ -> true),
14-
9 -> j89.map(_ -> false),
15-
10 -> j89.map(_ -> false),
16-
11 -> j89.map(_ -> false),
17-
12 -> j89.map(_ -> false)
10+
8 -> vs.map(_ -> true),
11+
11 -> vs.map(_ -> false),
12+
12 -> vs.map(_ -> false)
1813
)
1914
}
2015

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.18
1+
sbt.version=1.2.8

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
addSbtPlugin("org.scala-lang.modules" % "scala-module-plugin" % "1.0.8")
1+
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.0.0")

0 commit comments

Comments
 (0)