Merge pull request #338 from Comcast/topic/remove-osgi

Remove OSGi support

build.sbt

@@ -69,19 +69,11 @@ lazy val testKit = crossProject(JVMPlatform, JSPlatform)
     )
   )
   .jvmSettings(
-    libraryDependencies += "com.google.guava" % "guava" % "31.0.1-jre" % "test",
-    OsgiKeys.exportPackage := Seq("com.comcast.ip4s.*;version=${Bundle-Version}"),
-    OsgiKeys.importPackage := {
-      val Some((major, minor)) = CrossVersion.partialVersion(scalaVersion.value)
-      Seq(s"""scala.*;version="[$major.$minor,$major.${minor + 1})"""", "*")
-    },
-    OsgiKeys.privatePackage := Seq("com.comcast.ip4s.*"),
-    OsgiKeys.additionalHeaders := Map("-removeheaders" -> "Include-Resource,Private-Package"),
-    osgiSettings
+    libraryDependencies += "com.google.guava" % "guava" % "31.0.1-jre" % "test"
   )
   .dependsOn(core % "compile->compile")
 
-lazy val testKitJVM = testKit.jvm.enablePlugins(SbtOsgi)
+lazy val testKitJVM = testKit.jvm
 lazy val testKitJS = testKit.js
   .disablePlugins(DoctestPlugin)
   .enablePlugins(ScalaJSBundlerPlugin)
@@ -117,17 +109,6 @@ lazy val core = crossProject(JVMPlatform, JSPlatform)
   )
 
 lazy val coreJVM = core.jvm
-  .enablePlugins(SbtOsgi)
-  .settings(
-    OsgiKeys.exportPackage := Seq("com.comcast.ip4s.*;version=${Bundle-Version}"),
-    OsgiKeys.importPackage := {
-      val Some((major, minor)) = CrossVersion.partialVersion(scalaVersion.value)
-      Seq(s"""scala.*;version="[$major.$minor,$major.${minor + 1})"""", "*")
-    },
-    OsgiKeys.privatePackage := Seq("com.comcast.ip4s.*"),
-    OsgiKeys.additionalHeaders := Map("-removeheaders" -> "Include-Resource,Private-Package"),
-    osgiSettings
-  )
 
 lazy val coreJS = core.js
   .disablePlugins(DoctestPlugin)

project/plugins.sbt

@@ -5,7 +5,5 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.4")
 addSbtPlugin("com.codecommit" % "sbt-spiewak-sonatype" % "0.22.1")
 addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.13.0")
 addSbtPlugin("com.github.tkawachi" % "sbt-doctest" % "0.9.9")
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.3.2")
 addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.0.1")
-addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.6")
 addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.24")