From 62eae580de0c59507fef71f5109e569c52b38a05 Mon Sep 17 00:00:00 2001
From: Matthew Rothenberg <mroth@openlaw.io>
Date: Thu, 12 Sep 2019 14:27:46 -0400
Subject: [PATCH] update scala build toolchain (#125)

* update scala build toolchain

* add infra to codeowners for toolchain versions
---
 .github/CODEOWNERS       |  3 +++
 Dockerfile               |  2 +-
 build.sbt                | 10 +++++++++-
 project/build.properties |  6 ++++++
 4 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 .github/CODEOWNERS

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 0000000..c5aa5d1
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,3 @@
+# Toolchain and dependency upgrades must be reviewed for infra
+build.sbt   @openlawteam/infra
+project/*   @openlawteam/infra
diff --git a/Dockerfile b/Dockerfile
index 80d467e..fd674da 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # The scala-builder stage compiles Openlaw.scala into JavaScript output,
 # via the ScalaJS stuff. There are some other sbt dependencies that also
 # get bundled up into the output, including openlaw-core.
-FROM openlaw/scala-builder:node as builder
+FROM openlaw/scala-builder:0.10.0-node as builder
 # 1. install plugins and dependencies.
 # 
 # we do this in two different stages to take advantage of layer caching, with
diff --git a/build.sbt b/build.sbt
index 4349f70..b2f52dd 100644
--- a/build.sbt
+++ b/build.sbt
@@ -2,7 +2,15 @@ import scala.language.postfixOps
 
 licenses += ("Apache-2.0", url("https://opensource.org/licenses/Apache-2.0"))
 
-lazy val scalaV = "2.12.8"
+/*
+The Scala and SBT versions must be matched to the version of scala-builder used
+as the base image of the container. We try to standardize across projects and
+always upgrade in a controlled fashion.
+
+If you wish to update either Scala or SBT, please open an issue and and tag
+@openlawteam/infra.
+*/
+lazy val scalaV = "2.12.10"
 
 lazy val repositories = Seq(
   Resolver.jcenterRepo,
diff --git a/project/build.properties b/project/build.properties
index 1fc4b80..ba865db 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1,7 @@
+# The Scala and SBT versions must be matched to the version of scala-builder
+# used as the base image of the container. We try to standardize across projects
+# and always upgrade in a controlled fashion.
+#
+# If you wish to update either Scala or SBT, please open an issue and and tag
+# @openlawteam/infra.
 sbt.version=1.2.8
\ No newline at end of file