Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
karma4u101 committed Jan 28, 2018
2 parents 37c21dc + 8dfc77a commit 16a0da6
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ import LiftModuleKeys.{liftVersion, liftEdition}
//##############

//scalacOptions in Compile ++= Seq("-doc-root-content", "rootdoc.txt")
onLoad in Global := { s => "dependencyUpdates" :: s }
// onLoad in Global := { s => "dependencyUpdates" :: s }

lazy val commonSettings = Seq(
organization := "net.liftmodules",
2 changes: 1 addition & 1 deletion project/autobuildscript/build-publish-Lift30.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
alias pub=publish
alias pub=publishSigned

set LiftModuleKeys.liftVersion in ThisBuild := "3.0.2"
set version in ThisBuild := "2.0"
2 changes: 1 addition & 1 deletion project/autobuildscript/build-publish-Lift31.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
alias pub=publish
alias pub=publishSigned

set LiftModuleKeys.liftVersion in ThisBuild := "3.1.1"
set version in ThisBuild := "2.0"
2 changes: 1 addition & 1 deletion project/autobuildscript/build-publish-Lift32.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
alias pub=publish
alias pub=publishSigned

set LiftModuleKeys.liftVersion in ThisBuild := "3.2.0"
set version in ThisBuild := "2.0"

0 comments on commit 16a0da6

Please sign in to comment.