From 9e79b86d4ae13ffca28283e58c52fb87c2d42ee9 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Fri, 8 Feb 2019 10:37:27 -0800 Subject: [PATCH 1/3] re-enable Scala 2.11 in CI matrix --- .travis.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1e10ce2b..096ea930 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,10 +22,6 @@ env: - SCALAJS_VERSION=1.0.0-M6 matrix: - exclude: - # ? - - jdk: oraclejdk8 - scala: 2.11.12 include: From 91001161e2b530a48a8bc5813ad16c75cf8db22a Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Fri, 8 Feb 2019 10:49:29 -0800 Subject: [PATCH 2/3] rename build command to follow current sbt naming convention --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index d594c7d1..4447a3d4 100644 --- a/build.sbt +++ b/build.sbt @@ -252,7 +252,7 @@ lazy val dontPublish = Seq( publishLocal := {} ) -val preRelease = "pre-release" +val preRelease = "preRelease" val travisScalaVersion = sys.env.get("TRAVIS_SCALA_VERSION").flatMap(Version.parse) val releaseVersion = sys.env.get("TRAVIS_TAG").flatMap(Version.parse) val isScalaJs = sys.env.get("SCALAJS_VERSION").map(_.nonEmpty).getOrElse(false) From cae8b105b27e09df8a3bb7ca9a9bf4f68d2b8f01 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Fri, 8 Feb 2019 10:55:13 -0800 Subject: [PATCH 3/3] fix JDK 11 jobs --- build.sbt | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/build.sbt b/build.sbt index 4447a3d4..aeae1f42 100644 --- a/build.sbt +++ b/build.sbt @@ -287,13 +287,14 @@ inThisBuild( commands += Command.command(preRelease) { state => // Show Compat version, Scala version, and Java Version val jvmVersion = Version.parse(sys.props("java.specification.version")).get.minor - val tagVersion = releaseVersion.get - println( - s"Releasing $tagVersion with Scala ${travisScalaVersion.get} on Java version $jvmVersion.") - - // Copy pgp stuff - "admin/pre-release.sh" ! state.globalLogging.full - + releaseVersion match { + case Some(tagVersion) => + println( + s"Releasing $tagVersion with Scala ${travisScalaVersion.get} on Java version $jvmVersion.") + // Copy pgp stuff + "admin/pre-release.sh" ! state.globalLogging.full + case None => + } state }, commands += Command.command("scalafmt-test") { state =>