From edf20bf4a76aea95a9509943ee4585d763a1f540 Mon Sep 17 00:00:00 2001 From: Dylan Thinnes Date: Fri, 19 Aug 2022 17:48:39 +0100 Subject: [PATCH] Fix StableVersions back to 1.14, make EarlyAccessVersions 1.15 --- .../com/digitalasset/daml/lf/engine/EngineInfoTest.scala | 2 +- .../com/digitalasset/daml/lf/language/LanguageVersion.scala | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/daml-lf/engine/src/test/scala/com/digitalasset/daml/lf/engine/EngineInfoTest.scala b/daml-lf/engine/src/test/scala/com/digitalasset/daml/lf/engine/EngineInfoTest.scala index adf3a2dfa1..1dd878bf0f 100644 --- a/daml-lf/engine/src/test/scala/com/digitalasset/daml/lf/engine/EngineInfoTest.scala +++ b/daml-lf/engine/src/test/scala/com/digitalasset/daml/lf/engine/EngineInfoTest.scala @@ -28,7 +28,7 @@ class EngineInfoTest extends AnyWordSpec with Matchers { "Daml-LF Engine supports LF versions: 1.6, 1.7, 1.8, 1.11, 1.12, 1.13, 1.14" engineEarlyAccess.show shouldBe - "Daml-LF Engine supports LF versions: 1.6, 1.7, 1.8, 1.11, 1.12, 1.13, 1.14" + "Daml-LF Engine supports LF versions: 1.6, 1.7, 1.8, 1.11, 1.12, 1.13, 1.14, 1.15" engineInfoDev.show shouldBe "Daml-LF Engine supports LF versions: 1.6, 1.7, 1.8, 1.11, 1.12, 1.13, 1.14, 1.15, 1.dev" diff --git a/daml-lf/language/src/main/scala/com/digitalasset/daml/lf/language/LanguageVersion.scala b/daml-lf/language/src/main/scala/com/digitalasset/daml/lf/language/LanguageVersion.scala index 7c36593d9c..5c0c43b03c 100644 --- a/daml-lf/language/src/main/scala/com/digitalasset/daml/lf/language/LanguageVersion.scala +++ b/daml-lf/language/src/main/scala/com/digitalasset/daml/lf/language/LanguageVersion.scala @@ -65,7 +65,7 @@ object LanguageVersion { // All the stable versions. val StableVersions: VersionRange[LanguageVersion] = - VersionRange(min = v1_6, max = v1_15) + VersionRange(min = v1_6, max = v1_14) // All versions compatible with legacy contract ID scheme. val LegacyVersions: VersionRange[LanguageVersion] = @@ -74,11 +74,11 @@ object LanguageVersion { // All the stable and preview versions // Equals `Stable` if no preview version is available val EarlyAccessVersions: VersionRange[LanguageVersion] = - StableVersions + StableVersions.copy(max = v1_15) // All the versions val DevVersions: VersionRange[LanguageVersion] = - StableVersions.copy(max = v1_dev) + EarlyAccessVersions.copy(max = v1_dev) val defaultV1: LanguageVersion = StableVersions.max