Skip to content

Commit 2ddf511

Browse files
committed
chore(build): fix fatal build error caused by scala/scala3#20741
1 parent 5ac4371 commit 2ddf511

18 files changed

+108
-97
lines changed

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version = "3.5.3"
1+
version = "3.8.6"
22
runner.dialect = scala3

build.sbt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,14 +218,15 @@ lazy val example = scalajsProject("client", true)
218218
.settings(scalacOptions ++= usedScalacOptions)
219219
.dependsOn(ui5, exampleSharedJs)
220220
.settings(
221-
publish / skip := true
221+
publish / skip := true,
222+
scalacOptions -= "-Xfatal-warnings" // disable fatal warnings due to spurious https://github.com/scala/scala3/issues/20741
222223
)
223224

224225
lazy val exampleShared = crossProject(JSPlatform, JVMPlatform)
225226
.crossType(CrossType.Pure)
226227
.in(file("examples/shared"))
227228
.settings(
228-
publish / skip := true
229+
publish / skip := true,
229230
)
230231
lazy val exampleSharedJvm = exampleShared.jvm
231232
lazy val exampleSharedJs = exampleShared.js

examples/client/src/main/scala/WebSocketDemo.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package samples
77
//import org.scalajs.dom.KeyCode
88

99
object WebSocketDemo {
10-
/*
10+
/*
1111
private def sherpal =
1212
img(src := "images/avatars/ono.png", alt := "Ono")
1313
@@ -55,5 +55,5 @@ object WebSocketDemo {
5555
)
5656
)
5757
)
58-
*/
58+
*/
5959
}

examples/client/src/main/scala/samples/AdHoc.scala

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ import com.raquo.laminar.api.L.*
44
import dev.cheleb.scalamigen.*
55
import io.github.iltotore.iron.constraint.all.*
66

