Skip to content

Commit

Permalink
sbt 1.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
xuwei-k committed Jan 19, 2018
1 parent fc1c3ee commit 1cc2d5f
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ scala:
- 2.12.4
- 2.11.12
- 2.10.7
script:
- sbt "++ ${TRAVIS_SCALA_VERSION}!" test
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import com.typesafe.sbt._
import Dependencies._

val basicSettings = SbtPgp.settings ++ Seq(
val basicSettings = Seq(
shellPrompt := { s => Project.extract(s).currentProject.id + " > " },
version := "1.1.8",
scalaVersion := "2.11.12",
Expand Down Expand Up @@ -43,7 +43,7 @@ val basicSettings = SbtPgp.settings ++ Seq(
publishMavenStyle := true,
publishArtifact in Test := false,
pomIncludeRepository := { _ => false },
SbtPgp.useGpg := true,
useGpg := true,
publishTo := {
val nexus = "https://oss.sonatype.org/"
if (version.value.trim.endsWith("SNAPSHOT")) Some("snapshots" at nexus + "content/repositories/snapshots")
Expand Down Expand Up @@ -88,7 +88,7 @@ def javaDoc = Seq(
" -subpackages" +
" org.parboiled"
s.log.info(cmd)
cmd ! s.log
sys.process.Process(cmd) ! s.log
docTarget
}
)
Expand Down
2 changes: 1 addition & 1 deletion project/Plugins.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.1")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.13
sbt.version=1.1.0

0 comments on commit 1cc2d5f

Please sign in to comment.