Skip to content

Commit

Permalink
Simplify mima filters, go back to 'add' from 'append' on Map fields.
Browse files Browse the repository at this point in the history
  • Loading branch information
zarthross committed Aug 10, 2024
1 parent 642372e commit 0cdae5c
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 27 deletions.
19 changes: 5 additions & 14 deletions github-actions/mima.sbt
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
import com.typesafe.tools.mima.core._
mimaBinaryIssueFilters ++= Seq(
"org.typelevel.sbt.gha.WorkflowJob.with*",
"org.typelevel.sbt.gha.WorkflowJob.append*",
"org.typelevel.sbt.gha.WorkflowJob.updated*",
"org.typelevel.sbt.gha.WorkflowStep.updated*",
"org.typelevel.sbt.gha.WorkflowStep.append*",
"org.typelevel.sbt.gha.WorkflowStep#Sbt.with*",
"org.typelevel.sbt.gha.WorkflowStep#Sbt.append*",
"org.typelevel.sbt.gha.WorkflowStep#Sbt.updated*",
"org.typelevel.sbt.gha.WorkflowStep#Run.with*",
"org.typelevel.sbt.gha.WorkflowStep#Run.append*",
"org.typelevel.sbt.gha.WorkflowStep#Run.updated*",
"org.typelevel.sbt.gha.WorkflowStep#Use.with*",
"org.typelevel.sbt.gha.WorkflowStep#Use.append*",
"org.typelevel.sbt.gha.WorkflowStep#Use.updated*"
"org.typelevel.sbt.gha.WorkflowJob.*",
"org.typelevel.sbt.gha.WorkflowStep.**",
"org.typelevel.sbt.gha.WorkflowStep#Sbt.*",
"org.typelevel.sbt.gha.WorkflowStep#Run.*",
"org.typelevel.sbt.gha.WorkflowStep#Use.*"
).map(ProblemFilters.exclude[ReversedMissingMethodProblem](_))
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ sealed abstract class WorkflowStep extends Product with Serializable {
def withTimeoutMinutes(minutes: Option[Int]): WorkflowStep

def updatedEnv(name: String, value: String): WorkflowStep
def appendEnv(env: Map[String, String]): WorkflowStep
def addEnv(env: Map[String, String]): WorkflowStep
}

object WorkflowStep {
Expand Down Expand Up @@ -127,9 +127,9 @@ object WorkflowStep {
def withWorkingDirectory(workingDirectory: Option[String]): Run

def updatedEnv(name: String, value: String): Run
def appendEnv(env: Map[String, String]): Run
def addEnv(env: Map[String, String]): Run
def updatedParams(name: String, value: String): Run
def appendParams(params: Map[String, String]): Run
def addParams(params: Map[String, String]): Run
}

object Run {
Expand Down Expand Up @@ -167,9 +167,9 @@ object WorkflowStep {
def withWorkingDirectory(workingDirectory: Option[String]) = copy(workingDirectory = workingDirectory)

def updatedEnv(name: String, value: String) = copy(env = this.env.updated(name, value))
def appendEnv(env: Map[String, String]) = copy(env = this.env ++ env)
def addEnv(env: Map[String, String]) = copy(env = this.env ++ env)
def updatedParams(name: String, value: String) = copy(params = this.params.updated(name, value))
def appendParams(params: Map[String, String]) = copy(params = this.params ++ params)
def addParams(params: Map[String, String]) = copy(params = this.params ++ params)
// scalafmt: { maxColumn = 96 }
}
}
Expand All @@ -184,9 +184,9 @@ object WorkflowStep {
def withPreamble(preamble: Boolean): Sbt

def updatedEnv(name: String, value: String): Sbt
def appendEnv(env: Map[String, String]): Sbt
def addEnv(env: Map[String, String]): Sbt
def updatedParams(name: String, value: String): Sbt
def appendParams(params: Map[String, String]): Sbt
def addParams(params: Map[String, String]): Sbt
}

object Sbt {
Expand Down Expand Up @@ -224,9 +224,9 @@ object WorkflowStep {
def withPreamble(preamble: Boolean) = copy(preamble = preamble)

def updatedEnv(name: String, value: String) = copy(env = this.env.updated(name, value))
def appendEnv(env: Map[String, String]) = copy(env = this.env ++ env)
def addEnv(env: Map[String, String]) = copy(env = this.env ++ env)
def updatedParams(name: String, value: String) = copy(params = params.updated(name, value))
def appendParams(params: Map[String, String]) = copy(params = this.params ++ params)
def addParams(params: Map[String, String]) = copy(params = this.params ++ params)
// scalafmt: { maxColumn = 96 }
}
}
Expand All @@ -239,9 +239,9 @@ object WorkflowStep {
def withParams(params: Map[String, String]): Use

def updatedEnv(name: String, value: String): Use
def appendEnv(env: Map[String, String]): Use
def addEnv(env: Map[String, String]): Use
def updatedParams(name: String, value: String): Use
def appendParams(params: Map[String, String]): Use
def addParams(params: Map[String, String]): Use
}

object Use {
Expand Down Expand Up @@ -277,9 +277,9 @@ object WorkflowStep {
def withParams(params: Map[String, String]) = copy(params = params)

def updatedEnv(name: String, value: String) = copy(env = this.env.updated(name, value))
def appendEnv(env: Map[String, String]) = copy(env = this.env ++ env)
def addEnv(env: Map[String, String]) = copy(env = this.env ++ env)
def updatedParams(name: String, value: String) = copy(params = params.updated(name, value))
def appendParams(params: Map[String, String]) = copy(params = this.params ++ params)
def addParams(params: Map[String, String]) = copy(params = this.params ++ params)
// scalafmt: { maxColumn = 96 }
}
}
Expand Down

0 comments on commit 0cdae5c

Please sign in to comment.