Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Move to SBT 0.12.0-M2

  • Loading branch information...
commit 32e68481c82cfb7a393c7c1035e7f1219451a548 1 parent 379670c
@indrajitr indrajitr authored
View
12 build.sbt
@@ -19,17 +19,11 @@ libraryDependencies in ThisBuild <++= scalaVersion { sv => Seq(specs, scalacheck
// Settings for Sonatype compliance
pomIncludeRepository in ThisBuild := { _ => false }
-publishTo in ThisBuild <<= isSnapshot(if (_) Some(PublishRepo.Snapshot) else Some(PublishRepo.Staging))
+publishTo in ThisBuild <<= isSnapshot(if (_) Some(Opts.resolver.sonatypeSnapshots) else Some(Opts.resolver.sonatypeStaging))
-// TODO: Enable after SBT 0.12.0-M2
-//scmInfo in ThisBuild := Some(ScmInfo(url("https://github.com/lift/framework"), "scm:git:https://github.com/lift/framework.git"))
-//
-//pomExtra in ThisBuild ~= (_ ++ {Developers.toXml})
+scmInfo in ThisBuild := Some(ScmInfo(url("https://github.com/lift/framework"), "scm:git:https://github.com/lift/framework.git"))
-pomExtra in ThisBuild ~= (_ ++ <scm>
- <url>http://github.com/lift/framework</url>
- <connection>scm:git:https://github.com/lift/framework.git</connection>
- </scm> ++ {Developers.toXml})
+pomExtra in ThisBuild ~= (_ ++ {Developers.toXml})
credentials in ThisBuild <+= state map { s => Credentials(BuildPaths.getGlobalSettingsDirectory(s, BuildPaths.getGlobalBase(s)) / ".credentials") }
View
2  liftsh
@@ -14,4 +14,4 @@ DEFAULT_OPTS=""
cd `dirname $0`
# Call with INTERNAL_OPTS followed by LIFTSH_OPTS (or DEFAULT_OPTS). java always takes the last option when duplicate.
-exec java ${INTERNAL_OPTS} ${LIFTSH_OPTS:-${DEFAULT_OPTS}} -jar project/sbt-launch-0.12.0-M1.jar "$@"
+exec java ${INTERNAL_OPTS} ${LIFTSH_OPTS:-${DEFAULT_OPTS}} -jar project/sbt-launch-0.12.0-M2.jar "$@"
View
2  liftsh.cmd
@@ -11,4 +11,4 @@ if "%LIFTSH_OPTS%"=="" (
)
@REM Call with INTERNAL_OPTS followed by LIFTSH_OPTS (or DEFAULT_OPTS). java always takes the last option when duplicate.
-java %INTERNAL_OPTS% %LIFTSH_OPTS% -jar "%~dp0\project\sbt-launch-0.12.0-M1.jar" %*
+java %INTERNAL_OPTS% %LIFTSH_OPTS% -jar "%~dp0\project\sbt-launch-0.12.0-M2.jar" %*
View
3  project/build.properties
@@ -1 +1,2 @@
-sbt.version=0.12.0-M1
+# Deprecate using build.properties, use -Dsbt.version=... in launcher arg instead
+sbt.version=0.12.0-M2
View
BIN  project/sbt-launch-0.12.0-M1.jar → project/sbt-launch-0.12.0-M2.jar
Binary file not shown
Please sign in to comment.
Something went wrong with that request. Please try again.