Drop OSGi support (#1202)

pureconfig · Oct 31, 2021 · cda1e59 · cda1e59
1 parent cef47e4
commit cda1e59
Show file tree

Hide file tree

Showing 26 changed files with 2 additions and 220 deletions.
diff --git a/build.sbt b/build.sbt
@@ -10,7 +10,7 @@ ThisBuild / organization := "com.github.pureconfig"
 ThisBuild / scalafixDependencies += "com.github.liancheng" %% "organize-imports" % "0.5.0"
 
 lazy val core = (project in file("core"))
-  .enablePlugins(BoilerplatePlugin, SbtOsgi)
+  .enablePlugins(BoilerplatePlugin)
   .settings(commonSettings)
 
 lazy val testkit = (project in file("testkit"))
@@ -24,7 +24,7 @@ lazy val tests = (project in file("tests"))
 
 // aggregates pureconfig-core and pureconfig-generic with the original "pureconfig" name
 lazy val bundle = (project in file("bundle"))
-  .enablePlugins(SbtOsgi, ModuleMdocPlugin)
+  .enablePlugins(ModuleMdocPlugin)
   .settings(commonSettings, mdocOut := file("."))
   .dependsOn(core, generic)
 
@@ -34,7 +34,6 @@ lazy val docs = (project in file("docs"))
   .dependsOn(bundle)
 
 def genericModule(proj: Project) = proj
-  .enablePlugins(SbtOsgi)
   .dependsOn(core)
   .dependsOn(testkit % "test")
   .settings(commonSettings)

diff --git a/core/build.sbt b/core/build.sbt
@@ -5,12 +5,3 @@ name := "pureconfig-core"
 crossScalaVersions := Seq(scala212, scala213, scala3)
 
 libraryDependencies += Dependencies.typesafeConfig
-
-osgiSettings
-
-OsgiKeys.exportPackage := Seq("pureconfig.*")
-OsgiKeys.privatePackage := Seq()
-OsgiKeys.importPackage := Seq(
-  s"""scala.*;version="[${scalaBinaryVersion.value}.0,${scalaBinaryVersion.value}.50)"""",
-  "*"
-)
diff --git a/modules/akka-http/build.sbt b/modules/akka-http/build.sbt
@@ -15,12 +15,3 @@ mdocLibraryDependencies ++= Seq(
 developers := List(
   Developer("himanshu4141", "Himanshu Yadav", "himanshu4141@gmail.com", url("https://github.com/himanshu4141"))
 )
-
-osgiSettings
-
-OsgiKeys.exportPackage := Seq("pureconfig.module.akkahttp.*")
-OsgiKeys.privatePackage := Seq()
-OsgiKeys.importPackage := Seq(
-  s"""scala.*;version="[${scalaBinaryVersion.value}.0,${scalaBinaryVersion.value}.50)"""",
-  "*"
-)
diff --git a/modules/akka/build.sbt b/modules/akka/build.sbt
@@ -10,12 +10,3 @@ developers := List(
   Developer("derekmorr", "Derek Morr", "morr.derek@gmail.com", url("https://github.com/derekmorr")),
   Developer("ruippeixotog", "Rui Gonçalves", "ruippeixotog@gmail.com", url("https://github.com/ruippeixotog"))
 )
-
-osgiSettings
-
-OsgiKeys.exportPackage := Seq("pureconfig.module.akka.*")
-OsgiKeys.privatePackage := Seq()
-OsgiKeys.importPackage := Seq(
-  s"""scala.*;version="[${scalaBinaryVersion.value}.0,${scalaBinaryVersion.value}.50)"""",
-  "*"
-)
diff --git a/modules/cats-effect/build.sbt b/modules/cats-effect/build.sbt
@@ -10,12 +10,3 @@ libraryDependencies ++= Seq(
 )
 
 developers := List(Developer("keirlawson", "Keir Lawson", "keirlawson@gmail.com", url("https://github.com/keirlawson")))
-
-osgiSettings
-
-OsgiKeys.exportPackage := Seq("pureconfig.module.catseffect.*")
-OsgiKeys.privatePackage := Seq()
-OsgiKeys.importPackage := Seq(
-  s"""scala.*;version="[${scalaBinaryVersion.value}.0,${scalaBinaryVersion.value}.50)"""",
-  "*"
-)
diff --git a/modules/cats-effect2/build.sbt b/modules/cats-effect2/build.sbt
@@ -10,12 +10,3 @@ libraryDependencies ++= Seq(
 )
 
 developers := List(Developer("keirlawson", "Keir Lawson", "keirlawson@gmail.com", url("https://github.com/keirlawson")))
-
-osgiSettings
-
-OsgiKeys.exportPackage := Seq("pureconfig.module.catseffect2.*")
-OsgiKeys.privatePackage := Seq()
-OsgiKeys.importPackage := Seq(
-  s"""scala.*;version="[${scalaBinaryVersion.value}.0,${scalaBinaryVersion.value}.50)"""",
-  "*"
-)
diff --git a/modules/cats/build.sbt b/modules/cats/build.sbt
@@ -15,12 +15,3 @@ developers := List(
   Developer("derekmorr", "Derek Morr", "morr.derek@gmail.com", url("https://github.com/derekmorr")),
   Developer("ruippeixotog", "Rui Gonçalves", "ruippeixotog@gmail.com", url("https://github.com/ruippeixotog"))
 )
-
-osgiSettings
-
-OsgiKeys.exportPackage := Seq("pureconfig.module.cats.*")
-OsgiKeys.privatePackage := Seq()
-OsgiKeys.importPackage := Seq(
-  s"""scala.*;version="[${scalaBinaryVersion.value}.0,${scalaBinaryVersion.value}.50)"""",
-  "*"
-)
diff --git a/modules/circe/build.sbt b/modules/circe/build.sbt
@@ -14,12 +14,3 @@ libraryDependencies ++= Seq(
 developers := List(
   Developer("moradology", "Nathan Zimmerman", "npzimmerman@gmail.com", url("https://github.com/moradology"))
 )
-
-osgiSettings
-
-OsgiKeys.exportPackage := Seq("pureconfig.module.circe.*")
-OsgiKeys.privatePackage := Seq()
-OsgiKeys.importPackage := Seq(
-  s"""scala.*;version="[${scalaBinaryVersion.value}.0,${scalaBinaryVersion.value}.50)"""",
-  "*"
-)
diff --git a/modules/cron4s/build.sbt b/modules/cron4s/build.sbt
@@ -9,12 +9,3 @@ libraryDependencies += "com.github.alonsodomin.cron4s" %% "cron4s-core" % "0.6.1
 developers := List(
   Developer("bardurdam", "Bárður Viberg Dam", "bardurdam@gmail.com", url("https://github.com/bardurdam"))
 )
-
-osgiSettings
-
-OsgiKeys.exportPackage := Seq("pureconfig.module.cron4s.*")
-OsgiKeys.privatePackage := Seq()
-OsgiKeys.importPackage := Seq(
-  s"""scala.*;version="[${scalaBinaryVersion.value}.0,${scalaBinaryVersion.value}.50)"""",
-  "*"
-)
diff --git a/modules/enum/build.sbt b/modules/enum/build.sbt
@@ -10,12 +10,3 @@ developers := List(
   Developer("melrief", "Mario Pastorelli", "pastorelli.mario@gmail.com", url("https://github.com/melrief")),
   Developer("leifwickland", "Leif Wickland", "leifwickland@gmail.com", url("https://github.com/leifwickland"))
 )
-
-osgiSettings
-
-OsgiKeys.exportPackage := Seq("pureconfig.module.enum.*")
-OsgiKeys.privatePackage := Seq()
-OsgiKeys.importPackage := Seq(
-  s"""scala.*;version="[${scalaBinaryVersion.value}.0,${scalaBinaryVersion.value}.50)"""",
-  "*"
-)
diff --git a/modules/enumeratum/build.sbt b/modules/enumeratum/build.sbt
@@ -7,12 +7,3 @@ crossScalaVersions := Seq(scala212, scala213)
 libraryDependencies ++= Seq("com.beachape" %% "enumeratum" % "1.7.0")
 
 developers := List(Developer("aeons", "Bjørn Madsen", "bm@aeons.dk", url("https://github.com/aeons")))
-
-osgiSettings
-
-OsgiKeys.exportPackage := Seq("pureconfig.module.enumeratum.*")
-OsgiKeys.privatePackage := Seq()
-OsgiKeys.importPackage := Seq(
-  s"""scala.*;version="[${scalaBinaryVersion.value}.0,${scalaBinaryVersion.value}.50)"""",
-  "*"
-)
diff --git a/modules/fs2/build.sbt b/modules/fs2/build.sbt
@@ -10,12 +10,3 @@ libraryDependencies ++= Seq(
 )
 
 developers := List(Developer("keirlawson", "Keir Lawson", "keirlawson@gmail.com", url("https://github.com/keirlawson")))
-
-osgiSettings
-
-OsgiKeys.exportPackage := Seq("pureconfig.module.fs2.*")
-OsgiKeys.privatePackage := Seq()
-OsgiKeys.importPackage := Seq(
-  s"""scala.*;version="[${scalaBinaryVersion.value}.0,${scalaBinaryVersion.value}.50)"""",
-  "*"
-)
diff --git a/modules/generic/build.sbt b/modules/generic/build.sbt
@@ -8,12 +8,3 @@ libraryDependencies ++= Seq(
   "com.chuusai" %% "shapeless" % "2.3.7",
   "org.scala-lang" % "scala-reflect" % scalaVersion.value % Provided
 )
-
-osgiSettings
-
-OsgiKeys.exportPackage := Seq("pureconfig.generic.*")
-OsgiKeys.privatePackage := Seq()
-OsgiKeys.importPackage := Seq(
-  s"""scala.*;version="[${scalaBinaryVersion.value}.0,${scalaBinaryVersion.value}.50)"""",
-  "*"
-)
diff --git a/modules/hadoop/build.sbt b/modules/hadoop/build.sbt
@@ -8,12 +8,3 @@ libraryDependencies ++= Seq("org.apache.hadoop" % "hadoop-common" % "3.3.1" % "p
 mdocLibraryDependencies ++= Seq("org.apache.hadoop" % "hadoop-common" % "3.3.1")
 
 developers := List(Developer("lmnet", "Yuriy Badalyantc", "lmnet89@gmail.com", url("https://github.com/lmnet")))
-
-osgiSettings
-
-OsgiKeys.exportPackage := Seq("pureconfig.module.hadoop.*")
-OsgiKeys.privatePackage := Seq()
-OsgiKeys.importPackage := Seq(
-  s"""scala.*;version="[${scalaBinaryVersion.value}.0,${scalaBinaryVersion.value}.50)"""",
-  "*"
-)
diff --git a/modules/http4s/build.sbt b/modules/http4s/build.sbt
@@ -9,12 +9,3 @@ libraryDependencies ++= Seq("org.http4s" %% "http4s-core" % "0.23.6")
 developers := List(
   Developer("jcranky", "Paulo Siqueira", "paulo.siqueira@gmail.com", url("https://github.com/jcranky"))
 )
-
-osgiSettings
-
-OsgiKeys.exportPackage := Seq("pureconfig.module.http4s.*")
-OsgiKeys.privatePackage := Seq()
-OsgiKeys.importPackage := Seq(
-  s"""scala.*;version="[${scalaBinaryVersion.value}.0,${scalaBinaryVersion.value}.50)"""",
-  "*"
-)
diff --git a/modules/javax/build.sbt b/modules/javax/build.sbt
@@ -5,12 +5,3 @@ name := "pureconfig-javax"
 crossScalaVersions := Seq(scala212, scala213)
 
 developers := List(Developer("derekmorr", "Derek Morr", "morr.derek@gmail.com", url("https://github.com/derekmorr")))
-
-osgiSettings
-
-OsgiKeys.exportPackage := Seq("pureconfig.module.javax.*")
-OsgiKeys.privatePackage := Seq()
-OsgiKeys.importPackage := Seq(
-  s"""scala.*;version="[${scalaBinaryVersion.value}.0,${scalaBinaryVersion.value}.50)"""",
-  "*"
-)
diff --git a/modules/joda/build.sbt b/modules/joda/build.sbt
@@ -10,12 +10,3 @@ developers := List(
   Developer("melrief", "Mario Pastorelli", "pastorelli.mario@gmail.com", url("https://github.com/melrief")),
   Developer("leifwickland", "Leif Wickland", "leifwickland@gmail.com", url("https://github.com/leifwickland"))
 )
-
-osgiSettings
-
-OsgiKeys.exportPackage := Seq("pureconfig.module.joda.*")
-OsgiKeys.privatePackage := Seq()
-OsgiKeys.importPackage := Seq(
-  s"""scala.*;version="[${scalaBinaryVersion.value}.0,${scalaBinaryVersion.value}.50)"""",
-  "*"
-)
diff --git a/modules/magnolia/build.sbt b/modules/magnolia/build.sbt
@@ -14,12 +14,3 @@ libraryDependencies ++= Seq(
 developers := List(
   Developer("ruippeixotog", "Rui Gonçalves", "ruippeixotog@gmail.com", url("https://github.com/ruippeixotog"))
 )
-
-osgiSettings
-
-OsgiKeys.exportPackage := Seq("pureconfig.module.magnolia.*")
-OsgiKeys.privatePackage := Seq()
-OsgiKeys.importPackage := Seq(
-  s"""scala.*;version="[${scalaBinaryVersion.value}.0,${scalaBinaryVersion.value}.50)"""",
-  "*"
-)
diff --git a/modules/scala-xml/build.sbt b/modules/scala-xml/build.sbt
@@ -12,12 +12,3 @@ libraryDependencies ++= forScalaVersions {
 }.value
 
 developers := List(Developer("derekmorr", "Derek Morr", "morr.derek@gmail.com", url("https://github.com/derekmorr")))
-
-osgiSettings
-
-OsgiKeys.exportPackage := Seq("pureconfig.module.scalaxml.*")
-OsgiKeys.privatePackage := Seq()
-OsgiKeys.importPackage := Seq(
-  s"""scala.*;version="[${scalaBinaryVersion.value}.0,${scalaBinaryVersion.value}.50)"""",
-  "*"
-)
diff --git a/modules/scalaz/build.sbt b/modules/scalaz/build.sbt
@@ -14,12 +14,3 @@ mdocScalacOptions += "-Ypartial-unification"
 developers := List(
   Developer("ChernikovP", "Pavel Chernikov", "chernikov.pavel92@gmail.com", url("https://github.com/ChernikovP"))
 )
-
-osgiSettings
-
-OsgiKeys.exportPackage := Seq("pureconfig.module.scalaz.*")
-OsgiKeys.privatePackage := Seq()
-OsgiKeys.importPackage := Seq(
-  s"""scala.*;version="[${scalaBinaryVersion.value}.0,${scalaBinaryVersion.value}.50)"""",
-  "*"
-)
diff --git a/modules/spark/build.sbt b/modules/spark/build.sbt
@@ -6,12 +6,3 @@ crossScalaVersions := Seq(scala212, scala213)
 
 libraryDependencies ++= Seq("org.apache.spark" %% "spark-sql" % "3.2.0" % "provided")
 mdocLibraryDependencies ++= Seq("org.apache.spark" %% "spark-sql" % "3.2.0")
-
-osgiSettings
-
-OsgiKeys.exportPackage := Seq("pureconfig.module.spark.*")
-OsgiKeys.privatePackage := Seq()
-OsgiKeys.importPackage := Seq(
-  s"""scala.*;version="[${scalaBinaryVersion.value}.0,${scalaBinaryVersion.value}.50)"""",
-  "*"
-)
diff --git a/modules/squants/build.sbt b/modules/squants/build.sbt
@@ -10,12 +10,3 @@ developers := List(
   Developer("melrief", "Mario Pastorelli", "pastorelli.mario@gmail.com", url("https://github.com/melrief")),
   Developer("cranst0n", "Ian McIntosh", "cranston.ian@gmail.com", url("https://github.com/cranst0n"))
 )
-
-osgiSettings
-
-OsgiKeys.exportPackage := Seq("pureconfig.module.squants.*")
-OsgiKeys.privatePackage := Seq()
-OsgiKeys.importPackage := Seq(
-  s"""scala.*;version="[${scalaBinaryVersion.value}.0,${scalaBinaryVersion.value}.50)"""",
-  "*"
-)
diff --git a/modules/sttp/build.sbt b/modules/sttp/build.sbt
@@ -9,12 +9,3 @@ libraryDependencies ++= Seq(
 )
 
 developers := List(Developer("bszwej", "Bartlomiej Szwej", "bszwej@gmail.com", url("https://github.com/bszwej")))
-
-osgiSettings
-
-OsgiKeys.exportPackage := Seq("pureconfig.module.sttp.*")
-OsgiKeys.privatePackage := Seq()
-OsgiKeys.importPackage := Seq(
-  s"""scala.*;version="[${scalaBinaryVersion.value}.0,${scalaBinaryVersion.value}.50)"""",
-  "*"
-)
diff --git a/modules/yaml/build.sbt b/modules/yaml/build.sbt
@@ -9,12 +9,3 @@ libraryDependencies ++= Seq("org.yaml" % "snakeyaml" % "1.29")
 developers := List(
   Developer("ruippeixotog", "Rui Gonçalves", "ruippeixotog@gmail.com", url("https://github.com/ruippeixotog"))
 )
-
-osgiSettings
-
-OsgiKeys.exportPackage := Seq("pureconfig.module.yaml.*")
-OsgiKeys.privatePackage := Seq()
-OsgiKeys.importPackage := Seq(
-  s"""scala.*;version="[${scalaBinaryVersion.value}.0,${scalaBinaryVersion.value}.50)"""",
-  "*"
-)
diff --git a/modules/zio-config/build.sbt b/modules/zio-config/build.sbt
@@ -7,12 +7,3 @@ crossScalaVersions := Seq(scala212, scala213)
 libraryDependencies ++= Seq(
   "dev.zio" %% "zio-config-typesafe" % "1.0.10"
 )
-
-osgiSettings
-
-OsgiKeys.exportPackage := Seq("pureconfig.module.zioconfig.*")
-OsgiKeys.privatePackage := Seq()
-OsgiKeys.importPackage := Seq(
-  s"""scala.*;version="[${scalaBinaryVersion.value}.0,${scalaBinaryVersion.value}.50)"""",
-  "*"
-)
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -2,7 +2,6 @@ addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.31")
 addSbtPlugin("com.47deg" % "sbt-microsites" % "1.3.4")
 addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0")
 addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
-addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.6")
 addSbtPlugin("io.spray" % "sbt-boilerplate" % "0.6.1")
 addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.24")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3")