From 8e91a0666ed81261cff90cc716fcaa338a5641cb Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Thu, 18 Apr 2019 06:29:08 -0700 Subject: [PATCH] drop support for Java 6 since we can no longer securely publish from Java 6, and it's probably time anyway references: https://github.com/scala/sbt-scala-module/issues/41 --- .travis.yml | 18 +----------------- CODE_OF_CONDUCT.md | 7 +++++++ LICENSE | 2 +- NOTICE | 14 ++++++++++++++ build.sbt | 13 ++++--------- project/build.properties | 2 +- project/plugins.sbt | 2 +- 7 files changed, 29 insertions(+), 29 deletions(-) create mode 100644 CODE_OF_CONDUCT.md create mode 100644 NOTICE diff --git a/.travis.yml b/.travis.yml index a8d05e4..96a698c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,5 @@ language: scala -# Needed for openjdk6 -dist: precise -sudo: required -addons: - hosts: - - localhost - hostname: localhost.local - env: global: # PGP_PASSPHRASE @@ -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: - adriaan.moors@lightbend.com diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 0000000..0511f21 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -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/ diff --git a/LICENSE b/LICENSE index f49a4e1..261eeb9 100644 --- a/LICENSE +++ b/LICENSE @@ -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. \ No newline at end of file + limitations under the License. diff --git a/NOTICE b/NOTICE new file mode 100644 index 0000000..12cdab2 --- /dev/null +++ b/NOTICE @@ -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. diff --git a/build.sbt b/build.sbt index ef8135b..a2f6f52 100644 --- a/build.sbt +++ b/build.sbt @@ -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) ) } diff --git a/project/build.properties b/project/build.properties index 8e682c5..c0bab04 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.18 +sbt.version=1.2.8 diff --git a/project/plugins.sbt b/project/plugins.sbt index 293445d..57a656c 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("org.scala-lang.modules" % "scala-module-plugin" % "1.0.8") +addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "2.0.0")