Skip to content

Commit 6278bc7

Browse files
committed
unusedCompileDependenciesFilter scala-js and scala-native
1 parent 6f4cdd4 commit 6278bc7

File tree

5 files changed

+29
-31
lines changed

5 files changed

+29
-31
lines changed

Diff for: project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version = 1.10.2
1+
sbt.version = 1.10.5

Diff for: project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ addSbtPlugin("com.github.cb372" % "sbt-explicit-dependencies" % "0.3.1")
88

99
// Versioning and Release Plugins
1010
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0")
11-
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
11+
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.0")
1212

1313
// Docs Plugins
1414
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.6.1")

Diff for: zio-sbt-ecosystem/build.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ addSbtPlugin("com.github.cb372" % "sbt-explicit-dependencies" % "0.3.1")
88

99
// Versioning and Release Plugins
1010
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0")
11-
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
11+
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.0")
1212

1313
// Docs Plugins
1414
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.6.1")
1515
addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0")
1616
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
1717

1818
// Binary Compatibility Plugin
19-
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3")
19+
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4")
2020

2121
libraryDependencies += "dev.zio" %% "zio" % "2.1.11"

Diff for: zio-sbt-ecosystem/src/main/scala/zio/sbt/ScalaCompilerSettings.scala

+5-7
Original file line numberDiff line numberDiff line change
@@ -211,11 +211,7 @@ trait ScalaCompilerSettings {
211211
},
212212
Test / parallelExecution := scalaBinaryVersion.value != "3", // why not parallel execution for Scala 3?
213213
incOptions ~= (_.withLogRecompileOnMacro(false)),
214-
autoAPIMappings := true,
215-
unusedCompileDependenciesFilter -= moduleFilter(
216-
"org.scala-js",
217-
"scalajs-library"
218-
) // why does it need to be filtered out?
214+
autoAPIMappings := true
219215
) ++ (if (enableCrossProject) crossProjectSettings else Seq.empty) ++ {
220216
packageName match {
221217
case Some(name) => buildInfoSettings(name)
@@ -294,7 +290,8 @@ trait ScalaCompilerSettings {
294290
.requireJS(
295291
false
296292
)
297-
.value
293+
.value,
294+
unusedCompileDependenciesFilter -= moduleFilter("org.scala-js")
298295
)
299296

300297
def jvmSettings: Seq[Setting[_]] = Seq(
@@ -312,7 +309,8 @@ trait ScalaCompilerSettings {
312309
)
313310
.value,
314311
doc / skip := BuildAssertions.requireNative(true).value,
315-
Compile / doc / sources := BuildAssertions.requireNative(Seq.empty).value
312+
Compile / doc / sources := BuildAssertions.requireNative(Seq.empty).value,
313+
unusedCompileDependenciesFilter -= moduleFilter("org.scala-native")
316314
// Test / test := { val _ = (Test / compile).value; () } // ??
317315
)
318316

Diff for: zio-sbt-githubactions/src/main/scala/zio/sbt/githubactionsnative/model.scala

+20-20
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ object Branch {
4141
case object All extends Branch
4242
case class Named(name: String) extends Branch
4343

44-
implicit val codec: JsonCodec[Branch] = JsonCodec.string.transform(
44+
implicit lazy val codec: JsonCodec[Branch] = JsonCodec.string.transform(
4545
{
4646
case "*" => All
4747
case name => Named(name)
@@ -64,15 +64,15 @@ case class Triggers(
6464

6565
object Triggers {
6666

67-
implicit val codec: JsonCodec[Triggers] = DeriveJsonCodec.gen[Triggers]
67+
implicit lazy val codec: JsonCodec[Triggers] = DeriveJsonCodec.gen[Triggers]
6868
}
6969

7070
sealed trait Trigger
7171

7272
object Trigger {
7373
case class InputValue(description: String, required: Boolean, default: String)
7474
object InputValue {
75-
implicit val jsonCodec: JsonCodec[InputValue] = DeriveJsonCodec.gen[InputValue]
75+
implicit lazy val jsonCodec: JsonCodec[InputValue] = DeriveJsonCodec.gen[InputValue]
7676
}
7777

7878
case class WorkflowDispatch(
@@ -86,15 +86,15 @@ object Trigger {
8686
JsonDecoder.keyValueChunk[K, V].map(c => ListMap(c: _*))
8787
)
8888

89-
implicit val jsonCodec: JsonCodec[WorkflowDispatch] = DeriveJsonCodec.gen[WorkflowDispatch]
89+
implicit lazy val jsonCodec: JsonCodec[WorkflowDispatch] = DeriveJsonCodec.gen[WorkflowDispatch]
9090
}
9191

9292
case class Release(
9393
types: Seq[ReleaseType] = Seq.empty
9494
) extends Trigger
9595

9696
object Release {
97-
implicit val jsonCodec: JsonCodec[Release] = DeriveJsonCodec.gen[Release]
97+
implicit lazy val jsonCodec: JsonCodec[Release] = DeriveJsonCodec.gen[Release]
9898
}
9999

100100
sealed trait ReleaseType
@@ -103,7 +103,7 @@ object Trigger {
103103
case object Published extends ReleaseType
104104
case object Prereleased extends ReleaseType
105105

106-
implicit val codec: JsonCodec[ReleaseType] = JsonCodec.string.transformOrFail(
106+
implicit lazy val codec: JsonCodec[ReleaseType] = JsonCodec.string.transformOrFail(
107107
{
108108
case "created" => Right(Created)
109109
case "published" => Right(Published)
@@ -127,7 +127,7 @@ object Trigger {
127127
) extends Trigger
128128

129129
object PullRequest {
130-
implicit val jsonCodec: JsonCodec[PullRequest] = DeriveJsonCodec.gen[PullRequest]
130+
implicit lazy val jsonCodec: JsonCodec[PullRequest] = DeriveJsonCodec.gen[PullRequest]
131131
}
132132

133133
case class Push(
@@ -136,7 +136,7 @@ object Trigger {
136136
) extends Trigger
137137

138138
object Push {
139-
implicit val jsonCodec: JsonCodec[Push] = DeriveJsonCodec.gen[Push]
139+
implicit lazy val jsonCodec: JsonCodec[Push] = DeriveJsonCodec.gen[Push]
140140
}
141141

142142
case class Create(
@@ -145,7 +145,7 @@ object Trigger {
145145
) extends Trigger
146146

147147
object Create {
148-
implicit val jsonCodec: JsonCodec[Create] = DeriveJsonCodec.gen[Create]
148+
implicit lazy val jsonCodec: JsonCodec[Create] = DeriveJsonCodec.gen[Create]
149149
}
150150
}
151151

@@ -155,12 +155,12 @@ case class Strategy(matrix: ListMap[String, List[String]], maxParallel: Option[I
155155
object Strategy {
156156
import Workflow.listMapCodec
157157

158-
implicit val codec: JsonCodec[Strategy] = DeriveJsonCodec.gen[Strategy]
158+
implicit lazy val codec: JsonCodec[Strategy] = DeriveJsonCodec.gen[Strategy]
159159
}
160160

161161
case class ActionRef(ref: String)
162162
object ActionRef {
163-
implicit val codec: JsonCodec[ActionRef] = JsonCodec.string.transform(ActionRef(_), _.ref)
163+
implicit lazy val codec: JsonCodec[ActionRef] = JsonCodec.string.transform(ActionRef(_), _.ref)
164164
}
165165

166166
sealed trait Condition {
@@ -191,7 +191,7 @@ object Condition {
191191
}
192192

193193
object Expression {
194-
implicit val codec: JsonCodec[Expression] = JsonCodec.string.transform(Expression(_), _.asString)
194+
implicit lazy val codec: JsonCodec[Expression] = JsonCodec.string.transform(Expression(_), _.asString)
195195
}
196196

197197
case class Function(expression: String) extends Condition {
@@ -205,10 +205,10 @@ object Condition {
205205
}
206206

207207
object Function {
208-
implicit val codec: JsonCodec[Function] = JsonCodec.string.transform(Function(_), _.expression)
208+
implicit lazy val codec: JsonCodec[Function] = JsonCodec.string.transform(Function(_), _.expression)
209209
}
210210

211-
implicit val codec: JsonCodec[Condition] = JsonCodec.string.transform(
211+
implicit lazy val codec: JsonCodec[Condition] = JsonCodec.string.transform(
212212
{
213213
case expression if expression.startsWith("${{") => Expression(expression)
214214
case expression => Function(expression)
@@ -251,17 +251,17 @@ object Step {
251251
steps.flatMap(_.flatten)
252252
}
253253

254-
implicit val codec: JsonCodec[Step] = DeriveJsonCodec.gen[Step]
254+
implicit lazy val codec: JsonCodec[Step] = DeriveJsonCodec.gen[Step]
255255
}
256256

257257
case class ImageRef(ref: String)
258258
object ImageRef {
259-
implicit val codec: JsonCodec[ImageRef] = JsonCodec.string.transform(ImageRef(_), _.ref)
259+
implicit lazy val codec: JsonCodec[ImageRef] = JsonCodec.string.transform(ImageRef(_), _.ref)
260260
}
261261

262262
case class ServicePort(inner: Int, outer: Int)
263263
object ServicePort {
264-
implicit val codec: JsonCodec[ServicePort] = JsonCodec.string.transformOrFail(
264+
implicit lazy val codec: JsonCodec[ServicePort] = JsonCodec.string.transformOrFail(
265265
v =>
266266
Try(v.split(":", 2).map(_.toInt).toList) match {
267267
case Success(inner :: outer :: Nil) => Right(ServicePort(inner.toInt, outer.toInt))
@@ -279,7 +279,7 @@ case class Service(
279279
ports: Option[Seq[ServicePort]] = None
280280
)
281281
object Service {
282-
implicit val codec: JsonCodec[Service] = DeriveJsonCodec.gen[Service]
282+
implicit lazy val codec: JsonCodec[Service] = DeriveJsonCodec.gen[Service]
283283
}
284284

285285
@jsonMemberNames(KebabCase)
@@ -340,7 +340,7 @@ case class Concurrency(
340340
)
341341

342342
object Concurrency {
343-
implicit val codec: JsonCodec[Concurrency] = DeriveJsonCodec.gen[Concurrency]
343+
implicit lazy val codec: JsonCodec[Concurrency] = DeriveJsonCodec.gen[Concurrency]
344344
}
345345

346346
case class Workflow(
@@ -372,5 +372,5 @@ object Workflow {
372372
JsonEncoder.keyValueIterable[K, V, ListMap],
373373
JsonDecoder.keyValueChunk[K, V].map(c => ListMap(c: _*))
374374
)
375-
implicit val codec: JsonCodec[Workflow] = DeriveJsonCodec.gen[Workflow]
375+
implicit lazy val codec: JsonCodec[Workflow] = DeriveJsonCodec.gen[Workflow]
376376
}

0 commit comments

Comments
 (0)