Skip to content

Commit

Permalink
add parentheses PathFinder.get (#222)
Browse files Browse the repository at this point in the history
  • Loading branch information
xuwei-k authored Oct 19, 2024
1 parent 9d7f624 commit 158f542
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion plugin/src/main/scala/com/github/sbt/jni/build/Cargo.scala
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class Cargo(protected val configuration: Seq[String]) extends BuildTool {

val subdir = if (release) "release" else "debug"
val products: List[File] =
(targetDirectory / subdir * ("*.so" | "*.dylib")).get.filter(_.isFile).toList
(targetDirectory / subdir * ("*.so" | "*.dylib")).get().filter(_.isFile).toList

validate(products, multipleOutputs, logger)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@ object JniPackage extends AutoPlugin {
unmanagedPlatformDependentNativeDirectories := Seq(nativePlatform.value -> baseDirectory.value / "lib_native"),
unmanagedNativeLibraries := {
val mappings: Seq[(File, String)] = unmanagedNativeDirectories.value.flatMap { dir =>
val files: Seq[File] = (dir ** "*").get.filter(_.isFile)
val files: Seq[File] = (dir ** "*").get().filter(_.isFile)
files.pair(rebase(dir, "/native"))
}
val mappingsPlatform: Seq[(File, String)] = unmanagedPlatformDependentNativeDirectories.value.flatMap { case (platform, dir) =>
val files: Seq[File] = (dir ** "*").get.filter(_.isFile)
val files: Seq[File] = (dir ** "*").get().filter(_.isFile)
files.pair(rebase(dir, s"/native/$platform"))
}
mappings ++ mappingsPlatform
Expand Down

0 comments on commit 158f542

Please sign in to comment.