Skip to content

[0.12.x] Support nativeServiceProviders in ScalaNativeModule (Backport #4736) #4744

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
lihaoyi merged 2 commits into from
Jul 21, 2025
Merged

[0.12.x] Support nativeServiceProviders in ScalaNativeModule (Backport #4736) #4744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d378854
Support `nativeServiceProviders` in `ScalaNativeModule` (#4736)
lolgab Mar 17, 2025
713e1d1
Merge branch '0.12.x' into nativeServiceProviders-012
lefou Mar 31, 2025
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
10 changes: 10 additions & 0 deletions scalanativelib/src/mill/scalanativelib/ScalaNativeModule.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,15 @@ trait ScalaNativeModule extends ScalaModule { outer =>
*/
def nativeMultithreading: T[Option[Boolean]] = Task { None }

/**
* List of service providers which shall be allowed in the final binary.
* Example:
* Map("java.nio.file.spi.FileSystemProvider" -> Seq("my.lib.MyCustomFileSystem"))
* Makes the implementation for the FileSystemProvider trait in `my.lib.MyCustomFileSystem`
* included in the binary for reflective instantiation.
*/
def nativeServiceProviders: T[Map[String, Seq[String]]] = Task { Map.empty[String, Seq[String]] }

private def nativeConfig: Task[NativeConfig] = Task.Anon {
val classpath = runClasspath().map(_.path).filter(_.toIO.exists).toList
withScalaNativeBridge.apply().apply(_.config(
Expand All @@ -245,6 +254,7 @@ trait ScalaNativeModule extends ScalaModule { outer =>
nativeIncrementalCompilation(),
nativeDump(),
nativeMultithreading(),
nativeServiceProviders(),
toWorkerApi(logLevel()),
toWorkerApi(nativeBuildTarget())
)) match {
Expand Down
1 change: 1 addition & 0 deletions scalanativelib/worker-api/src/mill/scalanativelib/worker/api/ScalaNativeWorkerApi.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ private[scalanativelib] trait ScalaNativeWorkerApi {
nativeIncrementalCompilation: Boolean,
nativeDump: Boolean,
nativeMultithreading: Option[Boolean],
nativeServiceProviders: Map[String, Seq[String]],
logLevel: NativeLogLevel,
buildTarget: BuildTarget
): Either[String, Object]
Expand Down
2 changes: 2 additions & 0 deletions scalanativelib/worker/0.5/src/mill/scalanativelib/worker/ScalaNativeWorkerImpl.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ class ScalaNativeWorkerImpl extends mill.scalanativelib.worker.api.ScalaNativeWo
nativeIncrementalCompilation: Boolean,
nativeDump: Boolean,
nativeMultithreading: Option[Boolean],
nativeServiceProviders: Map[String, Seq[String]],
logLevel: NativeLogLevel,
buildTarget: BuildTarget
): Either[String, Config] = {
Expand All @@ -83,6 +84,7 @@ class ScalaNativeWorkerImpl extends mill.scalanativelib.worker.api.ScalaNativeWo
.withEmbedResources(nativeEmbedResources)
.withIncrementalCompilation(nativeIncrementalCompilation)
.withMultithreading(nativeMultithreading)
.withServiceProviders(nativeServiceProviders)
.withBaseName("out")

val config = Config.empty
Expand Down
Loading