File tree 1 file changed +13
-5
lines changed
1 file changed +13
-5
lines changed Original file line number Diff line number Diff line change @@ -1085,15 +1085,15 @@ function stepScalaIDE () {
1085
1085
# #################
1086
1086
# Plugin
1087
1087
# #################
1088
-
1089
1088
# $1 - pretty name
1090
1089
# $2 - logic name
1091
1090
# $3 - var prefix
1092
1091
# $4 - repo dir
1093
1092
# $5 - git repo
1094
1093
# $6 - git branch
1095
1094
# $7 - version tag
1096
- function stepPlugin () {
1095
+ # $8 - should set scala version for maven call
1096
+ function stepPluginOverScalaVersion () {
1097
1097
printStep " $1 "
1098
1098
1099
1099
fetchGitBranch " $4 " " $5 " " $6 " NaN
@@ -1108,17 +1108,22 @@ function stepPlugin () {
1108
1108
1109
1109
eval $3 _P2_ID=${P2_ID}
1110
1110
1111
+ local SCALA_VERSION_PARAMETER=$8
1112
+ if [ -n $SCALA_VERSION_PARAMETER ]
1113
+ then
1114
+ info " Build with $SCALA_VERSION_PARAMETER "
1115
+ fi
1116
+
1111
1117
if ! checkCache ${P2_ID}
1112
1118
then
1113
1119
info " Building $1 "
1114
1120
1115
-
1116
1121
mvn ${MAVEN_ARGS[@]} \
1117
1122
-Dtycho.localArtifacts=ignore \
1118
1123
-P${ECLIPSE_PROFILE} \
1119
1124
-P${SCALA_PROFILE} \
1120
1125
-Drepo.scala-ide=$( getCacheURL ${SCALA_IDE_P2_ID} ) \
1121
- -Dscala.version= ${FULL_SCALA_VERSION} \
1126
+ $SCALA_VERSION_PARAMETER \
1122
1127
-Dversion.tag=$7 \
1123
1128
${MAVEN_SIGN_ARGS[@]} \
1124
1129
dependency:tree \
@@ -1129,6 +1134,9 @@ function stepPlugin () {
1129
1134
fi
1130
1135
}
1131
1136
1137
+ function stepPlugin () {
1138
+ stepPluginOverScalaVersion " $@ " " -Dscala.version=${FULL_SCALA_VERSION} "
1139
+ }
1132
1140
# #################
1133
1141
# ScalaTest
1134
1142
# #################
1468
1476
1469
1477
if ${LAGOM_PLUGIN}
1470
1478
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} "
1472
1480
fi
1473
1481
1474
1482
if ${SEARCH_PLUGIN}
You can’t perform that action at this time.
0 commit comments