Skip to content

Commit

Permalink
update scala build toolchain (openlawteam#125)
Browse files Browse the repository at this point in the history
* update scala build toolchain

* add infra to codeowners for toolchain versions
  • Loading branch information
mroth authored and jdville03 committed Sep 12, 2019
1 parent 43bab37 commit 62eae58
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Toolchain and dependency upgrades must be reviewed for infra
build.sbt @openlawteam/infra
project/* @openlawteam/infra
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 9 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 6 additions & 0 deletions project/build.properties
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 62eae58

Please sign in to comment.