Skip to content

Commit 1ad8599

Browse files
committed
Remove further occurrences of zinc configuration
This code should no longer be needed because we no longer have to build zinc.
1 parent 207c876 commit 1ad8599

File tree

1 file changed

+0
-10
lines changed

1 file changed

+0
-10
lines changed

Diff for: uber-build.sh

-10
Original file line numberDiff line numberDiff line change
@@ -698,12 +698,6 @@ function stepCheckConfiguration () {
698698
checkParameters "SCALA_GIT_REPO" "SCALA_GIT_HASH" "SCALA_DIR"
699699
fi
700700

701-
checkParameters "ZINC_BUILD_DIR"
702-
if [ -n "${prRepoUrl}" ]
703-
then
704-
ZINC_BUILD_ARGS="-DprRepoUrl=${prRepoUrl}"
705-
fi
706-
707701
if ${IDE_BUILD}
708702
then
709703
checkParameters "ECLIPSE_PLATFORM"
@@ -983,10 +977,6 @@ function stepScala () {
983977
then
984978
# for releases, against released version of Scala, we should be able to recreate the file
985979
SCALA_VERSIONS_PROPERTIES_PATH=$(extrapolateVersionPropertiesFile)
986-
else
987-
# otherwise, use a fixed file
988-
# TODO: see with the Scala team how they could package this file somewhere we can access for nightly builds
989-
SCALA_VERSIONS_PROPERTIES_PATH="${ZINC_DIR}/versions-${SHORT_SCALA_VERSION}.properties"
990980
fi
991981
fi
992982

0 commit comments

Comments
 (0)