Include scalaModuleOsgiSettings in scalaModuleSettings

lrytz · lrytz · commit 1bf89fd9e83d · 2017-04-21T09:45:51.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 target/
+/.idea/
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -2,4 +2,4 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.6.2")
 
 // incompatible with sbt-gpg (https://github.com/softprops/bintray-sbt/pull/10)
 // JZ: is this still true after updating to 0.3.0?
-addSbtPlugin("me.lessis" % "bintray-sbt" % "0.3.0")
+addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.4.0")
diff --git a/src/main/scala/ScalaModulePlugin.scala b/src/main/scala/ScalaModulePlugin.scala
@@ -111,7 +111,7 @@ object ScalaModulePlugin extends Plugin {
         </developer>
       </developers>
     )
-  ) ++ mimaSettings
+  ) ++ mimaSettings ++ scalaModuleOsgiSettings
 
   // adapted from https://github.com/typesafehub/migration-manager/blob/0.1.6/sbtplugin/src/main/scala/com/typesafe/tools/mima/plugin/SbtMima.scala#L69
   def artifactExists(organization: String, name: String, scalaBinaryVersion: String, version: String, ivy: IvySbt, s: TaskStreams): Boolean = {

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ object ScalaModulePlugin extends Plugin {`
`111`	`111`	`</developer>`
`112`	`112`	`</developers>`
`113`	`113`	`)`
`114`		`- ) ++ mimaSettings`
	`114`	`+ ) ++ mimaSettings ++ scalaModuleOsgiSettings`
`115`	`115`
`116`	`116`	`// adapted from https://github.com/typesafehub/migration-manager/blob/0.1.6/sbtplugin/src/main/scala/com/typesafe/tools/mima/plugin/SbtMima.scala#L69`
`117`	`117`	`def artifactExists(organization: String, name: String, scalaBinaryVersion: String, version: String, ivy: IvySbt, s: TaskStreams): Boolean = {`