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

drop support for Java 6 #47

Merged
merged 1 commit into from
Apr 18, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 1 addition & 17 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
language: scala

# Needed for openjdk6
dist: precise
sudo: required
addons:
hosts:
- localhost
hostname: localhost.local

env:
global:
# PGP_PASSPHRASE
Expand All @@ -18,20 +10,12 @@ env:
- secure: "E6OE1MoZ4VQHRNtEyyKfmnj8Bj7uGpgHLmlvJR/iy7qdxBbNA8cEz/Qs64uTft5zfZ9bJsQhiuxLcTtFKYKFP4qvExz8FyilhmUwKjD5Eux4FAeBjDBeXBETM1JYFB+JYP9l8dcQecMeGpd46I52pLjYYmNyQQ1YpOvK29GIQLA="

script:
# work around https://github.com/travis-ci/travis-ci/issues/9713
- if [[ $JAVA_HOME = *java-6* ]]; then jdk_switcher use openjdk6; fi
- java -version
- admin/build.sh

addons:
apt:
packages:
- openjdk-6-jdk

jdk:
- openjdk6
- oraclejdk8
- openjdk11

notifications:
email:
- [email protected]
Expand Down
7 changes: 7 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
all repositories in these organizations:

* [scala](https://github.com/scala)
* [scalacenter](https://github.com/scalacenter)
* [lampepfl](https://github.com/lampepfl)

are covered by the Scala Code of Conduct: https://scala-lang.org/conduct/
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -198,4 +198,4 @@
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
limitations under the License.
14 changes: 14 additions & 0 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
Scala continuations
Copyright (c) 2010-2019 EPFL
Copyright (c) 2011-2019 Lightbend, Inc.

Scala includes software developed at
LAMP/EPFL (https://lamp.epfl.ch/) and
Lightbend, Inc. (https://www.lightbend.com/).

Licensed under the Apache License, Version 2.0 (the "License").
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
13 changes: 4 additions & 9 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,12 @@ import ScalaModulePlugin._
// plugin logic of build based on https://github.com/retronym/boxer

scalaVersionsByJvm in ThisBuild := {
val j67 = List("2.11.12")
val j89 = List("2.12.6", "2.12.8", "2.13.0-M1")
val vs = List("2.11.12", "2.12.8")
// Map[JvmVersion, List[(ScalaVersion, UseForPublishing)]]
Map(
6 -> j67.map(_ -> true),
7 -> j67.map(_ -> false),
8 -> j89.map(_ -> true),
9 -> j89.map(_ -> false),
10 -> j89.map(_ -> false),
11 -> j89.map(_ -> false),
12 -> j89.map(_ -> false)
8 -> vs.map(_ -> true),
11 -> vs.map(_ -> false),
12 -> vs.map(_ -> false)
)
}

Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.18
sbt.version=1.2.8
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("org.scala-lang.modules" % "scala-module-plugin" % "1.0.8")
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.0.0")