7-
val adhoc = {
7+
val adhoc: Sample = {
88

99
// outside your scope / in another library
1010
// => meaning '@FieldName' or '@NoPanel' annotations are not possible
1111
case class Cat(
1212
name: String,
1313
kind: Boolean = true,
14-
color: Color,
14+
color: Color
1515
)
1616

1717
enum Color(val code: String):
@@ -21,23 +21,24 @@ val adhoc = {
2121

2222
// your library
2323
case class Basket(color: Color, cat: Cat)
24-
24+
2525
given colorForm: Form[Color] =
2626
selectForm(Color.values, labelMapper = c => s"$c ${c.code}")
2727
.withFieldName("Select color")
2828

29-
given Form[Cat] =
30-
Form.autoDerived[Cat]
31-
.withFieldName("Your cat")
32-
.withPanelConfig(label = Some("What kind of cat ?"), asTable = true)
29+
given Form[Cat] =
30+
Form
31+
.autoDerived[Cat]
32+
.withFieldName("Your cat")
33+
.withPanelConfig(label = Some("What kind of cat ?"), asTable = true)
3334

3435
val enumVar = Var(
3536
Basket(
3637
Color.Black,
3738
Cat(
3839
"Scala",
3940
true,
40-
Color.White,
41+
Color.White
4142
)
4243
)
4344
)
@@ -73,10 +74,11 @@ val adhoc = {
7374
| selectForm(Color.values, labelMapper = c => s"$c ${c.code}")
7475
| .withFieldName("Select color")
7576
|
77+
|@annotation.nowarn
7678
|given Form[Cat] =
7779
| Form.autoDerived[Cat]
7880
| .withFieldName("Your cat")
7981
| .withPanelConfig(label = Some("What kind of cat ?"), asTable = true)
8082
|""".stripMargin
8183
)
82-
}
84+
}

examples/client/src/main/scala/samples/Conditional.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ given formExtraString: Form[Option[ExtraString]] =
3636
given formExtraInt: Form[Option[ExtraInt]] =
3737
Form.conditionalOn[ConditionalSample, ExtraInt](conditionalVar)
3838

39-
val conditional = {
39+
val conditional: Sample = {
4040

4141
Sample(
4242
"Conditional",

examples/client/src/main/scala/samples/EitherSample.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package samples
33
import dev.cheleb.scalamigen.*
44
import com.raquo.laminar.api.L.*
55

6-
val either = {
6+
val either: Sample = {
77

88
case class Cat(name: String, age: Int)
99
case class Dog(name: String, age: Int)

examples/client/src/main/scala/samples/EnumSample.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import io.github.iltotore.iron.*
66
import io.github.iltotore.iron.constraint.all.*
77
import java.util.UUID
88

9-
val enums = {
9+
val enums: Sample = {
1010
enum Color(val code: String):
1111
case Black extends Color("000")
1212
case White extends Color("FFF")

examples/client/src/main/scala/samples/ListElement.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package samples
33
import com.raquo.laminar.api.L.*
44
import dev.cheleb.scalamigen.*
55

6-
val list = {
6+
val list: Sample = {
77
case class Person2(id: Int, name: String, age: Int)
88

99
case class ListElement(

examples/client/src/main/scala/samples/OpaqueType.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package samples
33
import com.raquo.laminar.api.L.*
44
import dev.cheleb.scalamigen.*
55

6-
val opaque = {
6+
val opaque: Sample = {
77

88
case class Person(
99
name: String,

examples/client/src/main/scala/samples/Persons.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import java.time.LocalDate
77
import io.github.iltotore.iron.*
88
import io.github.iltotore.iron.constraint.all.*
99

10-
val person = {
10+
val person: Sample = {
1111
// Define some models
1212

1313
@NoPanel

examples/client/src/main/scala/samples/Sealed.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import com.raquo.laminar.api.L.*
66

77
import com.raquo.laminar.nodes.ReactiveHtmlElement
88

9-
val sealedClasses = {
9+
val sealedClasses: Sample = {
1010

1111
enum Color(val code: String):
1212
case Black extends Color("000")

examples/client/src/main/scala/samples/SimpleSample.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import dev.cheleb.scalamigen.*
66
import io.github.iltotore.iron.*
77
import io.github.iltotore.iron.constraint.all.*
88

9-
val simple = {
9+
val simple: Sample = {
1010

1111
case class Cat(
1212
name: String,

examples/client/src/main/scala/samples/Tree.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import com.raquo.laminar.api.L.*
66

77
/** Poc poc =D
88
*/
9-
val tree = {
9+
val tree: Sample = {
1010

1111
enum Tree[+T]:
1212
case Empty extends Tree[Nothing]

examples/client/src/main/scala/samples/Validation.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import com.raquo.laminar.api.L.*
77
import io.github.iltotore.iron.*
88
import io.github.iltotore.iron.constraint.all.*
99

10-
val validation = {
10+
val validation: Sample = {
1111

1212
case class LatLon(lat: Double, lon: Double) {
1313
override def toString: String = s"$lat,$lon"

examples/client/src/main/scala/samples/package.scala

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,24 @@ object Password:
1515

1616
opaque type ExtraString = String
1717
object ExtraString:
18-
def apply(s: String): ExtraString = s
19-
// given Form[ExtraString] = stringForm(identity)
20-
given Form[ExtraString] = stringFormWithValidation(using
21-
new Validator[ExtraString] {
22-
override def validate(str: String): Either[String, ExtraString] =
23-
str.matches("^[a-fA-F0-9]+$") match
24-
case true => Right(str)
25-
case false => Left("expected hexadecimal string (just for demo)")
26-
}
27-
)
28-
given Defaultable[ExtraString] with
29-
def default: ExtraString = ""
30-
18+
def apply(s: String): ExtraString = s
19+
// given Form[ExtraString] = stringForm(identity)
20+
given Form[ExtraString] = stringFormWithValidation(using
21+
new Validator[ExtraString] {
22+
override def validate(str: String): Either[String, ExtraString] =
23+
str.matches("^[a-fA-F0-9]+$") match
24+
case true => Right(str)
25+
case false => Left("expected hexadecimal string (just for demo)")
26+
}
27+
)
28+
given Defaultable[ExtraString] with
29+
def default: ExtraString = ""
3130

3231
opaque type ExtraInt = Int
3332
object ExtraInt:
34-
def apply(i: Int): ExtraInt = i
35-
given Form[ExtraInt] = numericForm(_.toIntOption, 0)
36-
given Defaultable[ExtraInt] with
37-
def default: ExtraInt = 0
33+
def apply(i: Int): ExtraInt = i
34+
given Form[ExtraInt] = numericForm(_.toIntOption, 0)
35+
given Defaultable[ExtraInt] with
36+
def default: ExtraInt = 0
3837

3938
given WidgetFactory = if true then UI5WidgetFactory else LaminarWidgetFactory
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
package dev.cheleb.scalamigen
22

33
trait ConditionalFor[C, A]:
4-
def check: C => Boolean
4+
def check: C => Boolean

0 commit comments

Comments
 (0)