Skip to content

Commit 72f3a48

Browse files
masahitojpxuwei-k
authored andcommitted
upgrade sbt to 1.2.x (tototoshi#140)
* upgrade sbt to 1.2.x * upgrade sbt to 1.x sbt 1 does not work on JDK 6 or 7, Oracle or OpenJDK. sbt/sbt#4219
1 parent b3484d3 commit 72f3a48

File tree

6 files changed

+9
-12
lines changed

6 files changed

+9
-12
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ scala:
44
- "2.11.12"
55
- "2.10.7"
66
jdk:
7-
- openjdk7
87
- oraclejdk8
98
script:
109
- sbt ++${TRAVIS_SCALA_VERSION} test:compile checkScalariform

build.sbt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import scala.sys.process._
2+
13
name := "scala-csv"
24

35
version := "1.3.6-SNAPSHOT"

doctest.sbt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
doctestSettings
2-
3-
doctestTestFramework := DoctestTestFramework.ScalaTest
4-
5-
doctestWithDependencies := false
1+
doctestTestFramework := DoctestTestFramework.ScalaTest

project/build.properties

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

project/plugins.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.6.0")
1+
addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.2")
22

3-
addSbtPlugin("com.github.tkawachi" % "sbt-doctest" % "0.3.2")
3+
addSbtPlugin("com.github.tkawachi" % "sbt-doctest" % "0.9.2")
44

5-
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "0.2.2")
5+
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.4")
66

7-
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
7+
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2")

sonatype.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
import SonatypeKeys._
1+
import xerial.sbt.Sonatype._
22

33
sonatypeSettings

0 commit comments

Comments
 (0)