digital-asset/daml
1
1
Fork 0
mirror of https://github.com/digital-asset/daml.git synced 2024-09-19 00:37:23 +03:00
Code Issues Projects Releases Wiki Activity

move proto archive in com.digitalasset (#19497)

Browse Source
This commit is contained in:
Remy 2024-07-09 17:15:30 +02:00 committed by GitHub
parent 6996fa07c1
commit 2871090358
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
76 changed files with 139 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sdk/bazel_tools/haskell.bzl
View File

@ -405,7 +405,7 @@ EOF
s#^haskell_toolchain_library rule (@stackage//:([a-zA-Z0-9\\-]+))$$#\\2 \\1#g
s#^haskell_toolchain_library rule (@stackage//:([a-zA-Z0-9\\-]+))$$#\\2 \\1#g
s#^haskell_cabal_library rule (@stackage//:([a-zA-Z0-9\\-]+))$$#\\2 \\1#g
s#^_haskell_library rule (//[A-Za-z0-9/_\\-]+:daml_lf_dev_archive_haskell_proto)$$#daml-lf-proto-types \\1#g
s#^_haskell_library rule (//[A-Za-z0-9/_\\-]+:daml_lf_archive_haskell_proto)$$#daml-lf-proto-types \\1#g
s#^_haskell_library rule (//[A-Za-z0-9/_\\-]+:([A-Za-z0-9/_\\-]+))$$#\\2 \\1#g
s#^alias rule (@stackage//:([a-zA-Z0-9\\-]+))$$#\\2 \\1#g
T;p
@ -430,7 +430,7 @@ EOF
s#^haskell_toolchain_library rule (@stackage//:([a-zA-Z0-9\\-]+))$$#\\2 \\1#g
s#^haskell_toolchain_library rule (@stackage//:([a-zA-Z0-9\\-]+))$$#\\2 \\1#g
s#^haskell_cabal_library rule (@stackage//:([a-zA-Z0-9\\-]+))$$#\\2 \\1#g
s#^_haskell_library rule (//[A-Za-z0-9/_\\-]+:daml_lf_dev_archive_haskell_proto)$$#daml-lf-proto-types \\1#g
s#^_haskell_library rule (//[A-Za-z0-9/_\\-]+:daml_lf_archive_haskell_proto)$$#daml-lf-proto-types \\1#g
s#^_haskell_library rule (//[A-Za-z0-9/_\\-]+:([A-Za-z0-9/_\\-]+))$$#\\2 \\1#g
s#^alias rule (@stackage//:([a-zA-Z0-9\\-]+))$$#\\2 \\1#g
T;p

6
sdk/canton/BUILD.bazel
View File

@ -617,8 +617,8 @@ scala_library(
":daml-common-staging_util-external",
":ledger_api_proto_scala",
":pekko-stream-minus-patched-classes",
"//daml-lf/archive:daml_lf_archive_proto_java",
"//daml-lf/archive:daml_lf_archive_reader",
"//daml-lf/archive:daml_lf_dev_archive_proto_java",
"//daml-lf/data",
"//daml-lf/engine",
"//daml-lf/language",
@ -710,8 +710,8 @@ scala_library(
":ledger_api_proto_scala",
":pekko-stream-minus-patched-classes",
"//daml-lf/api-type-signature",
"//daml-lf/archive:daml_lf_archive_proto_java",
"//daml-lf/archive:daml_lf_archive_reader",
"//daml-lf/archive:daml_lf_dev_archive_proto_java",
"//daml-lf/data",
"//daml-lf/language",
"//daml-lf/transaction",
@ -962,8 +962,8 @@ scala_library(
":daml-common-staging_util-external",
":ledger_api_proto_scala",
":pekko-stream-minus-patched-classes",
"//daml-lf/archive:daml_lf_archive_proto_java",
"//daml-lf/archive:daml_lf_archive_reader",
"//daml-lf/archive:daml_lf_dev_archive_proto_java",
"//daml-lf/data",
"//daml-lf/engine",
"//daml-lf/language",

2
sdk/canton/community/ledger/ledger-api-core/src/main/scala/com/digitalasset/canton/ledger/participant/state/WriteService.scala
View File

@ -3,7 +3,7 @@
package com.digitalasset.canton.ledger.participant.state
import com.daml.daml_lf_dev.DamlLf.Archive
import com.digitalasset.daml.lf.archive.DamlLf.Archive
import com.daml.error.ContextualizedErrorLogger
import com.digitalasset.canton.data.{Offset, ProcessedDisclosedContract}
import com.digitalasset.canton.ledger.api.health.ReportsHealth

2
sdk/canton/community/ledger/ledger-api-core/src/main/scala/com/digitalasset/canton/ledger/participant/state/metrics/TimedWriteService.scala
View File

@ -3,7 +3,7 @@
package com.digitalasset.canton.ledger.participant.state.metrics
import com.daml.daml_lf_dev.DamlLf.Archive
import com.digitalasset.daml.lf.archive.DamlLf.Archive
import com.daml.error.ContextualizedErrorLogger
import com.daml.metrics.Timed
import com.digitalasset.canton.LfPartyId

2
sdk/canton/community/ledger/ledger-api-core/src/main/scala/com/digitalasset/canton/platform/apiserver/services/ApiPackageService.scala
View File

@ -3,7 +3,7 @@
package com.digitalasset.canton.platform.apiserver.services
import com.daml.daml_lf_dev.DamlLf.{Archive, HashFunction}
import com.digitalasset.daml.lf.archive.DamlLf.{Archive, HashFunction}
import com.daml.error.ContextualizedErrorLogger
import com.daml.ledger.api.v2.package_service.PackageServiceGrpc.PackageService
import com.daml.ledger.api.v2.package_service.{

2
sdk/canton/community/ledger/ledger-api-core/src/main/scala/com/digitalasset/canton/platform/apiserver/services/admin/PackageUpgradeValidator.scala
View File

@ -4,13 +4,13 @@
package com.digitalasset.canton.platform.apiserver.services.admin
import cats.data.EitherT
import com.daml.daml_lf_dev.DamlLf.Archive
import com.daml.error.DamlError
import com.daml.logging.entries.LoggingValue.OfString
import com.digitalasset.canton.ledger.error.PackageServiceErrors.{InternalError, Validation}
import com.digitalasset.canton.logging.LoggingContextWithTrace.implicitExtractTraceContext
import com.digitalasset.canton.logging.{LoggingContextWithTrace, NamedLoggerFactory, NamedLogging}
import com.digitalasset.canton.platform.apiserver.services.admin.ApiPackageManagementService.ErrorValidations
import com.digitalasset.daml.lf.archive.DamlLf.Archive
import com.digitalasset.daml.lf.archive.Decode
import com.digitalasset.daml.lf.data.Ref
import com.digitalasset.daml.lf.language.Ast

2
sdk/canton/community/ledger/ledger-api-core/src/main/scala/com/digitalasset/canton/platform/packages/DeduplicatingPackageLoader.scala
View File

@ -3,7 +3,7 @@
package com.digitalasset.canton.platform.packages
import com.daml.daml_lf_dev.DamlLf
import com.digitalasset.daml.lf.archive.DamlLf
import com.daml.metrics.Timed
import com.daml.metrics.api.MetricHandle.Timer
import com.digitalasset.daml.lf.archive.Decode

2
sdk/canton/community/ledger/ledger-api-core/src/main/scala/com/digitalasset/canton/platform/store/dao/events/LfValueTranslation.scala
View File

@ -105,7 +105,7 @@ final class LfValueTranslation(
loadPackage: (
LfPackageId,
LoggingContextWithTrace,
) => Future[Option[com.daml.daml_lf_dev.DamlLf.Archive]],
) => Future[Option[com.digitalasset.daml.lf.archive.DamlLf.Archive]],
val loggerFactory: NamedLoggerFactory,
) extends LfValueSerialization
with NamedLogging {

2
sdk/canton/community/ledger/ledger-api-core/src/main/scala/com/digitalasset/canton/platform/store/packagemeta/PackageMetadata.scala
View File

@ -5,7 +5,7 @@ package com.digitalasset.canton.platform.store.packagemeta
import cats.kernel.Semigroup
import cats.syntax.semigroup.*
import com.daml.daml_lf_dev.DamlLf
import com.digitalasset.daml.lf.archive.DamlLf
import com.daml.nonempty.NonEmpty
import com.digitalasset.canton.platform.store.packagemeta.PackageMetadata.{
InterfacesImplementedBy,

2
sdk/canton/community/ledger/ledger-api-core/src/test/scala/com/digitalasset/canton/platform/index/InMemoryStateUpdaterSpec.scala
View File

@ -4,7 +4,7 @@
package com.digitalasset.canton.platform.index
import cats.syntax.bifunctor.toBifunctorOps
import com.daml.daml_lf_dev.DamlLf
import com.digitalasset.daml.lf.archive.DamlLf
import com.daml.ledger.api.testing.utils.PekkoBeforeAndAfterAll
import com.daml.ledger.api.v2.command_completion_service.CompletionStreamResponse
import com.daml.ledger.api.v2.completion.Completion

2
sdk/canton/community/ledger/ledger-api-core/src/test/scala/com/digitalasset/canton/platform/packages/DeduplicatingPackageLoaderSpec.scala
View File

@ -3,7 +3,7 @@
package com.digitalasset.canton.platform.packages
import com.daml.daml_lf_dev.DamlLf
import com.digitalasset.daml.lf.archive.DamlLf
import com.daml.metrics.api.noop.NoOpMetricsFactory
import com.daml.metrics.api.{MetricInfo, MetricName, MetricQualification}
import com.digitalasset.canton.concurrent.Threading

2
sdk/canton/community/ledger/ledger-api-core/src/test/scala/com/digitalasset/canton/platform/store/backend/StorageBackendTestValues.scala
View File

@ -3,7 +3,7 @@
package com.digitalasset.canton.platform.store.backend
import com.daml.daml_lf_dev.DamlLf
import com.digitalasset.daml.lf.archive.DamlLf
import com.digitalasset.canton.data.Offset
import com.digitalasset.canton.ledger.api.domain.ParticipantId
import com.digitalasset.canton.ledger.participant.state.index.MeteringStore.TransactionMetering

2
sdk/canton/community/ledger/ledger-api-core/src/test/scala/com/digitalasset/canton/platform/store/backend/UpdateToDbDtoSpec.scala
View File

@ -3,7 +3,7 @@
package com.digitalasset.canton.platform.store.backend
import com.daml.daml_lf_dev.DamlLf
import com.digitalasset.daml.lf.archive.DamlLf
import com.daml.ledger.api.v2.event.{CreatedEvent, ExercisedEvent}
import com.daml.metrics.api.MetricsContext
import com.daml.platform.v1.index.StatusDetails

2
sdk/canton/community/ledger/ledger-api-core/src/test/scala/com/digitalasset/canton/platform/store/dao/JdbcLedgerDaoBackend.scala
View File

@ -3,7 +3,7 @@
package com.digitalasset.canton.platform.store.dao
import com.daml.daml_lf_dev.DamlLf.Archive
import com.digitalasset.daml.lf.archive.DamlLf.Archive
import com.daml.ledger.api.testing.utils.PekkoBeforeAndAfterAll
import com.daml.ledger.resources.{Resource, ResourceContext, ResourceOwner}
import com.daml.metrics.api.noop.NoOpMetricsFactory

2
sdk/canton/community/ledger/ledger-api-core/src/test/scala/com/digitalasset/canton/platform/store/dao/JdbcLedgerDaoSuite.scala
View File

@ -3,7 +3,7 @@
package com.digitalasset.canton.platform.store.dao
import com.daml.daml_lf_dev.DamlLf
import com.digitalasset.daml.lf.archive.DamlLf
import com.digitalasset.canton.data.Offset
import com.digitalasset.canton.ledger.api.domain.TemplateFilter
import com.digitalasset.canton.ledger.participant.state

2
sdk/canton/community/participant/src/main/scala/com/digitalasset/canton/participant/admin/PackageService.scala
View File

@ -9,7 +9,7 @@ import cats.implicits.toBifunctorOps
import cats.syntax.functor.*
import cats.syntax.functorFilter.*
import cats.syntax.parallel.*
import com.daml.daml_lf_dev.DamlLf
import com.digitalasset.daml.lf.archive.DamlLf
import com.daml.error.{ContextualizedErrorLogger, DamlError}
import com.digitalasset.canton.LedgerSubmissionId
import com.digitalasset.canton.concurrent.FutureSupervisor

2
sdk/canton/community/participant/src/main/scala/com/digitalasset/canton/participant/admin/PackageUploader.scala
View File

@ -5,7 +5,7 @@ package com.digitalasset.canton.participant.admin
import cats.data.EitherT
import cats.implicits.{catsSyntaxParallelTraverse1, toBifunctorOps, toTraverseOps}
import com.daml.daml_lf_dev.DamlLf
import com.digitalasset.daml.lf.archive.DamlLf
import com.daml.error.{ContextualizedErrorLogger, DamlError}
import com.digitalasset.canton.concurrent.FutureSupervisor
import com.digitalasset.canton.config.CantonRequireTypes.String255

2
sdk/canton/community/participant/src/main/scala/com/digitalasset/canton/participant/store/DamlPackageStore.scala
View File

@ -4,7 +4,7 @@
package com.digitalasset.canton.participant.store
import cats.data.OptionT
import com.daml.daml_lf_dev.DamlLf
import com.digitalasset.daml.lf.archive.DamlLf
import com.digitalasset.canton.concurrent.FutureSupervisor
import com.digitalasset.canton.config.CantonRequireTypes.String255
import com.digitalasset.canton.crypto.Hash

2
sdk/canton/community/participant/src/main/scala/com/digitalasset/canton/participant/store/db/DbDamlPackageStore.scala
View File

@ -4,7 +4,7 @@
package com.digitalasset.canton.participant.store.db
import cats.data.OptionT
import com.daml.daml_lf_dev.DamlLf
import com.digitalasset.daml.lf.archive.DamlLf
import com.daml.nameof.NameOf.functionFullName
import com.daml.nonempty.NonEmpty
import com.digitalasset.canton.LfPackageId

2
sdk/canton/community/participant/src/main/scala/com/digitalasset/canton/participant/store/memory/InMemoryDamlPackageStore.scala
View File

@ -5,7 +5,7 @@ package com.digitalasset.canton.participant.store.memory
import cats.Monoid
import cats.data.OptionT
import com.daml.daml_lf_dev.DamlLf
import com.digitalasset.daml.lf.archive.DamlLf
import com.digitalasset.canton.LfPackageId
import com.digitalasset.canton.config.CantonRequireTypes.String255
import com.digitalasset.canton.crypto.Hash

2
sdk/canton/community/participant/src/main/scala/com/digitalasset/canton/participant/store/memory/PackageMetadataView.scala
View File

@ -4,7 +4,7 @@
package com.digitalasset.canton.participant.store.memory
import cats.implicits.catsSyntaxSemigroup
import com.daml.daml_lf_dev.DamlLf
import com.digitalasset.daml.lf.archive.DamlLf
import com.daml.error.ContextualizedErrorLogger
import com.daml.timer.FutureCheck.*
import com.digitalasset.canton.LfPackageId

2
sdk/canton/community/participant/src/main/scala/com/digitalasset/canton/participant/sync/CantonSyncService.scala
View File

@ -11,7 +11,7 @@ import cats.syntax.functor.*
import cats.syntax.functorFilter.*
import cats.syntax.parallel.*
import cats.syntax.traverse.*
import com.daml.daml_lf_dev.DamlLf
import com.digitalasset.daml.lf.archive.DamlLf
import com.daml.error.*
import com.daml.nameof.NameOf.functionFullName
import com.daml.nonempty.NonEmpty

4
sdk/canton/community/participant/src/test/scala/com/digitalasset/canton/participant/admin/PackageServiceTest.scala
View File

@ -5,8 +5,8 @@ package com.digitalasset.canton.participant.admin
import better.files.*
import cats.data.EitherT
import com.daml.daml_lf_dev.DamlLf
import com.daml.daml_lf_dev.DamlLf.Archive
import com.digitalasset.daml.lf.archive.DamlLf
import com.digitalasset.daml.lf.archive.DamlLf.Archive
import com.daml.error.DamlError
import com.digitalasset.canton.buildinfo.BuildInfo
import com.digitalasset.canton.concurrent.FutureSupervisor

2
sdk/compiler/daml-lf-proto-decode/BUILD.bazel
View File

@ -29,7 +29,7 @@ da_haskell_library(
"//compiler/daml-lf-ast",
"//compiler/daml-lf-proto-util",
"//compiler/damlc/stable-packages:stable-packages-list",
"//daml-lf/archive:daml_lf_dev_archive_haskell_proto",
"//daml-lf/archive:daml_lf_archive_haskell_proto",
"//libs-haskell/da-hs-base",
],
)

2
sdk/compiler/daml-lf-proto-decode/daml-lf-proto-decode.cabal
View File

@ -31,7 +31,7 @@ library
da-hs-base,
-- //compiler/daml-lf-ast:daml-lf-ast
daml-lf-ast,
-- //daml-lf/archive:daml_lf_dev_archive_haskell_proto
-- //daml-lf/archive:daml_lf_archive_haskell_proto
daml-lf-proto-types,
-- //compiler/daml-lf-proto-util:daml-lf-proto-util
daml-lf-proto-util,

2
sdk/compiler/daml-lf-proto-decode/src/DA/Daml/LF/Proto3/Archive/Decode.hs
View File

@ -11,7 +11,7 @@ module DA.Daml.LF.Proto3.Archive.Decode
import Control.Lens (over, _Left)
import qualified "cryptonite" Crypto.Hash as Crypto
import qualified Com.Daml.DamlLfDev.DamlLf as ProtoLF
import qualified Com.Digitalasset.Daml.Lf.Archive.DamlLf as ProtoLF
import Control.Monad
import DA.Pretty
import qualified DA.Daml.LF.Ast as LF

2
sdk/compiler/daml-lf-proto-decode/src/DA/Daml/LF/Proto3/Decode.hs
View File

@ -8,7 +8,7 @@ module DA.Daml.LF.Proto3.Decode
, decodePayload
) where
import Com.Daml.DamlLfDev.DamlLf (ArchivePayload(..), ArchivePayloadSum(..))
import Com.Digitalasset.Daml.Lf.Archive.DamlLf (ArchivePayload(..), ArchivePayloadSum(..))
import DA.Daml.LF.Ast.Base ( Package, PackageId, PackageRef )
import DA.Daml.LF.Proto3.Error
import qualified DA.Daml.LF.Proto3.DecodeV2 as DecodeV2

2
sdk/compiler/daml-lf-proto-decode/src/DA/Daml/LF/Proto3/DecodeV2.hs
View File

@ -19,7 +19,7 @@ import Data.Int
import Text.Read
import Data.List
import DA.Daml.LF.Mangling
import qualified Com.Daml.DamlLfDev.DamlLf2 as LF2
import qualified Com.Digitalasset.Daml.Lf.Archive.DamlLf2 as LF2
import qualified Data.NameMap as NM
import qualified Data.Text as T
import qualified Data.Set as S

2
sdk/compiler/daml-lf-proto-encode/BUILD.bazel
View File

@ -28,7 +28,7 @@ da_haskell_library(
deps = [
"//compiler/daml-lf-ast",
"//compiler/daml-lf-proto-util",
"//daml-lf/archive:daml_lf_dev_archive_haskell_proto",
"//daml-lf/archive:daml_lf_archive_haskell_proto",
"//libs-haskell/da-hs-base",
],
)

2
sdk/compiler/daml-lf-proto-encode/daml-lf-proto-encode.cabal
View File

@ -31,7 +31,7 @@ library
da-hs-base,
-- //compiler/daml-lf-ast:daml-lf-ast
daml-lf-ast,
-- //daml-lf/archive:daml_lf_dev_archive_haskell_proto
-- //daml-lf/archive:daml_lf_archive_haskell_proto
daml-lf-proto-types,
-- //compiler/daml-lf-proto-util:daml-lf-proto-util
daml-lf-proto-util,

2
sdk/compiler/daml-lf-proto-encode/src/DA/Daml/LF/Proto3/Archive/Encode.hs
View File

@ -9,7 +9,7 @@ module DA.Daml.LF.Proto3.Archive.Encode
) where
import qualified "cryptonite" Crypto.Hash as Crypto
import qualified Com.Daml.DamlLfDev.DamlLf as ProtoLF
import qualified Com.Digitalasset.Daml.Lf.Archive.DamlLf as ProtoLF
import qualified DA.Daml.LF.Ast as LF
import qualified DA.Daml.LF.Proto3.Encode as Encode
import DA.Daml.LF.Proto3.Util (encodeHash)

2
sdk/compiler/daml-lf-proto-encode/src/DA/Daml/LF/Proto3/Encode.hs
View File

@ -6,7 +6,7 @@ module DA.Daml.LF.Proto3.Encode
) where
import qualified Data.Text.Lazy as TL
import Com.Daml.DamlLfDev.DamlLf (ArchivePayload(..), ArchivePayloadSum(..))
import Com.Digitalasset.Daml.Lf.Archive.DamlLf (ArchivePayload(..), ArchivePayloadSum(..))
import DA.Daml.LF.Ast
import qualified DA.Daml.LF.Proto3.EncodeV2 as EncodeV2

2
sdk/compiler/daml-lf-proto-encode/src/DA/Daml/LF/Proto3/EncodeV2.hs
View File

@ -29,7 +29,7 @@ import Data.Int
import DA.Pretty
import DA.Daml.LF.Ast
import DA.Daml.LF.Mangling
import qualified Com.Daml.DamlLfDev.DamlLf2 as P
import qualified Com.Digitalasset.Daml.Lf.Archive.DamlLf2 as P
import qualified Proto3.Suite as P (Enumerated (..))

2
sdk/compiler/daml-lf-proto-util/BUILD.bazel
View File

@ -21,7 +21,7 @@ da_haskell_library(
visibility = ["//visibility:public"],
deps = [
"//compiler/daml-lf-ast",
"//daml-lf/archive:daml_lf_dev_archive_haskell_proto",
"//daml-lf/archive:daml_lf_archive_haskell_proto",
],
)

2
sdk/compiler/daml-lf-proto-util/daml-lf-proto-util.cabal
View File

@ -25,7 +25,7 @@ library
bytestring,
-- //compiler/daml-lf-ast:daml-lf-ast
daml-lf-ast,
-- //daml-lf/archive:daml_lf_dev_archive_haskell_proto
-- //daml-lf/archive:daml_lf_archive_haskell_proto
daml-lf-proto-types,
-- @stackage//:either
either,

2
sdk/compiler/damlc/BUILD.bazel
View File

@ -253,7 +253,7 @@ da_haskell_library(
"//daml-assistant:daml-lib",
"//daml-assistant:daml-project-config",
"//daml-assistant/daml-helper:daml-helper-lib",
"//daml-lf/archive:daml_lf_dev_archive_haskell_proto",
"//daml-lf/archive:daml_lf_archive_haskell_proto",
"//libs-haskell/bazel-runfiles",
"//libs-haskell/da-gcp-logger",
"//libs-haskell/da-hs-base",

2
sdk/compiler/damlc/lib/DA/Cli/Damlc.hs
View File

@ -163,7 +163,7 @@ import qualified DA.Service.Logger as Logger
import qualified DA.Service.Logger.Impl.GCP as Logger.GCP
import qualified DA.Service.Logger.Impl.IO as Logger.IO
import DA.Signals (installSignalHandlers)
import qualified Com.Daml.DamlLfDev.DamlLf as PLF
import qualified Com.Digitalasset.Daml.Lf.Archive.DamlLf as PLF
import Data.Aeson (FromJSON, ToJSON)
import qualified Data.Aeson.Encode.Pretty as Aeson.Pretty
import qualified Data.Aeson.Text as Aeson

2
sdk/compiler/damlc/lib/DA/Cli/Damlc/Test/TestResults.hs
View File

@ -21,7 +21,7 @@ import qualified Data.ByteString as BS
import qualified Data.Text as T
import qualified Data.Text.Lazy as TL
import qualified Data.Set as S
import qualified Com.Daml.DamlLfDev.DamlLf2 as LF2
import qualified Com.Digitalasset.Daml.Lf.Archive.DamlLf2 as LF2
import qualified Data.Map.Strict as M
import Data.Maybe (mapMaybe)
import Data.Foldable (fold)

2
sdk/compiler/damlc/tests/BUILD.bazel
View File

@ -163,7 +163,7 @@ da_haskell_library(
"//compiler/damlc/daml-rule-types",
"//compiler/scenario-service/client",
"//daml-assistant:daml-project-config",
"//daml-lf/archive:daml_lf_dev_archive_haskell_proto",
"//daml-lf/archive:daml_lf_archive_haskell_proto",
"//libs-haskell/bazel-runfiles",
"//libs-haskell/da-hs-base",
"//libs-haskell/test-utils",

4
sdk/compiler/scenario-service/protos/BUILD.bazel
View File

@ -91,7 +91,7 @@ genrule(
srcs = [
"test_results.proto",
"scenario_service.proto",
"//daml-lf/archive:daml_lf_dev_archive_proto_srcs",
"//daml-lf/archive:daml_lf_archive_proto_srcs",
],
outs = ["TestResults.hs"],
cmd = """
@ -126,6 +126,6 @@ da_haskell_library(
visibility = ["//visibility:public"],
deps = [
":scenario_service_haskell_proto",
"//daml-lf/archive:daml_lf_dev_archive_haskell_proto",
"//daml-lf/archive:daml_lf_archive_haskell_proto",
],
)

2
sdk/compiler/scenario-service/protos/test_results.proto
View File

@ -4,7 +4,7 @@
syntax = "proto3";
package daml_lf_dev;
import "com/daml/daml_lf_dev/daml_lf2.proto";
import "com/digitalasset/daml/lf/archive/daml_lf2.proto";
import "scenario_service.proto";
message TestResults {

8
sdk/daml-assistant/integration-tests/BUILD.bazel
View File

@ -8,8 +8,8 @@ genrule(
name = "integration-tests-mvn",
srcs = [
"@mvn_dev_env//:mvn",
"//daml-lf/archive:daml_lf_dev_archive_proto_java",
"//daml-lf/archive:daml_lf_dev_archive_proto_java_pom",
"//daml-lf/archive:daml_lf_archive_proto_java",
"//daml-lf/archive:daml_lf_archive_proto_java_pom",
"//canton:libbindings-java.jar",
"//canton:bindings-java_pom.xml",
"//language-support/java/bindings-rxjava:libbindings-rxjava.jar",
@ -40,8 +40,8 @@ genrule(
tar xf $(location //docs:quickstart-java.tar.gz) -C "$$TMP_DIR"
install_mvn \\
"com.daml" "daml-lf-archive" \\
$$(echo $(locations //daml-lf/archive:daml_lf_dev_archive_proto_java) | xargs -n1 echo | grep -v -- '-src\\.jar$$') \\
$(location //daml-lf/archive:daml_lf_dev_archive_proto_java_pom)
$$(echo $(locations //daml-lf/archive:daml_lf_archive_proto_java) | xargs -n1 echo | grep -v -- '-src\\.jar$$') \\
$(location //daml-lf/archive:daml_lf_archive_proto_java_pom)
install_mvn \\
"com.daml" "bindings-java" \\
$(location //canton:libbindings-java.jar) \\

4
sdk/daml-lf/api-type-signature/BUILD.bazel
View File

@ -38,8 +38,8 @@ da_scala_library(
"//ledger-service:__subpackages__",
],
deps = [
"//daml-lf/archive:daml_lf_archive_proto_java",
"//daml-lf/archive:daml_lf_archive_reader",
"//daml-lf/archive:daml_lf_dev_archive_proto_java",
"//daml-lf/data",
"//daml-lf/language",
"//libs-scala/nonempty",
@ -79,8 +79,8 @@ da_scala_test(
deps = [
":api-type-signature",
"//bazel_tools/runfiles:scala_runfiles",
"//daml-lf/archive:daml_lf_archive_proto_java",
"//daml-lf/archive:daml_lf_archive_reader",
"//daml-lf/archive:daml_lf_dev_archive_proto_java",
"//daml-lf/data",
"//daml-lf/language",
"//daml-lf/parser",

2
sdk/daml-lf/api-type-signature/src/main/scala/com/digitalasset/daml/lf/typesig/PackageSignature.scala
View File

@ -8,7 +8,7 @@ import com.digitalasset.daml.lf.data.ImmArray.ImmArraySeq
import com.digitalasset.daml.lf.data.Ref
import Ref.{Identifier, PackageId, PackageName, PackageVersion, QualifiedName}
import reader.Errors
import com.daml.daml_lf_dev.DamlLf
import com.digitalasset.daml.lf.archive.DamlLf
import com.digitalasset.daml.lf.archive.ArchivePayload
import scalaz.std.either._
import scalaz.std.tuple._

2
sdk/daml-lf/api-type-signature/src/main/scala/com/digitalasset/daml/lf/typesig/reader/DamlLfArchiveReader.scala
View File

@ -7,7 +7,7 @@ package reader
import com.digitalasset.daml.lf.data.Ref
import com.digitalasset.daml.lf.language.Ast
import com.daml.daml_lf_dev.DamlLf
import com.digitalasset.daml.lf.archive.DamlLf
import scalaz.\/
object DamlLfArchiveReader {

2
sdk/daml-lf/api-type-signature/src/main/scala/com/digitalasset/daml/lf/typesig/reader/SignatureReader.scala
View File

@ -5,7 +5,7 @@ package com.digitalasset.daml.lf
package typesig
package reader
import com.daml.daml_lf_dev.DamlLf
import com.digitalasset.daml.lf.archive.DamlLf
import com.digitalasset.daml.lf.archive.ArchivePayload
import scalaz.{Enum => _, _}
import scalaz.syntax.monoid._

2
sdk/daml-lf/api-type-signature/src/main/scala/com/digitalasset/daml/lf/typesig/reader/SignatureReaderMain.scala
View File

@ -6,7 +6,7 @@ package com.digitalasset.daml.lf.typesig.reader
import java.io.BufferedInputStream
import java.nio.file.Files
import com.daml.daml_lf_dev.DamlLf
import com.digitalasset.daml.lf.archive.DamlLf
object SignatureReaderMain extends App {

79
sdk/daml-lf/archive/BUILD.bazel
View File

@ -36,47 +36,52 @@ load("@os_info//:os_info.bzl", "is_intel", "is_windows")
#
# We generate:
# - one file group for each stable version, e.g daml_lf_1.14_archive_proto_srcs
# - one single file group for both dev versions: daml_lf_dev_archive_proto_srcs
[
[
filegroup(
name = "daml_lf_%s_archive_proto_srcs" % version,
srcs = glob([
"src/{directory}/protobuf/com/daml/daml_lf_{version}/*.proto".format(
directory = directory,
version = mangled_version,
),
]),
visibility = ["//visibility:public"],
),
proto_jars(
name = "daml_lf_%s_archive_proto" % version,
srcs = [":daml_lf_%s_archive_proto_srcs" % version],
javadoc_root_packages = ["com.daml.daml_lf_%s" % mangled_version],
maven_artifact_prefix = "daml-lf-%s-archive" % version,
maven_group = "com.daml",
strip_import_prefix = "src/%s/protobuf" % directory,
visibility = ["//visibility:public"],
),
]
for version in SUPPORTED_PROTO_STABLE_LF_VERSIONS + ["dev"]
for mangled_version in [mangle_for_java(version)]
for directory in ["main" if version == "dev" else "stable"]
]
# - one single file group for both dev versions: daml_lf_archive_proto_srcs
filegroup(
name = "daml_lf_2.1_archive_proto_srcs",
srcs = glob(["src/stable/protobuf/com/daml/daml_lf_2_1/*.proto"]),
visibility = [],
)
proto_jars(
name = "daml_lf_2.1_archive_proto",
srcs = [":daml_lf_2.1_archive_proto_srcs"],
javadoc_root_packages = ["com.daml.daml_lf_2_1"],
maven_artifact_prefix = "daml-lf-2.1-archive",
maven_group = "com.daml",
strip_import_prefix = "src/stable/protobuf",
visibility = ["//visibility:public"],
)
filegroup(
name = "daml_lf_archive_proto_srcs",
srcs = glob(["src/main/protobuf/com/digitalasset/daml/lf/archive/**/*.proto"]),
visibility = ["//visibility:public"],
)
proto_jars(
name = "daml_lf_archive_proto",
srcs = [":daml_lf_archive_proto_srcs"],
javadoc_root_packages = ["com.digitalasset.daml.lf.archive"],
maven_artifact_prefix = "daml-lf-archive",
maven_group = "com.daml",
strip_import_prefix = "src/main/protobuf",
visibility = ["//visibility:public"],
)
# FIXME(JM): Clean this up
genrule(
name = "daml_lf_dev_archive_haskell_proto_src",
srcs = ["daml_lf_dev_archive_proto_srcs"],
outs = ["Com/Daml/DamlLfDev/DamlLf.hs"] +
["Com/Daml/DamlLfDev/DamlLf%s.hs" % v.title() for v in ["2"]],
name = "daml_lf_archive_haskell_proto_src",
srcs = ["daml_lf_archive_proto_srcs"],
outs = ["Com/Digitalasset/Daml/Lf/Archive/DamlLf.hs"] +
["Com/Digitalasset/Daml/Lf/Archive/DamlLf%s.hs" % v.title() for v in ["2"]],
cmd =
"\n".join(
[
"""
$(location @proto3-suite//:compile-proto-file) \
--includeDir daml-lf/archive/src/main/protobuf/ \
--proto com/daml/daml_lf_dev/daml_lf%s.proto \
--proto com/digitalasset/daml/lf/archive/daml_lf%s.proto \
--out $(@D)
""" % vx
for vx in [""] + ["%s" % v for v in ["2"]]
@ -88,8 +93,8 @@ genrule(
)
da_haskell_library(
name = "daml_lf_dev_archive_haskell_proto",
srcs = [":daml_lf_dev_archive_haskell_proto_src"],
name = "daml_lf_archive_haskell_proto",
srcs = [":daml_lf_archive_haskell_proto_src"],
compiler_flags = [
"-O0",
], # disable optimization as this is otherwise way too slow to compile.
@ -116,7 +121,7 @@ da_scala_library(
tags = ["maven_coordinates=com.daml:daml-lf-archive-reader:__VERSION__"],
visibility = ["//visibility:public"],
deps = [
":daml_lf_dev_archive_proto_java",
":daml_lf_archive_proto_java",
"//daml-lf/data",
"//daml-lf/language",
"//libs-scala/crypto",
@ -150,8 +155,8 @@ da_scala_test_suite(
],
scalacopts = lf_scalacopts,
deps = [
":daml_lf_archive_proto_java",
":daml_lf_archive_reader",
":daml_lf_dev_archive_proto_java",
"//bazel_tools/runfiles:scala_runfiles",
"//daml-lf/data",
"//daml-lf/language",
@ -199,7 +204,7 @@ da_scala_binary(
"buf.yaml",
"proto_breaking_changes.sh",
":daml_lf_%s_archive_proto_srcs" % version,
":daml_lf_dev_archive_proto_srcs",
":daml_lf_archive_proto_srcs",
"@buf//:bin/buf",
],
)

4
sdk/daml-lf/archive/README.md
View File

@ -38,8 +38,8 @@ It produces several libraries containing code to encode / decode such
definition, a Haskell one, and several Java ones:
```
$ bazel build //daml-lf/archive:daml_lf_dev_archive_haskell_proto
$ bazel build //daml-lf/archive:daml_lf_dev_archive_proto_java
$ bazel build //daml-lf/archive:daml_lf_archive_haskell_proto
$ bazel build //daml-lf/archive:daml_lf_archive_proto_java
$ bazel build //daml-lf/archive:daml_lf_1_14_archive_proto_java
```

6
sdk/daml-lf/archive/src/main/protobuf/com/daml/daml_lf_dev/daml_lf.proto → sdk/daml-lf/archive/src/main/protobuf/com/digitalasset/daml/lf/archive/daml_lf.proto
View File

@ -4,10 +4,10 @@
syntax = "proto3";
package daml_lf_dev;
option java_package = "com.daml.daml_lf_dev";
option csharp_namespace = "Com.Daml.Daml_Lf_Dev.DamlLf";
option java_package = "com.digitalasset.daml.lf.archive";
option csharp_namespace = "Com.DigitalAsset.Daml.Lf.Archive.DamlLf";
import "com/daml/daml_lf_dev/daml_lf2.proto";
import "com/digitalasset/daml/lf/archive/daml_lf2.proto";
message ArchivePayload {
// this is number 3 for historical reasons -- we had

4
sdk/daml-lf/archive/src/main/protobuf/com/daml/daml_lf_dev/daml_lf1.proto → sdk/daml-lf/archive/src/main/protobuf/com/digitalasset/daml/lf/archive/daml_lf1.proto
View File

@ -57,8 +57,8 @@
syntax = "proto3";
package daml_lf_1;
option java_package = "com.daml.daml_lf_dev";
option csharp_namespace = "Com.Daml.Daml_Lf_Dev.DamlLf1";
option java_package = "com.digitalasset.daml.lf.archive";
option csharp_namespace = "Com.Digitalasset.Daml.Lf.Archive.DamlLf1";
// Canonical encoding in one-ofs for cases that carry no meaningful
// values.

4
sdk/daml-lf/archive/src/main/protobuf/com/daml/daml_lf_dev/daml_lf2.proto → sdk/daml-lf/archive/src/main/protobuf/com/digitalasset/daml/lf/archive/daml_lf2.proto
View File

@ -22,8 +22,8 @@
syntax = "proto3";
package daml_lf_2;
option java_package = "com.daml.daml_lf_dev";
option csharp_namespace = "Com.Daml.Daml_Lf_Dev.DamlLf1";
option java_package = "com.digitalasset.daml.lf.archive";;
option csharp_namespace = "Com.DigitalAsset.Daml.Lf.Archive.DamlLf2";
// Canonical encoding in one-ofs for cases that carry no meaningful
// values.

2
sdk/daml-lf/archive/src/main/scala/com/digitalasset/daml/lf/archive/Decode.scala
View File

@ -3,7 +3,7 @@
package com.digitalasset.daml.lf.archive
import com.daml.daml_lf_dev.DamlLf
import com.digitalasset.daml.lf.archive.DamlLf
import com.digitalasset.daml.lf.data.Ref.PackageId
import com.digitalasset.daml.lf.language.{Ast, LanguageMajorVersion}

2
sdk/daml-lf/archive/src/main/scala/com/digitalasset/daml/lf/archive/DecodeV1.scala
View File

@ -5,7 +5,7 @@ package com.digitalasset.daml.lf
package archive
import java.util
import com.daml.daml_lf_dev.{DamlLf1 => PLF}
import com.digitalasset.daml.lf.archive.{DamlLf1 => PLF}
import com.digitalasset.daml.lf.data.ImmArray.ImmArraySeq
import com.digitalasset.daml.lf.data.Ref._
import com.digitalasset.daml.lf.data.{ImmArray, Numeric, Struct}

2
sdk/daml-lf/archive/src/main/scala/com/digitalasset/daml/lf/archive/DecodeV2.scala
View File

@ -5,7 +5,7 @@ package com.digitalasset.daml.lf
package archive
import java.util
import com.daml.daml_lf_dev.{DamlLf2 => PLF}
import com.digitalasset.daml.lf.archive.{DamlLf2 => PLF}
import com.digitalasset.daml.lf.data.ImmArray.ImmArraySeq
import com.digitalasset.daml.lf.data.Ref._
import com.digitalasset.daml.lf.data.{ImmArray, Numeric, Struct, Time}

2
sdk/daml-lf/archive/src/main/scala/com/digitalasset/daml/lf/archive/Reader.scala
View File

@ -5,7 +5,7 @@ package com.digitalasset.daml.lf
package archive
import com.daml.crypto.MessageDigestPrototype
import com.daml.daml_lf_dev.{DamlLf, DamlLf1, DamlLf2}
import com.digitalasset.daml.lf.archive.{DamlLf, DamlLf1, DamlLf2}
import com.digitalasset.daml.lf.data.Ref.PackageId
import com.digitalasset.daml.lf.language.LanguageMinorVersion
import com.digitalasset.daml.lf.language.{LanguageVersion, LanguageMajorVersion}

1
sdk/daml-lf/archive/src/main/scala/com/digitalasset/daml/lf/archive/package.scala
View File

@ -3,7 +3,6 @@
package com.digitalasset.daml.lf
import com.daml.daml_lf_dev.{DamlLf, DamlLf1, DamlLf2}
import com.digitalasset.daml.lf.data.Ref.PackageId
import com.digitalasset.daml.lf.language.{Ast, LanguageMajorVersion, LanguageVersion}
import com.daml.nameof.NameOf

2
sdk/daml-lf/archive/src/test/scala/com/digitalasset/daml/lf/archive/DarReaderTest.scala
View File

@ -5,7 +5,7 @@ package com.digitalasset.daml.lf.archive
import java.io.File
import com.daml.bazeltools.BazelRunfiles
import com.daml.daml_lf_dev.{DamlLf1, DamlLf2}
import com.digitalasset.daml.lf.archive.{DamlLf1, DamlLf2}
import org.scalatest._
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec

2
sdk/daml-lf/archive/src/test/scala/com/digitalasset/daml/lf/archive/DecodeV1Spec.scala
View File

@ -9,7 +9,7 @@ import com.digitalasset.daml.lf.data.{Numeric, Ref}
import com.digitalasset.daml.lf.language.Util._
import com.digitalasset.daml.lf.language.{Ast, LanguageVersion => LV}
import com.digitalasset.daml.lf.data.ImmArray.ImmArraySeq
import com.daml.daml_lf_dev.DamlLf1
import com.digitalasset.daml.lf.archive.DamlLf1
import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks
import org.scalatest.{Inside, OptionValues}
import org.scalatest.matchers.should.Matchers

2
sdk/daml-lf/archive/src/test/scala/com/digitalasset/daml/lf/archive/DecodeV2Spec.scala
View File

@ -11,7 +11,7 @@ import com.digitalasset.daml.lf.language.Util._
import com.digitalasset.daml.lf.language.{Ast, LanguageVersion => LV}
import com.digitalasset.daml.lf.data.ImmArray
import com.digitalasset.daml.lf.data.ImmArray.ImmArraySeq
import com.daml.daml_lf_dev.DamlLf2
import com.digitalasset.daml.lf.archive.DamlLf2
import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks
import org.scalatest.{Inside, OptionValues}
import org.scalatest.matchers.should.Matchers

2
sdk/daml-lf/archive/src/test/scala/com/digitalasset/daml/lf/archive/TypeOrderingSpec.scala
View File

@ -3,7 +3,7 @@
package com.digitalasset.daml.lf.archive
import com.daml.daml_lf_dev.DamlLf2
import com.digitalasset.daml.lf.archive.DamlLf2
import com.digitalasset.daml.lf.language.{Ast, TypeOrdering}
import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AnyWordSpec

6
sdk/daml-lf/encoder/BUILD.bazel
View File

@ -31,8 +31,8 @@ da_scala_library(
tags = ["maven_coordinates=com.daml:daml-lf-encoder:__VERSION__"],
visibility = ["//visibility:public"],
deps = [
"//daml-lf/archive:daml_lf_archive_proto_java",
"//daml-lf/archive:daml_lf_archive_reader",
"//daml-lf/archive:daml_lf_dev_archive_proto_java",
"//daml-lf/data",
"//daml-lf/language",
"//libs-scala/crypto",
@ -57,8 +57,8 @@ da_scala_test_suite(
deps = [
":encoder",
"//bazel_tools/runfiles:scala_runfiles",
"//daml-lf/archive:daml_lf_archive_proto_java",
"//daml-lf/archive:daml_lf_archive_reader",
"//daml-lf/archive:daml_lf_dev_archive_proto_java",
"//daml-lf/data",
"//daml-lf/language",
"//daml-lf/parser",
@ -80,8 +80,8 @@ da_scala_binary(
deps = [
":encoder",
"//:sdk-version-scala-lib",
"//daml-lf/archive:daml_lf_archive_proto_java",
"//daml-lf/archive:daml_lf_archive_reader",
"//daml-lf/archive:daml_lf_dev_archive_proto_java",
"//daml-lf/archive/encoder",
"//daml-lf/data",
"//daml-lf/language",

2
sdk/daml-lf/encoder/src/main/scala/com/digitalasset/daml/lf/archive/testing/Encode.scala
View File

@ -6,7 +6,7 @@ package archive.testing
import com.daml.SafeProto
import com.daml.crypto.MessageDigestPrototype
import com.daml.daml_lf_dev.{DamlLf => PLF}
import com.digitalasset.daml.lf.archive.{DamlLf => PLF}
import com.digitalasset.daml.lf.data.Ref.PackageId
import com.digitalasset.daml.lf.language.Ast.Package
import com.digitalasset.daml.lf.language.{LanguageMajorVersion, LanguageVersion}

2
sdk/daml-lf/encoder/src/main/scala/com/digitalasset/daml/lf/archive/testing/EncodeV2.scala
View File

@ -4,7 +4,7 @@
package com.digitalasset.daml.lf.archive
package testing
import com.daml.daml_lf_dev.{DamlLf2 => PLF}
import com.digitalasset.daml.lf.archive.{DamlLf2 => PLF}
import com.digitalasset.daml.lf.archive.testing.Encode.{EncodeError, expect}
import com.digitalasset.daml.lf.data.Ref._
import com.digitalasset.daml.lf.data._

2
sdk/daml-lf/encoder/src/test/scala/com/digitalasset/daml/lf/testing/archive/DamlLfEncoderTest.scala
View File

@ -5,7 +5,7 @@ package com.digitalasset.daml.lf.testing.archive
import java.io.File
import com.daml.bazeltools.BazelRunfiles
import com.daml.daml_lf_dev.DamlLf2
import com.digitalasset.daml.lf.archive.DamlLf2
import com.digitalasset.daml.lf.archive.{
ArchivePayload,
Dar,

2
sdk/daml-lf/interpreter/BUILD.bazel
View File

@ -149,8 +149,8 @@ scala_repl(
visibility = ["//visibility:public"],
deps = [
"//bazel_tools/runfiles:scala_runfiles",
"//daml-lf/archive:daml_lf_archive_proto_java",
"//daml-lf/archive:daml_lf_archive_reader",
"//daml-lf/archive:daml_lf_dev_archive_proto_java",
"//daml-lf/data",
"//daml-lf/engine",
"//daml-lf/interpreter",

2
sdk/daml-lf/scenario-interpreter/BUILD.bazel
View File

@ -75,8 +75,8 @@ da_scala_benchmark_jmh(
visibility = ["//visibility:public"],
deps = [
"//bazel_tools/runfiles:scala_runfiles",
"//daml-lf/archive:daml_lf_archive_proto_java",
"//daml-lf/archive:daml_lf_archive_reader",
"//daml-lf/archive:daml_lf_dev_archive_proto_java",
"//daml-lf/data",
"//daml-lf/engine",
"//daml-lf/interpreter",

4
sdk/daml-lf/validation/BUILD.bazel
View File

@ -79,8 +79,8 @@ da_scala_library(
"//canton:community_ledger_ledger-common",
"//canton:community_util-logging",
"//canton:ledger_api_proto_scala",
"//daml-lf/archive:daml_lf_archive_proto_java",
"//daml-lf/archive:daml_lf_archive_reader",
"//daml-lf/archive:daml_lf_dev_archive_proto_java",
"//daml-lf/archive/encoder",
"//daml-lf/data",
"//daml-lf/encoder",
@ -271,8 +271,8 @@ da_scala_benchmark_jmh(
visibility = ["//visibility:public"],
deps = [
"//bazel_tools/runfiles:scala_runfiles",
"//daml-lf/archive:daml_lf_archive_proto_java",
"//daml-lf/archive:daml_lf_archive_reader",
"//daml-lf/archive:daml_lf_dev_archive_proto_java",
"//daml-lf/data",
"//daml-lf/engine",
"//daml-lf/interpreter",

4
sdk/daml-script/runner/BUILD.bazel
View File

@ -61,8 +61,8 @@ da_scala_library(
"//canton:daml-common-staging_daml-tls",
"//canton:ledger_api_proto_scala",
"//daml-lf/api-type-signature",
"//daml-lf/archive:daml_lf_archive_proto_java",
"//daml-lf/archive:daml_lf_archive_reader",
"//daml-lf/archive:daml_lf_dev_archive_proto_java",
"//daml-lf/data",
"//daml-lf/engine",
"//daml-lf/interpreter",
@ -116,8 +116,8 @@ da_scala_test(
"//canton:community_ledger_ledger-common",
"//canton:community_util-logging",
"//canton:ledger_api_proto_scala",
"//daml-lf/archive:daml_lf_archive_proto_java",
"//daml-lf/archive:daml_lf_archive_reader",
"//daml-lf/archive:daml_lf_dev_archive_proto_java",
"//daml-lf/data",
"//libs-scala/ledger-resources",
"//libs-scala/ports",

4
sdk/daml-script/test/BUILD.bazel
View File

@ -207,8 +207,8 @@ da_scala_library(
"//canton:community_util-logging",
"//canton:daml-common-staging_daml-tls",
"//canton:ledger_api_proto_scala",
"//daml-lf/archive:daml_lf_archive_proto_java",
"//daml-lf/archive:daml_lf_archive_reader",
"//daml-lf/archive:daml_lf_dev_archive_proto_java",
"//daml-lf/data",
"//daml-lf/engine",
"//daml-lf/interpreter",
@ -506,8 +506,8 @@ da_scala_test_suite(
"//canton:community_ledger_ledger-common",
"//canton:community_util-logging",
"//daml-lf/api-type-signature",
"//daml-lf/archive:daml_lf_archive_proto_java",
"//daml-lf/archive:daml_lf_archive_reader",
"//daml-lf/archive:daml_lf_dev_archive_proto_java",
"//daml-lf/data",
"//daml-lf/interpreter",
"//daml-lf/language",

2
sdk/docs/BUILD.bazel
View File

@ -371,7 +371,7 @@ java_binary(
main_class = "com.daml.quickstart.iou.IouMain",
deps = [
"//canton:bindings-java",
"//daml-lf/archive:daml_lf_dev_archive_proto_java",
"//daml-lf/archive:daml_lf_archive_proto_java",
"//language-support/java/bindings-rxjava",
"@maven//:ch_qos_logback_logback_classic",
"@maven//:com_google_code_gson_gson",

2
sdk/language-support/java/codegen/BUILD.bazel
View File

@ -54,8 +54,8 @@ da_scala_library(
deps = [
"//canton:bindings-java",
"//daml-lf/api-type-signature",
"//daml-lf/archive:daml_lf_archive_proto_java",
"//daml-lf/archive:daml_lf_archive_reader",
"//daml-lf/archive:daml_lf_dev_archive_proto_java",
"//daml-lf/data",
"//daml-lf/language",
"//language-support/codegen-common",

2
sdk/ledger-service/utils/BUILD.bazel
View File

@ -20,8 +20,8 @@ da_scala_library(
deps = [
"//canton:ledger_api_proto_scala",
"//daml-lf/api-type-signature",
"//daml-lf/archive:daml_lf_archive_proto_java",
"//daml-lf/archive:daml_lf_archive_reader",
"//daml-lf/archive:daml_lf_dev_archive_proto_java",
"//daml-lf/data",
"//daml-lf/language",
"//libs-scala/contextualized-logging",

4
sdk/release/artifacts.yaml
View File

@ -9,9 +9,9 @@
type: jar-lib
- target: //daml-lf/archive:daml_lf_2.1_archive_proto_java
type: jar-proto
- target: //daml-lf/archive:daml_lf_dev_archive_proto_jar
- target: //daml-lf/archive:daml_lf_archive_proto_jar
type: jar-lib
- target: //daml-lf/archive:daml_lf_dev_archive_proto_java
- target: //daml-lf/archive:daml_lf_archive_proto_java
type: jar-proto
- target: //daml-lf/archive:daml_lf_archive_reader
type: jar-scala

6
sdk/release/test-protobuf-structure.sh
View File

@ -35,9 +35,6 @@ export LANG=C
$DIFF -u <(unzip -Z1 $PROTOS | $SORT | sed 's|^[^/]*/||g') <((cat <<EOF
com/daml/daml_lf_2_1/daml_lf.proto
com/daml/daml_lf_2_1/daml_lf2.proto
com/daml/daml_lf_dev/daml_lf.proto
com/daml/daml_lf_dev/daml_lf1.proto
com/daml/daml_lf_dev/daml_lf2.proto
com/daml/ledger/api/v2/trace_context.proto
com/daml/ledger/api/v2/testing/time_service.proto
com/daml/ledger/api/v2/command_completion_service.proto
@ -67,5 +64,8 @@ com/daml/ledger/api/v2/admin/package_management_service.proto
com/daml/ledger/api/v2/admin/object_meta.proto
com/daml/ledger/api/v2/admin/party_management_service.proto
com/daml/ledger/api/v2/event.proto
com/digitalasset/daml/lf/archive/daml_lf.proto
com/digitalasset/daml/lf/archive/daml_lf1.proto
com/digitalasset/daml/lf/archive/daml_lf2.proto
EOF
) | $SORT )

4
sdk/release/util.bzl
View File

@ -164,8 +164,8 @@ protos_zip = rule(
allow_files = True,
default = [
Label("//daml-lf/archive:daml_lf_{}_archive_proto_tar.tar.gz".format(version))
for version in SUPPORTED_PROTO_STABLE_LF_VERSIONS + ["dev"]
],
for version in SUPPORTED_PROTO_STABLE_LF_VERSIONS
] + ["//daml-lf/archive:daml_lf_archive_proto_tar.tar.gz"],
),
"ledger_api_tarball": attr.label(
allow_single_file = True,