Skip to content

Fix old syntax. prepare for sbt 2.x #88

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

Open
xuwei-k wants to merge 1 commit into
base: develop
Choose a base branch
from
+3 −3
Open

Fix old syntax. prepare for sbt 2.x #88

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
6 changes: 3 additions & 3 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ Global / javaHome := {
}
}

def nativeLibrarySettings(platform: String): Seq[Setting[_]] = {
def nativeLibrarySettings(platform: String): Seq[Setting[?]] = {
val key = TaskKey[Path](s"build${platform.head.toUpper}${platform.tail}")
val shortPlatform =
platform match {
Expand Down Expand Up @@ -165,7 +165,7 @@ def nativeLibrarySettings(platform: String): Seq[Setting[_]] = {
},
key / fileInputs += {
val glob = if (shortPlatform == "win32") "*Win*.{c,h}" else "*Unix*.{c,h}"
baseDirectory.value.toGlob / "jni" / glob,
baseDirectory.value.toGlob / "jni" / glob
},
key / skip := ((ThisBuild / nativePlatform).value match {
case `platform` => false
Expand Down Expand Up @@ -200,7 +200,7 @@ def nativeLibrarySettings(platform: String): Seq[Setting[_]] = {

def eval(cmd: Seq[String], logger: Logger): Unit = {
logger.debug(s"Running compilation: ${cmd mkString " "}")
val proc = new java.lang.ProcessBuilder(cmd: _*).start()
val proc = new java.lang.ProcessBuilder(cmd *).start()
val thread = new Thread() {
setDaemon(true)
start()
Expand Down
Loading