diff options
Diffstat (limited to 'project')
| -rw-r--r-- | project/MiMa.scala | 2 | ||||
| -rw-r--r-- | project/Osgi.scala | 3 | ||||
| -rw-r--r-- | project/PartestUtil.scala | 2 | ||||
| -rw-r--r-- | project/VersionUtil.scala | 2 | ||||
| -rw-r--r-- | project/plugins.sbt | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/project/MiMa.scala b/project/MiMa.scala index fb9bb175ab..a47856b1fd 100644 --- a/project/MiMa.scala +++ b/project/MiMa.scala @@ -51,7 +51,7 @@ object MiMa { "--curr", curr.getAbsolutePath, "--filters", filter.getAbsolutePath, "--generate-filters", - // !!! Command line MiMa (which we call rathan the sbt Plugin for reasons alluded to in f2d0f1e85) incorrectly + // !!! Command line MiMa (which we call rather than the sbt Plugin for reasons alluded to in f2d0f1e85) incorrectly // defaults to no checking (!) if this isn't specified. Fixed in https://github.com/typesafehub/migration-manager/pull/138 // TODO: Try out the new "--direction both" mode of MiMa "--direction", "backwards" diff --git a/project/Osgi.scala b/project/Osgi.scala index b05751958a..f8d43d8310 100644 --- a/project/Osgi.scala +++ b/project/Osgi.scala @@ -50,7 +50,8 @@ object Osgi { "Bundle-SymbolicName" -> (bundleSymbolicName.value + ".source"), "Bundle-Version" -> versionProperties.value.osgiVersion, "Eclipse-SourceBundle" -> (bundleSymbolicName.value + ";version=\"" + versionProperties.value.osgiVersion + "\";roots:=\".\"") - ) + ), + Keys.`package` := bundle.value ) def bundleTask(headers: Map[String, String], jarlist: Boolean, fullClasspath: Seq[File], artifactPath: File, diff --git a/project/PartestUtil.scala b/project/PartestUtil.scala index 6d2c9a4c45..40031192e4 100644 --- a/project/PartestUtil.scala +++ b/project/PartestUtil.scala @@ -87,7 +87,7 @@ object PartestUtil { token(grepOption <~ Space) ~> token(globOrPattern, tokenCompletion) } - val SrcPath = ((token(srcPathOption) <~ Space) ~ token(StringBasic.examples(Set("files", "pending", "scaladoc")))) map { + val SrcPath = ((token(srcPathOption) <~ Space) ~ token(StringBasic.examples(Set("files", "scaladoc")))) map { case opt ~ path => srcPath = path opt + " " + path diff --git a/project/VersionUtil.scala b/project/VersionUtil.scala index aacbc78329..2363708f1d 100644 --- a/project/VersionUtil.scala +++ b/project/VersionUtil.scala @@ -24,7 +24,7 @@ object VersionUtil { ) lazy val generatePropertiesFileSettings = Seq[Setting[_]]( - copyrightString := "Copyright 2002-2016, LAMP/EPFL and Lightbend, Inc.", + copyrightString := "Copyright 2002-2017, LAMP/EPFL and Lightbend, Inc.", resourceGenerators in Compile += generateVersionPropertiesFile.map(file => Seq(file)).taskValue, generateVersionPropertiesFile := generateVersionPropertiesFileImpl.value ) diff --git a/project/plugins.sbt b/project/plugins.sbt index 58e2d6cdad..8edc76e63a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -19,7 +19,7 @@ buildInfoKeys := Seq[BuildInfoKey](buildClasspath) buildInfoPackage := "scalabuild" -libraryDependencies += "com.typesafe" %% "mima-reporter" % "0.1.13" +libraryDependencies += "com.typesafe" %% "mima-reporter" % "0.1.14" libraryDependencies ++= Seq( "org.eclipse.jgit" % "org.eclipse.jgit" % "4.6.0.201612231935-r", |