Skip to content

Commit 9f1c896

Browse files
committed
Fixed mechanisms which pulls scala revision for properties file.
1 parent 7780a36 commit 9f1c896

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

project/Release.scala

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,12 @@ object Release {
9494
def trace (t: Throwable): Unit = ()
9595
def stdoutString = stdout.toString
9696
}
97-
git("describe", "HEAD", "--abbrev=7", "--match", "dev")(baseDirectory, outputStealer)
98-
outputStealer.stdoutString
97+
val result = try {
98+
git("describe", "HEAD", "--abbrev=7", "--match", "dev")(baseDirectory, outputStealer)
99+
} catch {
100+
case t => git("describe", "HEAD", "--abbrev=7", "--always")(baseDirectory, outputStealer)
101+
}
102+
result.trim
99103
}
100104

101105
}

project/project/Build.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ object PluginDef extends Build {
33
override def projects = Seq(root)
44
lazy val root = Project("plugins", file(".")) dependsOn(proguard, git)
55
lazy val proguard = uri("git://github.com/jsuereth/xsbt-proguard-plugin.git")
6-
lazy val git = uri("git://github.com/sbt/sbt-git-plugin.git")
6+
lazy val git = uri("git://github.com/sbt/sbt-git-plugin.git#scala-build")
77
}

0 commit comments

Comments
 (0)