Skip to content

Commit df18532

Browse files
committed
Merge pull request #10 from retronym/topic/bumpity-bump
Bump SBT and MiMa
2 parents 1115c3d + a624708 commit df18532

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

Diff for: build.sbt

+4-1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ repository in bintray := "sbt-plugins"
2929
bintrayOrganization in bintray := None
3030

3131
// this plugin depends on the sbt-osgi plugin -- 2-for-1!
32+
// TODO update to 0.8.0
33+
// this might require us to modify the downstream project to enable the AutoPlugin
34+
// See code changes and docs: https://github.com/sbt/sbt-osgi/commit/e3625e685b8d1784938ec66067d629251811a9d1
3235
addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.7.0")
3336

34-
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.6")
37+
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.8")

Diff for: project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.1
1+
sbt.version=0.13.9

Diff for: src/main/scala/ScalaModulePlugin.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ object ScalaModulePlugin extends Plugin {
6060
),
6161
credentials ++= {
6262
val file = Path.userHome / ".ivy2" / ".credentials"
63-
if (file.exists) List(file) else Nil
63+
if (file.exists) List(new FileCredentials(file)) else Nil
6464
},
6565

6666
publishMavenStyle := true,

0 commit comments

Comments
 (0)