Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LF: Release LF 1.14 #10077

Merged
merged 1 commit into from
Jun 24, 2021
Merged

LF: Release LF 1.14 #10077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion daml-lf/engine/src/test/scala/com/digitalasset/daml/lf/engine/EngineInfoTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class EngineInfoTest extends AnyWordSpec with Matchers {
"Daml-LF Engine supports LF versions: 1.6, 1.7, 1.8"

engineInfoStable.show shouldBe
"Daml-LF Engine supports LF versions: 1.6, 1.7, 1.8, 1.11, 1.12, 1.13"
"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"
Expand Down
3 changes: 1 addition & 2 deletions daml-lf/language/daml-lf.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
lf_version_configuration = {
"legacy": "1.8",
"stable": "1.13",
"latest": "1.13",
"preview": "1.14",
"latest": "1.14",
"dev": "1.dev",
}

Expand Down
4 changes: 2 additions & 2 deletions daml-lf/language/src/main/scala/com/digitalasset/daml/lf/language/LanguageVersion.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ object LanguageVersion {

// All the stable versions.
val StableVersions: VersionRange[LanguageVersion] =
VersionRange(min = v1_6, max = v1_13)
VersionRange(min = v1_6, max = v1_14)

// All versions compatible with legacy contract ID scheme.
val LegacyVersions: VersionRange[LanguageVersion] =
Expand All @@ -67,7 +67,7 @@ object LanguageVersion {
// All the stable and preview versions
// Equals `Stable` if no preview version is available
val EarlyAccessVersions: VersionRange[LanguageVersion] =
StableVersions.copy(max = v1_14)
StableVersions

// All the versions
val DevVersions: VersionRange[LanguageVersion] =
Expand Down
6 changes: 3 additions & 3 deletions daml-lf/spec/daml-lf-1.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,12 +250,12 @@ Version: 1.13
- add `BigNumeric` builtins


Version: 1.14 (preview)
.......................
Version: 1.14
.............

* Introduction date:

2021-06-03
2021-06-22
remyhaemmerle-da marked this conversation as resolved.
Show resolved Hide resolved

* Description:

Expand Down
4 changes: 2 additions & 2 deletions daml-lf/spec/transaction.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
Daml-LF Transaction Specification
=================================

**version 14, 04 June 2021**
**version 14, 22 June 2021**
remyhaemmerle-da marked this conversation as resolved.
Show resolved Hide resolved

This specification, in concert with the ``transaction.proto``
machine-readable definition, defines a format for *Daml-LF
Expand Down Expand Up @@ -183,7 +183,7 @@ later.
+--------------------+-----------------+
| 13 | 2021-04-06 |
+--------------------+-----------------+
| (preview) 14 | 2021-06-03 |
| 14 | 2021-06-03 |
remyhaemmerle-da marked this conversation as resolved.
Show resolved Hide resolved
+--------------------+-----------------+
| dev | |
+--------------------+-----------------+
Expand Down
6 changes: 4 additions & 2 deletions daml-lf/spec/value.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Daml-LF Value Specification
===========================

**version 13, 06 April 2021**
**version 14, 22 June 2021**
remyhaemmerle-da marked this conversation as resolved.
Show resolved Hide resolved

The Daml-LF language includes ways to define *data types*,
specifications of structure, and includes rules by which a restricted
Expand Down Expand Up @@ -162,7 +162,9 @@ later.
+--------------------+-----------------+
| 13 | 2021-04-06 |
+--------------------+-----------------+
| dev | 2019-12-14 |
| 14 | 2021-22-06 |
remyhaemmerle-da marked this conversation as resolved.
Show resolved Hide resolved
+--------------------+-----------------+
| dev | |
+--------------------+-----------------+

message VersionedValue
Expand Down
8 changes: 4 additions & 4 deletions daml-lf/tests/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ daml_compile(
name = "Exceptions",
srcs = ["Exceptions.daml"],
# TODO https://github.com/digital-asset/daml/issues/9914
# Switch to "stable" once LF 1.14 is released.
target = lf_version_configuration.get("preview"),
# Drop line once LF 1.14 is the default compiler output.
target = lf_version_configuration.get("latest"),
visibility = ["//daml-lf:__subpackages__"],
)

Expand Down Expand Up @@ -73,8 +73,8 @@ daml_compile(
name = "MultiKeys",
srcs = ["MultiKeys.daml"],
# TODO https://github.com/digital-asset/daml/issues/9914
# Switch to "stable" once LF 1.14 is released.
target = lf_version_configuration.get("preview"),
# Drop line once LF 1.14 is the default compiler output.
target = lf_version_configuration.get("latest"),
visibility = ["//daml-lf:__subpackages__"],
)

Expand Down
8 changes: 2 additions & 6 deletions ...-lf/transaction/src/test/scala/com/digitalasset/daml/lf/transaction/TransactionSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,9 +291,7 @@ class TransactionSpec

"contractKeys" - {
"return all the contract keys" in {
// TODO: https://github.com/digital-asset/daml/issues/9914
// change to TransactionVersion.StableVersions.max LF 1.14 is released
val builder = TransactionBuilder(TransactionVersion.EarlyAccessVersions.max)
val builder = TransactionBuilder(TransactionVersion.StableVersions.max)
val parties = List("Alice")

def create(s: String) = builder
Expand Down Expand Up @@ -393,9 +391,7 @@ class TransactionSpec

"contractKeyInputs" - {
import Transaction._
// TODO: https://github.com/digital-asset/daml/issues/9914
// change to TransactionVersion.StableVersions.max LF 1.14 is released
val dummyBuilder = TransactionBuilder(TransactionVersion.EarlyAccessVersions.max)
val dummyBuilder = TransactionBuilder(TransactionVersion.StableVersions.max)
val parties = List("Alice")
val tmplId = Ref.Identifier.assertFromString("-pkg-:Mod:T")
def keyValue(s: String) = V.ValueText(s)
Expand Down
6 changes: 4 additions & 2 deletions ledger/ledger-api-test-tool-on-canton/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ conformance_test(
],
lf_versions = [
"stable",
"latest",
# FIXME: enable the following line once canton-test-runner supports LF 1.14
# "latest",
Comment on lines +66 to +67
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cc @oliverse-da

],
ports = [
5011,
Expand Down Expand Up @@ -103,7 +104,8 @@ conformance_test(
],
lf_versions = [
"stable",
"latest",
# FIXME: enable the following line once canton-test-runner supports LF 1.14
# "latest",
],
ports = [
5011,
Expand Down
8 changes: 4 additions & 4 deletions ledger/sandbox-classic/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,8 +400,8 @@ server_conformance_test(
server_conformance_test(
name = "conformance-test-exceptions",
# TODO https://github.com/digital-asset/daml/issues/9914
# Switch to "stable" once LF 1.14 is released.
lf_versions = ["preview"],
# Drop line once LF 1.14 is the default compiler output.
lf_versions = ["latest"],
server_args = [
"--wall-clock-time",
"--contract-id-seeding=testing-weak",
Expand All @@ -416,8 +416,8 @@ server_conformance_test(
server_conformance_test(
name = "conformance-test-exceptions-append-only",
# TODO https://github.com/digital-asset/daml/issues/9914
# Switch to "stable" once LF 1.14 is released.
lf_versions = ["preview"],
# Drop line once LF 1.14 is the default compiler output.
lf_versions = ["latest"],
server_args = [
"--wall-clock-time",
"--contract-id-seeding=testing-weak",
Expand Down
4 changes: 4 additions & 0 deletions release/artifacts.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@
type: jar-lib
- target: //daml-lf/archive:daml_lf_1.13_archive_proto_java
type: jar-proto
- target: //daml-lf/archive:daml_lf_1.14_archive_proto_jar
type: jar-lib
- target: //daml-lf/archive:daml_lf_1.14_archive_proto_java
type: jar-proto
- target: //daml-lf/archive:daml_lf_dev_archive_proto_jar
type: jar-lib
- target: //daml-lf/archive:daml_lf_dev_archive_proto_java
Expand Down