Merge pull request #136 from alexarchambault/updates

Updates

.travis.sh

@@ -3,15 +3,15 @@ set -e
 
 case "${MASTER:-"local"}" in
   local)
-    ./sbt ++$TRAVIS_SCALA_VERSION'!' publishLocal test mimaReportBinaryIssues ;;
+    ./sbt publishLocal test mimaReportBinaryIssues ;;
   local-distrib)
-    ./with-spark-home.sh ./sbt ++$TRAVIS_SCALA_VERSION'!' publishLocal local-spark-distrib-tests/test ;;
+    ./with-spark-home.sh ./sbt publishLocal local-spark-distrib-tests/test ;;
   standalone)
-    ./with-spark-home.sh ./sbt-with-standalone-cluster.sh ++$TRAVIS_SCALA_VERSION'!' publishLocal standalone-tests/test ;;
+    ./with-spark-home.sh ./sbt-with-standalone-cluster.sh publishLocal standalone-tests/test ;;
   yarn)
-    ./sbt-in-docker-with-yarn-cluster.sh -batch ++$TRAVIS_SCALA_VERSION'!' publishLocal yarn-tests/test ;;
+    ./sbt-in-docker-with-yarn-cluster.sh -batch publishLocal yarn-tests/test ;;
   yarn-distrib)
-    ./with-spark-home.sh ./sbt-in-docker-with-yarn-cluster.sh -batch ++$TRAVIS_SCALA_VERSION'!' publishLocal yarn-spark-distrib-tests/test ;;
+    ./with-spark-home.sh ./sbt-in-docker-with-yarn-cluster.sh -batch publishLocal yarn-spark-distrib-tests/test ;;
   *)
     echo "Unrecognized master type $MASTER"
     exit 1

.travis.yml

@@ -1,7 +1,5 @@
 language: java
 jdk: openjdk8
-before_install:
-  - export TRAVIS_SCALA_VERSION=2.12.10
 script: ./.travis.sh
 cache:
   directories:
@@ -17,10 +15,10 @@ stages:
     if: (branch = master AND type = push) OR (tag IS present)
 jobs:
   include:
-  - env: MASTER=local-distrib
+  # - env: MASTER=local-distrib
   - env: MASTER=local
   - env: MASTER=standalone STANDALONE_CACHE=$HOME/standalone-stuff
-  - env: MASTER=yarn-distrib YARN_CACHE=$HOME/yarn-stuff STANDALONE_CACHE=$HOME/yarn-cache
+  # - env: MASTER=yarn-distrib YARN_CACHE=$HOME/yarn-stuff STANDALONE_CACHE=$HOME/yarn-cache
   - env: MASTER=yarn YARN_CACHE=$HOME/yarn-stuff
   - stage: release
     script: ./sbt ci-release

modules/tests/src/main/scala/ammonite/spark/SparkVersions.scala

@@ -6,6 +6,6 @@ object SparkVersions {
   def latest22 = "2.2.2"
   def latest23 = "2.3.2"
   def latest24 = "2.4.4"
-  def latest30 = "3.0.0-preview"
+  def latest30 = "3.0.0-preview2"
 
 }

modules/tests/src/main/scala/ammonite/spark/fromammonite/TestRepl.scala

@@ -117,15 +117,9 @@ class TestRepl {
     throw e
   }
 
-  val basePredefs = Seq(
-    PredefInfo(
-      Name("defaultPredef"),
-      ammonite.main.Defaults.replPredef + ammonite.main.Defaults.predefString,
-      true,
-      None
-    ),
-    PredefInfo(Name("testPredef"), predef._1, false, predef._2)
-  )
+  val basePredefs =
+    if (predef._1.isEmpty) Nil
+    else Seq(PredefInfo(Name("testPredef"), predef._1, false, predef._2))
 
   for ((error, _) <- interp.initializePredef(basePredefs, Seq(), extraBridges)) {
     val (msgOpt, causeOpt) = error match {

project/Deps.scala

@@ -5,14 +5,14 @@ import sbt.Keys._
 
 object Deps {
 
-  private def ammoniteVersion = "2.1.1"
+  private def ammoniteVersion = "2.1.4"
   def ammoniteReplApi = ("com.lihaoyi" % "ammonite-repl-api" % ammoniteVersion).cross(CrossVersion.full)
   def ammoniteRepl = ("com.lihaoyi" % "ammonite-repl" % ammoniteVersion).cross(CrossVersion.full)
 
   def jettyServer = "org.eclipse.jetty" % "jetty-server" % "9.4.29.v20200521"
   def utest = "com.lihaoyi" %% "utest" % "0.7.4"
 
   def sparkSql = "org.apache.spark" %% "spark-sql" % "2.4.0"
-  def sparkSql3 = "org.apache.spark" %% "spark-sql" % "3.0.0-preview"
+  def sparkSql3 = "org.apache.spark" %% "spark-sql" % "3.0.0-preview2"
 
 }