@@ -51,22 +51,10 @@ lazy val scala211 = "2.11.12"
5151lazy val scala212 = " 2.12.11"
5252lazy val scala213 = " 2.13.1"
5353
54- /** Create an OSGi version range for standard Scala versioning
55- * schemes that describes binary compatible versions. */
56- def osgiVersionRange (version : String , requireMicro : Boolean = false ): String =
57- if (version contains '-' ) " ${@}" // M, RC or SNAPSHOT -> exact version
58- else if (requireMicro) " ${range;[===,=+)}" // At least the same micro version
59- else " ${range;[==,=+)}" // Any binary compatible version
60-
61- /** Create an OSGi Import-Package version specification. */
62- def osgiImport (pattern : String , version : String , requireMicro : Boolean = false ): String =
63- pattern + " ;version=\" " + osgiVersionRange(version, requireMicro) + " \" "
64-
6554lazy val compat = MultiScalaCrossProject (JSPlatform , JVMPlatform , NativePlatform )(
6655 " compat" ,
6756 _.settings(scalaModuleSettings)
6857 .settings(commonSettings)
69- .jvmSettings(scalaModuleSettingsJVM)
7058 .settings(
7159 name := " scala-collection-compat" ,
7260 moduleName := " scala-collection-compat" ,
@@ -79,15 +67,6 @@ lazy val compat = MultiScalaCrossProject(JSPlatform, JVMPlatform, NativePlatform
7967 Test / sourceDirectories += (ThisBuild / baseDirectory).value / " compat/src/test/scala-jvm"
8068 )
8169 .jvmSettings(
82- OsgiKeys .exportPackage := {
83- if (scalaVersion.value.startsWith(" 2.13." ))
84- Seq (s " scala.collection.compat.*;version= ${version.value}" )
85- else
86- Seq (
87- s " scala.collection.compat.*;version= ${version.value},scala.jdk.*;version= ${version.value}" )
88- },
89- OsgiKeys .importPackage := Seq (osgiImport(" *" , scalaBinaryVersion.value)),
90- OsgiKeys .privatePackage := Nil ,
9170 junit
9271 )
9372 .jsSettings(
0 commit comments