Skip to content

Commit

Permalink
Bump Scala.js to 1.14.0
Browse files Browse the repository at this point in the history
  • Loading branch information
thesamet committed Oct 17, 2023
1 parent 2ccf02d commit ba25726
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
scope.
- Add `derives` and `sealed_oneof_derives` to the message options that adds a
derived clause to generated messages and sealed oneofs.
- Bump Scala.js to 1.14.0

## [0.11.13]
- Added input and output message type for method descriptor (#1503)
Expand Down
5 changes: 0 additions & 5 deletions e2e/src/test/scala/NoBoxSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,6 @@ class NoBoxSpec extends AnyFlatSpec with Matchers {
scalaCar.tyre1 must be(Tyre.defaultInstance)
}

"Scala message with a no_box field with null value" should "throw exception when being serialized" in {
val car = Car(tyre1 = null)
a[Exception] shouldBe thrownBy(car.toByteArray)
}

"Scala message with a no_box reference" should "generate correct types" in {
val car = Car()
car.dontBoxMeDef mustBe (DontBoxMe.defaultInstance)
Expand Down
6 changes: 6 additions & 0 deletions e2e/src/test/scalajvm/NoBoxWithJavaSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,10 @@ class NoBoxWithJavaSpec extends AnyFlatSpec with Matchers {
val p = Person("", Money(BigDecimal("123.123")))
Person.fromJavaProto(Person.toJavaProto(p)) must be(p)
}

"Scala message with a no_box field with null value" should "throw exception when being serialized" in {
val car = Car(tyre1 = null)
a[Exception] shouldBe thrownBy(car.toByteArray)
}

}
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.12.0")
val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("1.14.0")

addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10")

Expand Down

0 comments on commit ba25726

Please sign in to comment.