Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions project/OSGi.scala
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,25 @@ object OSGi {
"!scala.util.parsing.*",
scalaImport(scalaVersion))
def pekkoImport(version: String, packageName: String = "org.apache.pekko.*") = {
// see https://github.com/apache/pekko/issues/2509 for background
// on why the version that is input might not be in the expected format
val versionComponents = version.split('.')
val nextMinorVersion = versionComponents(1).toInt + 1
versionedImport(packageName, s"${versionComponents.head}.${versionComponents(1)}",
s"${versionComponents.head}.$nextMinorVersion")
if (versionComponents.length < 2) {
useDefaultImportRange(version, packageName)
} else {
try {
val nextMinorVersion = versionComponents(1).toInt + 1
versionedImport(packageName, s"${versionComponents.head}.${versionComponents(1)}",
s"${versionComponents.head}.$nextMinorVersion")
} catch {
case _: NumberFormatException =>
useDefaultImportRange(version, packageName)
}
}
}
private def useDefaultImportRange(version: String, packageName: String) = {
System.err.println(s"Invalid Pekko version: $version for OSGi import package versioning, defaulting to [0.0,10.0)")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice to use err here

versionedImport(packageName, "0.0", "10.0")
}
def configImport(packageName: String = "com.typesafe.config.*") = versionedImport(packageName, "1.4.0", "1.5.0")
def scalaImport(version: String) = {
Expand Down