diff options
| author | Seth Tisue <seth@tisue.net> | 2016-10-05 11:35:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-05 11:35:53 -0500 |
| commit | 9d3f0777ff883a7c59da3fa7fee156890f51701e (patch) | |
| tree | 571d67a2b815db2c7b32c36160629dabfa7dba48 /project | |
| parent | 388053544829c53c95cb6f9bf24ac366e950bac0 (diff) | |
| parent | fb53465ca7df23aa996f4bd3c03367f98f37d283 (diff) | |
| download | scala-9d3f0777ff883a7c59da3fa7fee156890f51701e.tar.gz scala-9d3f0777ff883a7c59da3fa7fee156890f51701e.tar.bz2 scala-9d3f0777ff883a7c59da3fa7fee156890f51701e.zip | |
Merge pull request #5416 from SethTisue/merge-2.12.0-to-2.12.x-sep-24
merge 2.12.0 onto 2.12.x [ci: last-only]
Diffstat (limited to 'project')
| -rw-r--r-- | project/VersionUtil.scala | 2 | ||||
| -rw-r--r-- | project/plugins.sbt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/project/VersionUtil.scala b/project/VersionUtil.scala index 249aef8356..e2c2715320 100644 --- a/project/VersionUtil.scala +++ b/project/VersionUtil.scala @@ -18,7 +18,7 @@ object VersionUtil { ) lazy val generatePropertiesFileSettings = Seq[Setting[_]]( - copyrightString := "Copyright 2002-2016, LAMP/EPFL", + copyrightString := "Copyright 2002-2016, 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 0a5b8f3dd4..da84d48915 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -19,4 +19,4 @@ buildInfoKeys := Seq[BuildInfoKey](buildClasspath) buildInfoPackage := "scalabuild" -libraryDependencies += "com.typesafe" %% "mima-reporter" % "0.1.8" +libraryDependencies += "com.typesafe" %% "mima-reporter" % "0.1.10" |