From 7195c0cbd1041338021c0813cd96a74940dca43b Mon Sep 17 00:00:00 2001 From: abejgonzalez Date: Thu, 6 May 2021 14:05:59 -0700 Subject: [PATCH] Check for thin client flag | Bump SBT to 1.4.9 --- common.mk | 9 +++++++-- project/build.properties | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/common.mk b/common.mk index ac80af91..a4cb26f2 100644 --- a/common.mk +++ b/common.mk @@ -247,12 +247,17 @@ SBT_COMMAND ?= shell launch-sbt: cd $(base_dir) && $(SBT_NON_THIN) "$(SBT_COMMAND)" +check-thin-client: +ifeq (,$(ENABLE_SBT_THIN_CLIENT)) + $(error ENABLE_SBT_THIN_CLIENT not set.) +endif + .PHONY: shutdown-sbt-server -shutdown-sbt-server: +shutdown-sbt-server: check-thin-client cd $(base_dir) && $(SBT) "shutdown" .PHONY: start-sbt-server -start-sbt-server: +start-sbt-server: check-thin-client cd $(base_dir) && $(SBT) "exit" ######################################################################################### diff --git a/project/build.properties b/project/build.properties index 7de0a938..dbae93bc 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.4.4 +sbt.version=1.4.9