Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to sbt 0.13.7 and cached resolution #1099

Closed
wants to merge 1 commit into from
Closed

Update to sbt 0.13.7 and cached resolution #1099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 7 additions & 5 deletions project/Build.scala
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@ import scala.collection.JavaConverters._

object ScaldingBuild extends Build {

def scalaBinaryVersion(scalaVersion: String) = scalaVersion match {
def scalaBinaryVersion(scalaVersion: String) = scalaVersion match {
case version if version startsWith "2.9" => "2.9"
case version if version startsWith "2.10" => "2.10"
}
Expand Down Expand Up @@ -114,6 +114,8 @@ object ScaldingBuild extends Build {
}
},

updateOptions := updateOptions.value.withCachedResolution(true),

pomExtra := (
<url>https://github.com/twitter/scalding</url>
<licenses>
Expand Down Expand Up @@ -273,10 +275,10 @@ object ScaldingBuild extends Build {
"org.scala-tools.testing" %% "specs" % "1.6.9" % "test"
)
).dependsOn(scaldingCore)

def scaldingParquetScroogeDeps(version: String) = {
if (scalaBinaryVersion(version) == "2.9")
Seq()
if (scalaBinaryVersion(version) == "2.9")
Seq()
else
Seq(
"com.twitter" % "parquet-cascading" % "1.6.0rc2",
Expand All @@ -288,7 +290,7 @@ object ScaldingBuild extends Build {
"org.scala-tools.testing" %% "specs" % "1.6.9" % "test"
)
}

lazy val scaldingParquetScrooge = module("parquet-scrooge").settings(
skip in compile := scalaBinaryVersion(scalaVersion.value) == "2.9",
skip in test := scalaBinaryVersion(scalaVersion.value) == "2.9",
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
@@ -1 +1 @@
sbt.version=0.13.5
sbt.version=0.13.7
4 changes: 2 additions & 2 deletions sbt
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@
# Author: Paul Phillips <paulp@typesafe.com>

# todo - make this dynamic
declare -r sbt_release_version="0.13.5"
declare -r sbt_release_version="0.13.7"
declare -r sbt_unreleased_version="0.13.6-MSERVER-1"
declare -r buildProps="project/build.properties"

Expand Down Expand Up @@ -454,4 +454,4 @@ execRunner "$java_cmd" \
"${java_args[@]}" \
-jar "$sbt_jar" \
"${sbt_commands[@]}" \
"${residual_args[@]}"
"${residual_args[@]}"