Merge branch 'develop'

karma4u101 · karma4u101 · commit 16a0da61fdd3 · 2018-01-28T17:05:39.000+01:00
diff --git a/build.sbt b/build.sbt
@@ -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",
diff --git a/project/autobuildscript/build-publish-Lift30.txt b/project/autobuildscript/build-publish-Lift30.txt
@@ -1,4 +1,4 @@
-alias pub=publish
+alias pub=publishSigned
 
 set LiftModuleKeys.liftVersion in ThisBuild := "3.0.2"
 set version                    in ThisBuild := "2.0"
diff --git a/project/autobuildscript/build-publish-Lift31.txt b/project/autobuildscript/build-publish-Lift31.txt
@@ -1,4 +1,4 @@
-alias pub=publish
+alias pub=publishSigned
 
 set LiftModuleKeys.liftVersion in ThisBuild := "3.1.1"
 set version                    in ThisBuild := "2.0"
diff --git a/project/autobuildscript/build-publish-Lift32.txt b/project/autobuildscript/build-publish-Lift32.txt
@@ -1,4 +1,4 @@
-alias pub=publish
+alias pub=publishSigned
 
 set LiftModuleKeys.liftVersion in ThisBuild := "3.2.0"
 set version                    in ThisBuild := "2.0"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-alias pub=publish`
	`1`	`+alias pub=publishSigned`
`2`	`2`
`3`	`3`	`set LiftModuleKeys.liftVersion in ThisBuild := "3.0.2"`
`4`	`4`	`set version in ThisBuild := "2.0"`