Add scala 2.12.12 support (#612)

almond-sh · Jul 15, 2020 · f7f0240 · f7f0240
1 parent 511f16c
commit f7f0240
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -40,9 +40,9 @@ jobs:
       - pip3 -V
       - sudo pip3 install -r examples/requirements.txt
     script: scripts/setup-and-validate-examples.sh
-  - scala: 2.12.10
-  - scala: 2.12.11
   - scala: 2.12.11
+  - scala: 2.12.12
+  - scala: 2.12.12
     jdk: openjdk11
   - scala: 2.13.2
   - scala: 2.13.3

diff --git a/appveyor.yml b/appveyor.yml
@@ -15,7 +15,7 @@ install:
   - "python -m pip install jupyter" # TODO freeze that for better reproducibility?
 environment:
   PYTHON: C:\Miniconda37-x64
-  TEST_SCALA_VERSION: 2.12.11
+  TEST_SCALA_VERSION: 2.12.12
   TEST_ALMOND_VERSION: 0.1.1-local
 
 build_script:

diff --git a/build.sbt b/build.sbt
@@ -132,6 +132,13 @@ lazy val `scala-kernel-api` = project
         previous.filter(mod => mod.revision != "0.9.0" && mod.revision != "0.9.1")
       else if (sv == "2.13.3")
         previous.filter(mod => !mod.revision.startsWith("0.9.") && mod.revision != "0.10.0")
+      else if (sv == "2.12.12")
+        previous.filter { mod =>
+          !mod.revision.startsWith("0.9.") &&
+            mod.revision != "0.10.0" &&
+            mod.revision != "0.10.1" &&
+            mod.revision != "0.10.2"
+        }
       else
         previous
     },

diff --git a/examples/displays.ipynb b/examples/displays.ipynb
@@ -156,7 +156,7 @@
    "mimetype": "text/x-scala",
    "name": "scala",
    "nbconvert_exporter": "script",
-   "version": "2.12.11"
+   "version": "2.12.12"
   }
  },
  "nbformat": 4,

diff --git a/examples/plotly-scala.ipynb b/examples/plotly-scala.ipynb
@@ -1975,7 +1975,7 @@
    "mimetype": "text/x-scala",
    "name": "scala",
    "nbconvert_exporter": "script",
-   "version": "2.12.11"
+   "version": "2.12.12"
   }
  },
  "nbformat": 4,

diff --git a/examples/test.ipynb b/examples/test.ipynb
@@ -40,7 +40,7 @@
    "mimetype": "text/x-scala",
    "name": "scala",
    "nbconvert_exporter": "script",
-   "version": "2.12.11"
+   "version": "2.12.12"
   }
  },
  "nbformat": 4,

diff --git a/project/Settings.scala b/project/Settings.scala
@@ -8,7 +8,7 @@ import sbt.Keys._
 
 object Settings {
 
-  def scala212 = "2.12.11"
+  def scala212 = "2.12.12"
   def scala213 = "2.13.3"
 
   lazy val isAtLeast212 = Def.setting {
@@ -49,7 +49,7 @@ object Settings {
 
   lazy val shared = Seq(
     scalaVersion := scala213,
-    crossScalaVersions := Seq(scala213, "2.13.2", "2.13.1", "2.13.0", scala212, "2.12.10", "2.12.9", "2.12.8"),
+    crossScalaVersions := Seq(scala213, "2.13.2", "2.13.1", "2.13.0", scala212, "2.12.11", "2.12.10", "2.12.9", "2.12.8"),
     scalacOptions ++= Seq(
       // see http://tpolecat.github.io/2017/04/25/scalac-flags.html
       "-deprecation",

diff --git a/scripts/setup-and-validate-examples.sh b/scripts/setup-and-validate-examples.sh
@@ -7,7 +7,7 @@ export FORCE_SIMPLE_VERSION=1
 
 # let's switch back to the default scala version once the libs in the
 # examples are fine with 2.13.0
-sbt ++2.12.11 \
+sbt ++2.12.12 \
   interpreter-api/exportVersions \
   publishLocal