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.

Sign up for GitHub

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

Update dependencies #1170

Merged
merged 1 commit into from
Oct 30, 2018
Merged

Update dependencies #1170

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,28 @@ javacOptions ++= Seq("-source", "1.8", "-target", "1.8")
// put jdeb on the classpath for scripted tests
classpathTypes += "maven-plugin"
libraryDependencies ++= Seq(
"org.apache.commons" % "commons-compress" % "1.14",
"org.apache.commons" % "commons-compress" % "1.18",
// for jdkpackager
"org.apache.ant" % "ant" % "1.10.1",
"org.scalatest" %% "scalatest" % "3.0.3" % Test
"org.apache.ant" % "ant" % "1.10.5",
"org.scalatest" %% "scalatest" % "3.0.5" % Test
)

// sbt dependend libraries
libraryDependencies ++= {
(pluginCrossBuild / sbtVersion).value match {
case v if v.startsWith("1.") =>
Seq(
"org.scala-sbt" %% "io" % "1.0.0",
"org.scala-sbt" %% "io" % "1.2.2",
// these dependencies have to be explicitly added by the user
// FIXME temporary remove the 'provided' scope. SBT 1.0.0-M6 changed the resolving somehow
"com.spotify" % "docker-client" % "8.9.0" /* % "provided" */,
"org.vafer" % "jdeb" % "1.3" % Provided artifacts Artifact("jdeb", "jar", "jar")
"com.spotify" % "docker-client" % "8.14.3" /* % "provided" */,
"org.vafer" % "jdeb" % "1.7" % Provided artifacts Artifact("jdeb", "jar", "jar")
)
case _ =>
Seq(
// these dependencies have to be explicitly added by the user
"com.spotify" % "docker-client" % "8.9.0" % Provided,
"org.vafer" % "jdeb" % "1.3" % Provided artifacts Artifact("jdeb", "jar", "jar")
"com.spotify" % "docker-client" % "8.14.3" % Provided,
"org.vafer" % "jdeb" % "1.7" % Provided artifacts Artifact("jdeb", "jar", "jar")
)
}
}
Expand All @@ -44,8 +44,8 @@ libraryDependencies ++= {
case "2.10" => Nil
case _ =>
Seq(
"org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.6",
"org.scala-lang.modules" %% "scala-xml" % "1.0.6"
"org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.1",
"org.scala-lang.modules" %% "scala-xml" % "1.1.1"
)
}
}
Expand Down
3 changes: 2 additions & 1 deletion project/ChangelogPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ object ChangelogPlugin extends AutoPlugin {
val log = toProcessLogger(state)
val base = vcs(state).baseDir
val sign = Project.extract(state).get(releaseVcsSign)
val signOff = Project.extract(state).get(releaseVcsSignOff)
val changelogFile = base / "CHANGELOG.md"

val relativePath = IO
Expand All @@ -103,7 +104,7 @@ object ChangelogPlugin extends AutoPlugin {
if (vcsAddOutput.isEmpty) {
state.log.info("CHANGELOG.md hasn't been changed.")
} else {
vcs(state).commit("Update changelog", sign) ! log
vcs(state).commit("Update changelog", sign, signOff) ! log
}

state
Expand Down
3 changes: 2 additions & 1 deletion project/ReadmeReleasePlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ object ReadmeReleasePlugin extends AutoPlugin {
val log = toProcessLogger(state)
val base = vcs(state).baseDir
val sign = Project.extract(state).get(releaseVcsSign)
val signOff = Project.extract(state).get(releaseVcsSignOff)
val readmeFile = base / "README.md"

val relativePath = IO
Expand All @@ -69,7 +70,7 @@ object ReadmeReleasePlugin extends AutoPlugin {
if (vcsAddOutput.isEmpty) {
state.log.info("README.md hasn't been changed.")
} else {
vcs(state).commit("Update release version in readme", sign) ! log
vcs(state).commit("Update release version in readme", sign, signOff) ! log
}

state
Expand Down
4 changes: 2 additions & 2 deletions project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.2")
addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.3.0")
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.9")
addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.3.2")
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.10")
addSbtPlugin("com.dwijnand" % "sbt-dynver" % "3.0.0")
addSbtPlugin("io.crashbox" % "sbt-gpg" % "0.2.0")

Expand Down
6 changes: 3 additions & 3 deletions src/main/scala/com/typesafe/sbt/packager/debian/JDebPackaging.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import com.typesafe.sbt.packager.linux.LinuxPlugin.autoImport.{
linuxScriptReplacements,
packageArchitecture
}
import scala.collection.JavaConversions._
import scala.collection.JavaConverters._
import DebianPlugin.Names
import DebianPlugin.autoImport._

Expand Down Expand Up @@ -149,8 +149,8 @@ private class JDebPackagingTask {
log: Logger): Unit = {
val debMaker = new DebMaker(
new JDebConsole(log),
fileAndDirectoryProducers(mappings, targetDir) ++ linkProducers(symlinks),
conffileProducers(mappings, targetDir)
(fileAndDirectoryProducers(mappings, targetDir) ++ linkProducers(symlinks)).asJava,
conffileProducers(mappings, targetDir).asJava
)
// set compression default to none - in line with native version / allows rsync to be effective
debMaker setCompression "none"
Expand Down