Skip to content
This repository was archived by the owner on May 22, 2022. It is now read-only.

Commit e0f3b2f

Browse files
committed
Support sbt 1.0.0
1 parent 1e28d5e commit e0f3b2f

File tree

15 files changed

+120
-151
lines changed

15 files changed

+120
-151
lines changed

.travis.yml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
language: scala
2-
3-
script: sbt scripted
4-
2+
matrix:
3+
include:
4+
- env: SBT_VERSION="0.13.16"
5+
jdk: oraclejdk7
6+
- env: SBT_VERSION="1.0.0"
7+
jdk: oraclejdk8
8+
script: sbt "^^ ${SBT_VERSION}" test scripted
9+
cache:
10+
directories:
11+
- "$HOME/.ivy2/cache"
12+
- "$HOME/.sbt/launchers"
513
sudo: false
14+
addons:
15+
apt:
16+
packages:
17+
- oracle-java8-installer

build.sbt

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
1-
sbtPlugin := true
2-
3-
name := "sbt-lock"
4-
5-
organization := "com.github.tkawachi"
6-
7-
licenses := Seq("MIT" -> url("http://opensource.org/licenses/MIT"))
8-
9-
scmInfo := Some(ScmInfo(
10-
url("https://github.com/tkawachi/sbt-lock/"),
11-
"scm:git:github.com:tkawachi/sbt-lock.git"
12-
))
13-
14-
scalacOptions ++= Seq(
15-
"-deprecation"
16-
)
1+
lazy val root = project
2+
.in(file("."))
3+
.enablePlugins(BuildInfoPlugin)
4+
.settings(
5+
sbtPlugin := true,
6+
crossSbtVersions := Vector("0.13.16", "1.0.0"),
7+
name := "sbt-lock",
8+
organization := "com.github.tkawachi",
9+
licenses := Seq("MIT" -> url("http://opensource.org/licenses/MIT")),
10+
scmInfo := Some(
11+
ScmInfo(
12+
url("https://github.com/tkawachi/sbt-lock/"),
13+
"scm:git:github.com:tkawachi/sbt-lock.git"
14+
)),
15+
scalacOptions ++= Seq(
16+
"-deprecation"
17+
)
18+
)

buildinfo.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
buildInfoSettings
1+
//buildInfoSettings
22

3-
sourceGenerators in Compile <+= buildInfo
3+
//sourceGenerators in Compile += buildInfo.taskValue
44

55
val _url = settingKey[URL]("_url")
66

lock.sbt

Lines changed: 0 additions & 62 deletions
This file was deleted.

project/build.properties

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
sbt.version=0.13.7
2-
1+
sbt.version=0.13.16

project/plugins.sbt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.3.1")
2-
addSbtPlugin("com.github.gseitz" % "sbt-release" % "0.8.2")
1+
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0")
2+
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.6")
33
//addSbtPlugin("com.github.tkawachi" % "sbt-lock" % "0.2.2")
4-
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
5-
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.7")
6-
addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.3.0")
7-
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "0.2.1")
4+
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0-M1")
5+
addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.7.1")
6+
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.0")
87

98
libraryDependencies += "org.scala-sbt" % "scripted-plugin" % sbtVersion.value

publish.sbt

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,18 @@
1-
import sbtrelease._
2-
import ReleaseStateTransformations._
1+
import ReleaseTransformations._
32

4-
sonatypeSettings
5-
6-
releaseSettings
7-
8-
def runTaskStep[A](task: TaskKey[A]) =
9-
ReleaseStep(state => Project.extract(state).runTask(task, state)._1)
10-
11-
ReleaseKeys.releaseProcess := Seq[ReleaseStep](
3+
releaseProcess := Seq[ReleaseStep](
124
checkSnapshotDependencies,
135
inquireVersions,
146
runClean,
15-
runTest,
7+
releaseStepCommandAndRemaining("^ test"),
8+
releaseStepCommandAndRemaining("^ scripted"),
169
setReleaseVersion,
1710
commitReleaseVersion,
1811
tagRelease,
19-
runTaskStep(PgpKeys.publishSigned),
12+
releaseStepCommandAndRemaining("^ publishSigned"),
2013
setNextVersion,
2114
commitNextVersion,
22-
runTaskStep(SonatypeKeys.sonatypeReleaseAll),
15+
releaseStepCommand("sonatypeReleaseAll"),
2316
pushChanges
2417
)
2518

scalariform.sbt

Lines changed: 0 additions & 6 deletions
This file was deleted.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package com.github.tkawachi.sbtlock
2+
3+
object Compat {
4+
val dependencyOverridesType: String = "Set"
5+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package com.github.tkawachi.sbtlock
2+
3+
object Compat {
4+
val dependencyOverridesType: String = "Seq"
5+
}

0 commit comments

Comments
 (0)