Skip to content
This repository
Browse code

Move to SBT 0.12.0-M2

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

0 notes on commit 32e6848

Please sign in to comment.
Something went wrong with that request. Please try again.