Permalink
Browse files

Merge pull request #954 from coursier/topic/openjdk11

Add openjdk11 jobs on Travis CI
  • Loading branch information...
alexarchambault committed Dec 6, 2018
2 parents 156d1da + 2126841 commit 79c26cf49ddb9eb5172ac8f82ebba06d60842f37
@@ -15,10 +15,18 @@ jobs:
sudo: required
before_install: curl https://raw.githubusercontent.com/scala-native/scala-native/master/scripts/travis_setup.sh | bash -x
services: docker
- env: SCALA_VERSION=2.12
jdk: openjdk11
before_install: ./scripts/setup-sbt-extra.sh
script: bin/sbt scala212 test:compile testsJVM/test
- env: SCALA_VERSION=2.11
sudo: required
services: docker
- env: SCALA_VERSION=2.12 SCALA_JS=1
- env: SCALA_VERSION=2.12 SCALA_JS=1
jdk: openjdk11
before_install: ./scripts/setup-sbt-extra.sh
script: bin/sbt scala212 testsJS/test
- env: SCALA_VERSION=2.11 SCALA_JS=1
- env: PANTS=1 # unused in the script, just to tag the job on the Travis CI UI
# Sanity check for Pants build path.
@@ -392,6 +392,7 @@ lazy val proguardedCli = Seq(
proguardVersion.in(Proguard) := SharedVersions.proguard,
proguardOptions.in(Proguard) ++= Seq(
"-dontwarn",
"-dontnote",
"-dontoptimize", // required since the switch to scala 2.12
"-keep class coursier.cli.Coursier {\n public static void main(java.lang.String[]);\n}",
"-keep class coursier.cli.IsolatedClassLoader {\n public java.lang.String[] getIsolationTargets();\n}",
@@ -135,7 +135,7 @@ class CliBootstrapIntegrationTest extends FlatSpec with CliTestLib {

val zis = new ZipInputStream(new ByteArrayInputStream(actualContent(bootstrapFile)))

val lines = new String(zipEntryContent(zis, resourceDir + "bootstrap-jar-urls"), UTF_8)
val lines = Predef.augmentString(new String(zipEntryContent(zis, resourceDir + "bootstrap-jar-urls"), UTF_8))
.lines
.toVector

@@ -176,8 +176,12 @@ class CliBootstrapIntegrationTest extends FlatSpec with CliTestLib {
def zis = new ZipInputStream(new ByteArrayInputStream(actualContent(bootstrapFile)))

val suffix = if (standalone) "resources" else "urls"
val fooLines = new String(zipEntryContent(zis, resourceDir + s"bootstrap-isolation-foo-jar-$suffix"), UTF_8).lines.toVector
val lines = new String(zipEntryContent(zis, resourceDir + s"bootstrap-jar-$suffix"), UTF_8).lines.toVector
val fooLines = Predef.augmentString(new String(zipEntryContent(zis, resourceDir + s"bootstrap-isolation-foo-jar-$suffix"), UTF_8))
.lines
.toVector
val lines = Predef.augmentString(new String(zipEntryContent(zis, resourceDir + s"bootstrap-jar-$suffix"), UTF_8))
.lines
.toVector

assert(fooLines.exists(_.endsWith("/scalaparse_2.12-0.4.2.jar")))
assert(fooLines.exists(_.endsWith("/scalaparse_2.12-0.4.2-sources.jar")))
@@ -276,7 +280,7 @@ class CliBootstrapIntegrationTest extends FlatSpec with CliTestLib {

val zis = new ZipInputStream(new ByteArrayInputStream(actualContent(bootstrapFile)))

val lines = new String(zipEntryContent(zis, resourceDir + "bootstrap-jar-resources"), UTF_8)
val lines = Predef.augmentString(new String(zipEntryContent(zis, resourceDir + "bootstrap-jar-resources"), UTF_8))
.lines
.toVector

@@ -4,6 +4,6 @@ set -e
export PATH="$(pwd)/bin:$PATH"

mkdir -p bin
curl -L -o bin/sbt https://github.com/paulp/sbt-extras/raw/1d8ee2c0a75374afa1cb687f450aeb095180882b/sbt
curl -L -o bin/sbt https://raw.githubusercontent.com/paulp/sbt-extras/33b1a535656222810572d36d10afc5711515958e/sbt
chmod +x bin/sbt

0 comments on commit 79c26cf

Please sign in to comment.