Skip to content

use new wildcard syntax #454

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

Merged
mkurz merged 1 commit into from
Aug 19, 2025
Merged

use new wildcard syntax #454

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions src/main/scala/com/typesafe/sbteclipse/core/Eclipse.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down Expand Up @@ -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 =
Expand Down
10 changes: 5 additions & 5 deletions src/main/scala/com/typesafe/sbteclipse/core/EclipsePlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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,
Expand All @@ -64,7 +64,7 @@ object EclipsePlugin {
skipProject := true)
}

def globalEclipseSettings: Seq[Setting[_]] = {
def globalEclipseSettings: Seq[Setting[?]] = {
import EclipseKeys._
Seq(
executionEnvironment := None,
Expand All @@ -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._
Expand Down Expand Up @@ -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.")

Expand Down
6 changes: 3 additions & 3 deletions src/main/scala/com/typesafe/sbteclipse/plugin/EclipsePlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading