Skip to content

Commit

Permalink
Merge pull request #32 from karma4u101/31-release_v2.10_for_lift_3.2
Browse files Browse the repository at this point in the history
Release v2.10 for Lift 3.2
  • Loading branch information
karma4u101 authored Sep 24, 2017
2 parents 044f27e + 7bdb366 commit 829754f
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 2 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ Update log

For update history see the [History log](https://github.com/karma4u101/lift-jquery-module#history-log) section

**Latest Stable Releases:**
**Latest Releases:**
- **2017-09-24** -- Module v2.10 artifact released for Lift 3.2 (Scala 2.11, 2.12)
- **2017-06-30** -- Module v2.10 artifact released for Lift 3.1 (Scala 2.11, 2.12)
- **2016-12-14** -- Module v2.10 artifact released for Lift 3.0.1 (Scala 2.12)
- **2016-06-31** -- Module v2.10 artifact released for Lift 2.6.2 (Scala 2.11,2.10,2.9.2,2.9.1-1,2.9.1), 3.0 (Scala 2.11)
Expand Down
2 changes: 1 addition & 1 deletion project/autobuildscript/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ To publish use the publish.sh script, to change to a local publish replace 'publ

As of v2.9 builds against Lift 2.5 is no longer supported.

./project/autobuildscript/publish.sh -t [2.5,2.6,3.0,3.1]
./project/autobuildscript/publish.sh -t [2.5,2.6,3.0,3.1,3.2]

The build script will make sure the correct JDK is set and execute one of the following
sbt command files depending on chosen input (target) parameter.
Expand Down
22 changes: 22 additions & 0 deletions project/autobuildscript/build-publish-Lift32.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
alias pub=publish-signed

set version in ThisBuild:="2.10"

set liftVersion in ThisBuild:="3.2.0-SNAPSHOT"

set scalaVersion in ThisBuild:="2.12.2"

project lift-jquery-module
set parallelExecution in Test := false
clean
; compile ; test ; pub

set scalaVersion in ThisBuild:="2.11.11"

project lift-jquery-module
set parallelExecution in Test := false
clean
; compile ; test ; pub



15 changes: 15 additions & 0 deletions project/autobuildscript/publish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ PUBLISH_25_SBT_COMMAND_FILE=${PWD}/project/autobuildscript/build-publish-Lift25.
PUBLISH_26_SBT_COMMAND_FILE=${PWD}/project/autobuildscript/build-publish-Lift26.txt
PUBLISH_30_SBT_COMMAND_FILE=${PWD}/project/autobuildscript/build-publish-Lift30.txt
PUBLISH_31_SBT_COMMAND_FILE=${PWD}/project/autobuildscript/build-publish-Lift31.txt
PUBLISH_32_SBT_COMMAND_FILE=${PWD}/project/autobuildscript/build-publish-Lift32.txt
#default location's for java on a ubuntu system
JAVA_6_PATH=/usr/lib/jvm/java-6-oracle/jre/bin/java
JAVA_7_PATH=/usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java
Expand Down Expand Up @@ -128,6 +129,18 @@ function do31Publish {
debug "\n***...done processing the sbt command file***\n"
}

#Execute the necessary steps for publishing a Lift 3.2 module build
function do32Publish {
debug "\nTarget is set to Lift v3.2, require java-8";
if ! requiredJavaIsSuccessfullySet $JAVA_8_PATH ; then
die "java-8 dosen't seem to be present, cancelling release build!"
fi
debug "Current java environment is java-8\n"
debug "\n***Start processing the sbt command file.***\n"
sbt < $PUBLISH_32_SBT_COMMAND_FILE 2>&1|tee ${LOG_FILE}
debug "\n***...done processing the sbt command file***\n"
}

function runMain {
if [ $LIFT_TARGET == "2.5" ]; then {
do25Publish
Expand All @@ -137,6 +150,8 @@ function runMain {
do30Publish
} elif [ $LIFT_TARGET == "3.1" ]; then {
do31Publish
} elif [ $LIFT_TARGET == "3.2" ]; then {
do32Publish
} else
echo -e "\nNo target set! You need to specify a Lift version as target.\nUsage ./project/autobuildscript/publish.sh -t [2.5,2.6,3.x]\n";
fi
Expand Down

0 comments on commit 829754f

Please sign in to comment.