Skip to content

handle build issue in OSGi build code (#2511) #2514

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pjfanning merged 1 commit into from
Nov 17, 2025
Merged

handle build issue in OSGi build code (#2511) #2514

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,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)")
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