Skip to content

Commit c89c523

Browse files
authored
Remove play-fork-run.sbt workaround (#280)
1 parent b711e4c commit c89c523

File tree

2 files changed

+2
-16
lines changed

2 files changed

+2
-16
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
## [Unreleased]
44

5+
* Remove automatic deletion of `project/play-fork-run.sbt` files. Maintainers of legacy apps can consult the PR description for background and how to fix their project in the unlikely case it's necessary. ([#280](https://github.com/heroku/heroku-buildpack-scala/pull/280))
56
* Deprecate Scala buildpack configuration via system.properties. A warning is now shown when Scala buildpack configuration properties (like `sbt.clean`, `sbt.project`, etc.) are detected in system.properties. Use environment variables instead. This does not affect `java.runtime.version` which remains supported. ([#279](https://github.com/heroku/heroku-buildpack-scala/pull/279))
67
* Remove partial CNB functionality. ([#276](https://github.com/heroku/heroku-buildpack-scala/pull/276))
78
* Remove Ivy cache priming feature. ([#275](https://github.com/heroku/heroku-buildpack-scala/pull/275))

bin/compile

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,12 @@ util::export_env_dir "${ENV_DIR}" "." "JAVA_OPTS"
5555
# shellcheck disable=SC2034
5656
JVM_COMMON_BUILDPACK="$(config::get "${BUILD_DIR}" "heroku.jvm.buildpack" "JVM_COMMON_BUILDPACK" "https://buildpack-registry.s3.us-east-1.amazonaws.com/buildpacks/heroku/jvm.tgz")"
5757

58-
KEEP_PLAY_FORK_RUN="$(config::get "${BUILD_DIR}" "sbt.keep-play-fork-run" "KEEP_PLAY_FORK_RUN" "false")"
5958
SBT_PROJECT="$(config::get "${BUILD_DIR}" "sbt.project" "SBT_PROJECT")"
6059
SBT_PRE_TASKS="$(config::get "${BUILD_DIR}" "sbt.pre-tasks" "SBT_PRE_TASKS")"
6160
SBT_CLEAN="$(config::get "${BUILD_DIR}" "sbt.clean" "SBT_CLEAN" "false")"
6261

6362
# Track usage of configuration options
64-
for env_var in SBT_PRE_TASKS SBT_PROJECT SBT_TASKS KEEP_PLAY_FORK_RUN KEEP_SBT_CACHE KEEP_COURSIER_CACHE SBT_CLEAN DISABLE_DEPENDENCY_CLASSPATH_LOG; do
63+
for env_var in SBT_PRE_TASKS SBT_PROJECT SBT_TASKS KEEP_SBT_CACHE KEEP_COURSIER_CACHE SBT_CLEAN DISABLE_DEPENDENCY_CLASSPATH_LOG; do
6564
if [[ -n "${!env_var:-}" ]]; then
6665
metrics::set_string "${env_var,,}" "${!env_var}"
6766
fi
@@ -124,20 +123,6 @@ if has_old_preset_sbt_opts; then
124123
EOF
125124
fi
126125

127-
if [[ "${KEEP_PLAY_FORK_RUN}" != "true" ]] && [[ -f project/play-fork-run.sbt ]]; then
128-
output::warning <<-EOF
129-
Removing project/play-fork-run.sbt. This file was probably added
130-
by Activator, and it breaks sbt. For more information see:
131-
https://github.com/typesafehub/activator/issues/979
132-
133-
If you need to keep this file you can either rename it or set the following
134-
configuration variable:
135-
$ heroku config:set KEEP_PLAY_FORK_RUN=true
136-
EOF
137-
138-
rm project/play-fork-run.sbt
139-
fi
140-
141126
SBT_VERSION="$(get_supported_sbt_version "${BUILD_DIR}")"
142127

143128
if [[ -n "${SBT_PROJECT}" ]]; then

0 commit comments

Comments
 (0)