Merge pull request #454 from xuwei-k/wildcard-syntax

mkurz · web-flow · commit 935d90e4fcf8 · 2025-08-19T11:56:39.000+02:00
use new wildcard syntax
diff --git a/src/main/scala/com/typesafe/sbteclipse/core/Eclipse.scala b/src/main/scala/com/typesafe/sbteclipse/core/Eclipse.scala
@@ -238,7 +238,7 @@ private object Eclipse extends EclipseSDTConfig {
     } yield n
   }
 
-  def executePreTasks(preTasks: Seq[(TaskKey[_], ProjectRef)], state: State): Unit =
+  def executePreTasks(preTasks: Seq[(TaskKey[?], ProjectRef)], state: State): Unit =
     for ((preTask, ref) <- preTasks) evaluateTask(preTask, ref, state)
 
   def projectXml(name: String, builderAndNatures: (String, Seq[String]), linkedSrcDirectories: Seq[(File, Option[String], File, Option[String])]): Node = {
@@ -632,7 +632,7 @@ private object Eclipse extends EclipseSDTConfig {
   def eclipseOutput(ref: ProjectRef, state: State)(config: Configuration): Option[String] =
     setting((ref / config / EclipseKeys.eclipseOutput), state)
 
-  def preTasks(ref: ProjectRef, state: State): Seq[(TaskKey[_], ProjectRef)] =
+  def preTasks(ref: ProjectRef, state: State): Seq[(TaskKey[?], ProjectRef)] =
     setting((ref / EclipseKeys.preTasks), state).zipAll(Seq.empty, null, ref)
 
   def relativizeLibs(ref: ProjectRef, state: State): Boolean =
diff --git a/src/main/scala/com/typesafe/sbteclipse/core/EclipsePlugin.scala b/src/main/scala/com/typesafe/sbteclipse/core/EclipsePlugin.scala
@@ -30,7 +30,7 @@ import scala.xml.transform.RewriteRule
 object EclipsePlugin {
 
   /** These settings are injected into individual projects. */
-  def eclipseSettings: Seq[Setting[_]] = {
+  def eclipseSettings: Seq[Setting[?]] = {
     import EclipseKeys._
     Seq(
       commandName := "eclipse",
@@ -54,7 +54,7 @@ object EclipsePlugin {
   }
 
   /** These settings are injected into the "ThisBuild" scope of sbt, i.e. global acrosss projects. */
-  def buildEclipseSettings: Seq[Setting[_]] = {
+  def buildEclipseSettings: Seq[Setting[?]] = {
     import EclipseKeys._
     Seq(
       skipParents := true,
@@ -64,7 +64,7 @@ object EclipsePlugin {
       skipProject := true)
   }
 
-  def globalEclipseSettings: Seq[Setting[_]] = {
+  def globalEclipseSettings: Seq[Setting[?]] = {
     import EclipseKeys._
     Seq(
       executionEnvironment := None,
@@ -78,7 +78,7 @@ object EclipsePlugin {
       relativizeLibs := true)
   }
 
-  def copyManagedSettings(scope: Configuration): Seq[Setting[_]] =
+  def copyManagedSettings(scope: Configuration): Seq[Setting[?]] =
     Seq(
       (scope / EclipseKeys.classesManaged) := {
         import sbt._
@@ -184,7 +184,7 @@ object EclipsePlugin {
       prefix("eclipse-output"),
       "The optional output for Eclipse.")
 
-    val preTasks: SettingKey[Seq[TaskKey[_]]] = SettingKey(
+    val preTasks: SettingKey[Seq[TaskKey[?]]] = SettingKey(
       prefix("pre-tasks"),
       "The tasks to be evaluated prior to creating the Eclipse project definition.")
 
diff --git a/src/main/scala/com/typesafe/sbteclipse/plugin/EclipsePlugin.scala b/src/main/scala/com/typesafe/sbteclipse/plugin/EclipsePlugin.scala
@@ -30,9 +30,9 @@ object EclipsePlugin extends AutoPlugin {
   override def trigger = allRequirements
   // Auto import semantics users expect today.
   val autoImport: EclipseCorePlugin.type = EclipseCorePlugin
-  override def projectSettings: Seq[Setting[_]] = EclipseCorePlugin.eclipseSettings
-  override def buildSettings: Seq[Setting[_]] = EclipseCorePlugin.buildEclipseSettings
-  override def globalSettings: Seq[Setting[_]] = EclipseCorePlugin.globalEclipseSettings
+  override def projectSettings: Seq[Setting[?]] = EclipseCorePlugin.eclipseSettings
+  override def buildSettings: Seq[Setting[?]] = EclipseCorePlugin.buildEclipseSettings
+  override def globalSettings: Seq[Setting[?]] = EclipseCorePlugin.globalEclipseSettings
   // Alias for existing things.
   val EclipseKeys = EclipseCorePlugin.EclipseKeys
   val EclipseProjectFlavor = EclipseCorePlugin.EclipseProjectFlavor
