From ba25726f10c256fdfed9b87501a83adfa9cef512 Mon Sep 17 00:00:00 2001 From: Nadav Samet Date: Tue, 17 Oct 2023 10:14:29 -0700 Subject: [PATCH] Bump Scala.js to 1.14.0 --- CHANGELOG.md | 1 + e2e/src/test/scala/NoBoxSpec.scala | 5 ----- e2e/src/test/scalajvm/NoBoxWithJavaSpec.scala | 6 ++++++ project/plugins.sbt | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 74b7d2a31..a8227db03 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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) diff --git a/e2e/src/test/scala/NoBoxSpec.scala b/e2e/src/test/scala/NoBoxSpec.scala index 0405d6c49..5ae180fd0 100644 --- a/e2e/src/test/scala/NoBoxSpec.scala +++ b/e2e/src/test/scala/NoBoxSpec.scala @@ -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) diff --git a/e2e/src/test/scalajvm/NoBoxWithJavaSpec.scala b/e2e/src/test/scalajvm/NoBoxWithJavaSpec.scala index 5110ff92d..43dc62520 100644 --- a/e2e/src/test/scalajvm/NoBoxWithJavaSpec.scala +++ b/e2e/src/test/scalajvm/NoBoxWithJavaSpec.scala @@ -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) + } + } diff --git a/project/plugins.sbt b/project/plugins.sbt index 2490ec2a6..60de3aa0f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -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")