diff --git a/.travis.yml b/.travis.yml index 0790764..cfd9dd6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,36 +1,23 @@ +version: ~> 1.0 # needed for imports + +import: scala/scala-dev:travis/default.yml + language: scala scala: - - 2.13.0 + - 2.13.1 env: - - SCALAJS_VERSION= ADOPTOPENJDK=8 - - SCALAJS_VERSION=0.6.31 ADOPTOPENJDK=8 - - SCALAJS_VERSION=1.0.0-RC2 ADOPTOPENJDK=8 - - SCALAJS_VERSION= ADOPTOPENJDK=11 - -before_install: - # adding $HOME/.sdkman to cache would create an empty directory, which interferes with the initial installation - - "[[ -d $HOME/.sdkman/bin ]] || rm -rf $HOME/.sdkman/" - - curl -sL https://get.sdkman.io | bash - - echo sdkman_auto_answer=true > $HOME/.sdkman/etc/config - - source "$HOME/.sdkman/bin/sdkman-init.sh" + - ADOPTOPENJDK=8 SCALAJS_VERSION= + - ADOPTOPENJDK=8 SCALAJS_VERSION=0.6.31 + - ADOPTOPENJDK=8 SCALAJS_VERSION=1.0.0-RC2 + - ADOPTOPENJDK=11 SCALAJS_VERSION= install: - - sdk install java $(sdk list java | grep -o "$ADOPTOPENJDK\.[0-9\.]*hs-adpt" | head -1) - - unset JAVA_HOME - - java -Xmx32m -version - git fetch --tags # get all tags for sbt-dynver script: ./build.sh -before_cache: - - rm -f $HOME/.ivy2/.sbt.ivy.lock - - find $HOME/.ivy2/cache -name "ivydata-*.properties" | xargs rm - - find $HOME/.sbt -name "*.lock" | xargs rm -cache: - directories: - - $HOME/.ivy2/cache - - $HOME/.sbt - - $HOME/.cache/coursier - - $HOME/.sdkman +notifications: + email: + - seth.tisue@lightbend.com diff --git a/build.sbt b/build.sbt index 60685fb..637efbc 100644 --- a/build.sbt +++ b/build.sbt @@ -20,7 +20,9 @@ lazy val collectionContrib = crossProject(JVMPlatform, JSPlatform) "junit" % "junit" % "4.12" % Test, "com.novocode" % "junit-interface" % "0.11" % Test, "org.openjdk.jol" % "jol-core" % "0.9" % Test - ) + ), + // https://github.com/sbt/sbt/issues/5043 + useCoursier := false ) .jvmSettings( scalaModuleMimaPreviousVersion := Some("0.1.0"), // why only in jvmSettings? diff --git a/project/build.properties b/project/build.properties index 5cad107..6624da7 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,2 +1 @@ -# Not 1.3.0 due to https://github.com/sbt/sbt/issues/5043 sbt.version=1.3.5