Skip to content

Commit 0179397

Browse files
committed
Upgrade SBT version from 0.13.16 to 1.0.2
- upgrade SBT version from 0.13.16 to 1.0.2, - upgrade plugin versions to SBT 1.0.x compatible ones: - upgrade PGP plugin version from 1.0.1 to 1.1.0, - upgrade Scalariform plugin version from 1.3.0 to 1.8.1, - upgrade Release plugin version from 1.0.4 to 1.0.6 - simplify Travis build (don't force Scala versions for SBT versions).
1 parent 7ae93d7 commit 0179397

File tree

4 files changed

+9
-13
lines changed

4 files changed

+9
-13
lines changed

.travis.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
language: scala
22

3-
script: sbt ++$TRAVIS_SCALA_VERSION ^^$TRAVIS_SBT_VERSION scripted
3+
script: sbt ^^$TRAVIS_SBT_VERSION scripted
44

55
matrix:
66
include:
7-
- scala: 2.10.6
8-
env: TRAVIS_SBT_VERSION="0.13.16"
9-
- scala: 2.12.3
10-
env: TRAVIS_SBT_VERSION="1.0.0"
7+
- env: TRAVIS_SBT_VERSION="0.13.16"
8+
- env: TRAVIS_SBT_VERSION="1.0.2"
119

1210
before_cache:
1311
- find $HOME/.sbt -name "*.lock" | xargs rm

build.sbt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ publishMavenStyle := true
1616

1717
publishArtifact in Test := false
1818

19-
ScriptedPlugin.scriptedSettings
20-
2119
scriptedLaunchOpts ++= Seq(
2220
"-Xmx1024M",
2321
"-Dplugin.version=" + version.value
@@ -69,4 +67,4 @@ pomExtra := {
6967
</developers>
7068
}
7169

72-
crossSbtVersions := Vector("0.13.16", "1.0.0")
70+
crossSbtVersions := Vector("0.13.16", "1.0.2")

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.16
1+
sbt.version=1.0.2

project/plugins.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
libraryDependencies += "org.scala-sbt" % "scripted-plugin" % sbtVersion.value
1+
libraryDependencies += "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value
22

3-
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.1")
3+
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")
44

5-
addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.3.0")
5+
addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.1")
66

7-
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.4")
7+
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.6")

0 commit comments

Comments
 (0)