Skip to content

Commit 1fa04cd

Browse files
authored
use new wildcard and varargs syntax (#272)
1 parent b5d6627 commit 1fa04cd

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

plugin/src/main/scala/com/github/sbt/jni/plugins/JniJavah.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ object JniJavah extends AutoPlugin {
3232
}
3333
import autoImport._
3434

35-
lazy val mainSettings: Seq[Setting[_]] = Seq(
35+
lazy val mainSettings: Seq[Setting[?]] = Seq(
3636
javah / javahClasses := {
3737
import xsbti.compile._
3838
val compiled: CompileAnalysis = (Compile / compile).value
@@ -43,8 +43,8 @@ object JniJavah extends AutoPlugin {
4343
.keySet
4444
.map { vf =>
4545
(vf.names() match {
46-
case Array(prefix, first, more @ _*) if prefix.startsWith("${") =>
47-
Paths.get(first, more: _*)
46+
case Array(prefix, first, more*) if prefix.startsWith("${") =>
47+
Paths.get(first, more*)
4848
case _ =>
4949
Paths.get(URI.create("file:///" + vf.id().stripPrefix("/")))
5050
}).toFile()

plugin/src/main/scala/com/github/sbt/jni/plugins/JniLoad.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ object JniLoad extends AutoPlugin {
2222

2323
import autoImport._
2424

25-
lazy val settings: Seq[Setting[_]] = Seq(
25+
lazy val settings: Seq[Setting[?]] = Seq(
2626
sbtJniCoreScope := Provided,
2727
// Macro Paradise plugin and dependencies are needed to expand annotation macros.
2828
// Once expanded however, downstream projects don't need these dependencies anymore

plugin/src/main/scala/com/github/sbt/jni/plugins/JniNative.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ object JniNative extends AutoPlugin {
3939

4040
val nativeBuildToolInstance = taskKey[BuildTool#Instance]("Get an instance of the current native build tool.")
4141

42-
lazy val settings: Seq[Setting[_]] = Seq(
42+
lazy val settings: Seq[Setting[?]] = Seq(
4343
// the value retruned must match that of `com.github.sbt.jni.PlatformMacros#current()` of project `macros`
4444
nativePlatform := {
4545
try {

plugin/src/main/scala/com/github/sbt/jni/plugins/JniPackage.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ object JniPackage extends AutoPlugin {
5555
import JniNative.autoImport._
5656
import CollectionOps._
5757

58-
lazy val settings: Seq[Setting[_]] = Seq(
58+
lazy val settings: Seq[Setting[?]] = Seq(
5959
enableNativeCompilation := true,
6060
unmanagedNativeDirectories := Seq(baseDirectory.value / "lib_native"),
6161
unmanagedPlatformDependentNativeDirectories := Seq(nativePlatform.value -> baseDirectory.value / "lib_native"),

0 commit comments

Comments
 (0)