Skip to content

Commit f5f536a

Browse files
committed
Prepares 4.7.0 with Lagom.
1 parent 0d86197 commit f5f536a

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

uber-build.sh

+13-5
Original file line numberDiff line numberDiff line change
@@ -1085,15 +1085,15 @@ function stepScalaIDE () {
10851085
##################
10861086
# Plugin
10871087
##################
1088-
10891088
# $1 - pretty name
10901089
# $2 - logic name
10911090
# $3 - var prefix
10921091
# $4 - repo dir
10931092
# $5 - git repo
10941093
# $6 - git branch
10951094
# $7 - version tag
1096-
function stepPlugin () {
1095+
# $8 - should set scala version for maven call
1096+
function stepPluginOverScalaVersion () {
10971097
printStep "$1"
10981098

10991099
fetchGitBranch "$4" "$5" "$6" NaN
@@ -1108,17 +1108,22 @@ function stepPlugin () {
11081108

11091109
eval $3_P2_ID=${P2_ID}
11101110

1111+
local SCALA_VERSION_PARAMETER=$8
1112+
if [ -n $SCALA_VERSION_PARAMETER ]
1113+
then
1114+
info "Build with $SCALA_VERSION_PARAMETER"
1115+
fi
1116+
11111117
if ! checkCache ${P2_ID}
11121118
then
11131119
info "Building $1"
11141120

1115-
11161121
mvn ${MAVEN_ARGS[@]} \
11171122
-Dtycho.localArtifacts=ignore \
11181123
-P${ECLIPSE_PROFILE} \
11191124
-P${SCALA_PROFILE} \
11201125
-Drepo.scala-ide=$(getCacheURL ${SCALA_IDE_P2_ID}) \
1121-
-Dscala.version=${FULL_SCALA_VERSION} \
1126+
$SCALA_VERSION_PARAMETER \
11221127
-Dversion.tag=$7 \
11231128
${MAVEN_SIGN_ARGS[@]} \
11241129
dependency:tree \
@@ -1129,6 +1134,9 @@ function stepPlugin () {
11291134
fi
11301135
}
11311136

1137+
function stepPlugin () {
1138+
stepPluginOverScalaVersion "$@" "-Dscala.version=${FULL_SCALA_VERSION}"
1139+
}
11321140
##################
11331141
# ScalaTest
11341142
##################
@@ -1468,7 +1476,7 @@ fi
14681476

14691477
if ${LAGOM_PLUGIN}
14701478
then
1471-
stepPlugin "Lagom" "lagom" "LAGOM_PLUGIN" "${LAGOM_PLUGIN_DIR}" "${LAGOM_PLUGIN_GIT_REPO}" "${LAGOM_PLUGIN_GIT_BRANCH}" "${LAGOM_PLUGIN_VERSION_TAG}"
1479+
stepPluginOverScalaVersion "Lagom" "lagom" "LAGOM_PLUGIN" "${LAGOM_PLUGIN_DIR}" "${LAGOM_PLUGIN_GIT_REPO}" "${LAGOM_PLUGIN_GIT_BRANCH}" "${LAGOM_PLUGIN_VERSION_TAG}"
14721480
fi
14731481

14741482
if ${SEARCH_PLUGIN}

0 commit comments

Comments
 (0)