From f7b44c6b1a30dc7ddf0283f4a0b9288f31b1c0b1 Mon Sep 17 00:00:00 2001 From: Ondra Pelech Date: Wed, 28 Jul 2021 13:01:40 +0200 Subject: [PATCH 1/4] Fix warning (not only) in users' code --- build.sbt | 2 +- core/src/main/scala-2/com/github/sbt/jni/Process.scala | 4 ++-- core/src/main/scala-2/com/github/sbt/jni/annotations.scala | 6 +++--- core/src/main/scala-3/com/github/sbt/jni/Process.scala | 2 +- .../main/scala/com/github/sbt/jni/syntax/NativeLoader.scala | 2 +- .../main/scala/com/github/sbt/jni/plugins/JniNative.scala | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build.sbt b/build.sbt index ead95e4d..6097df5e 100644 --- a/build.sbt +++ b/build.sbt @@ -5,7 +5,7 @@ val macrosParadiseVersion = "2.1.1" ThisBuild / versionScheme := Some("semver-spec") ThisBuild / organization := "com.github.sbt" -ThisBuild / scalacOptions ++= Seq("-deprecation", "-feature") +ThisBuild / scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings") ThisBuild / licenses := Seq(("BSD New", url("http://opensource.org/licenses/BSD-3-Clause"))) ThisBuild / homepage := Some(url("https://github.com/jodersky/sbt-jni")) ThisBuild / developers := List( diff --git a/core/src/main/scala-2/com/github/sbt/jni/Process.scala b/core/src/main/scala-2/com/github/sbt/jni/Process.scala index 220ff800..e9ed8a7f 100644 --- a/core/src/main/scala-2/com/github/sbt/jni/Process.scala +++ b/core/src/main/scala-2/com/github/sbt/jni/Process.scala @@ -3,8 +3,8 @@ package com.github.sbt.jni object Process { def out(command: String): String = try { - scala.sys.process.Process("uname -sm").lineStream.head + scala.sys.process.Process("uname -sm").!!.linesIterator.next() } catch { - case ex: Exception => sys.error("Error running `uname` command") + case _: Exception => sys.error("Error running `uname` command") } } diff --git a/core/src/main/scala-2/com/github/sbt/jni/annotations.scala b/core/src/main/scala-2/com/github/sbt/jni/annotations.scala index 215dc2e3..eb13f51c 100644 --- a/core/src/main/scala-2/com/github/sbt/jni/annotations.scala +++ b/core/src/main/scala-2/com/github/sbt/jni/annotations.scala @@ -44,9 +44,9 @@ class nativeLoaderAnnotationMacro(val c: Context) { val tmp: Path = Files.createTempDirectory("jni-") val plat: String = { val line = try { - scala.sys.process.Process("uname -sm").lineStream.head + scala.sys.process.Process("uname -sm").!!.linesIterator.next() } catch { - case ex: Exception => sys.error("Error running `uname` command") + case _: Exception => sys.error("Error running `uname` command") } val parts = line.split(" ") if (parts.length != 2) { @@ -80,7 +80,7 @@ class nativeLoaderAnnotationMacro(val c: Context) { def load(): Unit = try { System.loadLibrary($nativeLibrary) } catch { - case ex: UnsatisfiedLinkError => loadPackaged() + case _: UnsatisfiedLinkError => loadPackaged() } load() diff --git a/core/src/main/scala-3/com/github/sbt/jni/Process.scala b/core/src/main/scala-3/com/github/sbt/jni/Process.scala index 581c4406..8aa61dfa 100644 --- a/core/src/main/scala-3/com/github/sbt/jni/Process.scala +++ b/core/src/main/scala-3/com/github/sbt/jni/Process.scala @@ -5,6 +5,6 @@ object Process { try { scala.sys.process.Process("uname -sm").lazyLines.head } catch { - case ex: Exception => sys.error("Error running `uname` command") + case _: Exception => sys.error("Error running `uname` command") } } diff --git a/core/src/main/scala/com/github/sbt/jni/syntax/NativeLoader.scala b/core/src/main/scala/com/github/sbt/jni/syntax/NativeLoader.scala index 26ae126a..bbd6d7c3 100644 --- a/core/src/main/scala/com/github/sbt/jni/syntax/NativeLoader.scala +++ b/core/src/main/scala/com/github/sbt/jni/syntax/NativeLoader.scala @@ -50,7 +50,7 @@ object NativeLoader { def load(): Unit = try { System.loadLibrary(nativeLibrary) } catch { - case ex: UnsatisfiedLinkError => loadPackaged() + case _: UnsatisfiedLinkError => loadPackaged() } load() diff --git a/plugin/src/main/scala/com/github/sbt/jni/plugins/JniNative.scala b/plugin/src/main/scala/com/github/sbt/jni/plugins/JniNative.scala index 4cddf0dd..ccbd1db9 100644 --- a/plugin/src/main/scala/com/github/sbt/jni/plugins/JniNative.scala +++ b/plugin/src/main/scala/com/github/sbt/jni/plugins/JniNative.scala @@ -53,7 +53,7 @@ object JniNative extends AutoPlugin { arch + "-" + kernel } } catch { - case ex: Exception => + case _: Exception => sLog.value.error("Error trying to determine platform.") sLog.value.warn("Cannot determine platform! It will be set to 'unknown'.") "unknown-unknown" From 64e26dbec3c4cd025eba4cf88f650a948d226995 Mon Sep 17 00:00:00 2001 From: Ondra Pelech Date: Wed, 28 Jul 2021 15:30:10 +0200 Subject: [PATCH 2/4] Unify Process --- core/src/main/scala-3/com/github/sbt/jni/Process.scala | 10 ---------- .../com/github/sbt/jni/Process.scala | 0 2 files changed, 10 deletions(-) delete mode 100644 core/src/main/scala-3/com/github/sbt/jni/Process.scala rename core/src/main/{scala-2 => scala}/com/github/sbt/jni/Process.scala (100%) diff --git a/core/src/main/scala-3/com/github/sbt/jni/Process.scala b/core/src/main/scala-3/com/github/sbt/jni/Process.scala deleted file mode 100644 index 8aa61dfa..00000000 --- a/core/src/main/scala-3/com/github/sbt/jni/Process.scala +++ /dev/null @@ -1,10 +0,0 @@ -package com.github.sbt.jni - -object Process { - def out(command: String): String = - try { - scala.sys.process.Process("uname -sm").lazyLines.head - } catch { - case _: Exception => sys.error("Error running `uname` command") - } -} diff --git a/core/src/main/scala-2/com/github/sbt/jni/Process.scala b/core/src/main/scala/com/github/sbt/jni/Process.scala similarity index 100% rename from core/src/main/scala-2/com/github/sbt/jni/Process.scala rename to core/src/main/scala/com/github/sbt/jni/Process.scala From 4034c303112ee4eb9fe3ee8c12d3d13fa124a004 Mon Sep 17 00:00:00 2001 From: Ondra Pelech Date: Wed, 28 Jul 2021 15:53:25 +0200 Subject: [PATCH 3/4] remove Process --- core/src/main/scala/com/github/sbt/jni/Process.scala | 10 ---------- .../scala/com/github/sbt/jni/syntax/NativeLoader.scala | 7 ++++++- 2 files changed, 6 insertions(+), 11 deletions(-) delete mode 100644 core/src/main/scala/com/github/sbt/jni/Process.scala diff --git a/core/src/main/scala/com/github/sbt/jni/Process.scala b/core/src/main/scala/com/github/sbt/jni/Process.scala deleted file mode 100644 index e9ed8a7f..00000000 --- a/core/src/main/scala/com/github/sbt/jni/Process.scala +++ /dev/null @@ -1,10 +0,0 @@ -package com.github.sbt.jni - -object Process { - def out(command: String): String = - try { - scala.sys.process.Process("uname -sm").!!.linesIterator.next() - } catch { - case _: Exception => sys.error("Error running `uname` command") - } -} diff --git a/core/src/main/scala/com/github/sbt/jni/syntax/NativeLoader.scala b/core/src/main/scala/com/github/sbt/jni/syntax/NativeLoader.scala index bbd6d7c3..622aced9 100644 --- a/core/src/main/scala/com/github/sbt/jni/syntax/NativeLoader.scala +++ b/core/src/main/scala/com/github/sbt/jni/syntax/NativeLoader.scala @@ -16,7 +16,12 @@ object NativeLoader { val tmp: Path = Files.createTempDirectory("jni-") val plat: String = { - val line = Process.out("uname -sm") + val line = + try { + scala.sys.process.Process("uname -sm").!!.linesIterator.next() + } catch { + case _: Exception => sys.error("Error running `uname` command") + } val parts = line.split(" ") if (parts.length != 2) { sys.error("Could not determine platform: 'uname -sm' returned unexpected string: " + line) From c193e7f784db683ddf47645ff7d0a85cf8d31cf9 Mon Sep 17 00:00:00 2001 From: Ondra Pelech Date: Wed, 28 Jul 2021 15:54:00 +0200 Subject: [PATCH 4/4] remove Process --- .../src/main/scala/com/github/sbt/jni/syntax/NativeLoader.scala | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/src/main/scala/com/github/sbt/jni/syntax/NativeLoader.scala b/core/src/main/scala/com/github/sbt/jni/syntax/NativeLoader.scala index 622aced9..ac7e92bf 100644 --- a/core/src/main/scala/com/github/sbt/jni/syntax/NativeLoader.scala +++ b/core/src/main/scala/com/github/sbt/jni/syntax/NativeLoader.scala @@ -1,7 +1,5 @@ package com.github.sbt.jni.syntax -import com.github.sbt.jni.Process - import java.nio.file.{Files, Path} class NativeLoader(nativeLibrary: String) {