Skip to content

Commit a68aa02

Browse files
adrien-piquerez-daadrien-piquerez-da
authored
Merge branch 'main' into scala3-transcode
2 parents 52187c2 + a2620d7 commit a68aa02

File tree

164 files changed

+2094
-778
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

164 files changed

+2094
-778
lines changed

‎CODEOWNERS‎

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -16,38 +16,3 @@ azure-pipelines.yml @digital-asset/daml-language
1616
azure-cron.yml @digital-asset/daml-language
1717
sdk/release/ @digital-asset/daml-language
1818
sdk/release.sh @digital-asset/daml-language
19-
20-
# Blackduck
21-
/sdk/NOTICES
22-
23-
# Compatibility test
24-
/sdk/compatibility/ @digital-asset/daml-language @digital-asset/kv-participant
25-
26-
# Language
27-
/sdk/daml-assistant/ @digital-asset/daml-language
28-
/sdk/daml-script/
29-
/sdk/compiler/ @digital-asset/daml-language
30-
/sdk/libs-haskell/ @digital-asset/daml-language
31-
/sdk/ghc-lib/ @digital-asset/daml-language
32-
/sdk/test-common/canton/
33-
34-
# Runtime
35-
/sdk/daml-lf/
36-
37-
38-
# Ecosystems
39-
/sdk/language-support/hs/ @digital-asset/daml-language
40-
/sdk/language-support/java/
41-
/sdk/language-support/scala/
42-
/sdk/language-support/ts/
43-
44-
# Application Runtime
45-
/sdk/ledger-service/
46-
/sdk/runtime-components/
47-
48-
# Misc
49-
/sdk/docs/
50-
/sdk/libs-scala/
51-
52-
# Observability related libraries
53-
/sdk/observability

‎ci/build-unix.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ steps:
166166
MAVEN_USERNAME: $(MAVEN_USERNAME)
167167
MAVEN_PASSWORD: $(MAVEN_PASSWORD)
168168
MAVEN_URL: "https://central.sonatype.com"
169-
GOOGLE_ARTIFACT_REGISTRY_URL: "https://europe-maven.pkg.dev/da-artifacts-dev/playground-maven"
169+
GOOGLE_ARTIFACT_REGISTRY_URL: "https://europe-maven.pkg.dev/da-images-dev/playground-maven"
170170
GOOGLE_APPLICATION_CREDENTIALS_CONTENT: $(GOOGLE_APPLICATION_CREDENTIALS_CONTENT)
171171
NPM_TOKEN: $(NPM_TOKEN)
172172
name: publish_npm_mvn

‎sdk/canton/community/admin-api/src/main/protobuf/com/digitalasset/canton/admin/participant/v30/participant_repair_service.proto‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import "google/protobuf/timestamp.proto";
1919
*/
2020
service ParticipantRepairService {
2121
// Export the ACS for the given parties from the participant
22-
// DEPRECATED: Use ExportAcs in the party_management_service.proto instead
23-
// TODO(#24610) - Remove, new ExportAcs lives in the party_management_service.proto
22+
// DEPRECATED: Use ExportAcs in this proto file
23+
// TODO(#24610) - Remove, replaced with ExportAcs below
2424
rpc ExportAcsOld(ExportAcsOldRequest) returns (stream ExportAcsOldResponse) {
2525
option deprecated = true;
2626
}

‎sdk/canton/community/app/src/test/daml/CantonLfDev/daml.yaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
sdk-version: 3.5.0-snapshot.20251024.14367.0.v6d15c990
1+
override-components:
2+
damlc:
3+
version: $DAML_VERSION
4+
daml-script:
5+
version: $DAML_VERSION
26
build-options:
37
- --target=2.dev
48
name: CantonLfDev

‎sdk/canton/community/app/src/test/daml/CantonLfV21/daml.yaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
sdk-version: 3.5.0-snapshot.20251024.14367.0.v6d15c990
1+
override-components:
2+
damlc:
3+
version: $DAML_VERSION
4+
daml-script:
5+
version: $DAML_VERSION
26
build-options:
37
- --target=2.1
48
- --enable-interfaces=yes

‎sdk/canton/community/app/src/test/daml/CantonTest/daml.yaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
sdk-version: 3.5.0-snapshot.20251024.14367.0.v6d15c990
1+
override-components:
2+
damlc:
3+
version: $DAML_VERSION
4+
daml-script:
5+
version: $DAML_VERSION
26
build-options:
37
- --target=2.1
48
name: CantonTests

‎sdk/canton/community/app/src/test/daml/CantonTestDev/daml.yaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
sdk-version: 3.5.0-snapshot.20251024.14367.0.v6d15c990
1+
override-components:
2+
damlc:
3+
version: $DAML_VERSION
4+
daml-script:
5+
version: $DAML_VERSION
26
build-options:
37
- --target=2.dev
48
name: CantonTestsDev

‎sdk/canton/community/app/src/test/daml/JsonApiTest/Account/daml.yaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
sdk-version: 3.5.0-snapshot.20251024.14367.0.v6d15c990
1+
override-components:
2+
damlc:
3+
version: $DAML_VERSION
4+
daml-script:
5+
version: $DAML_VERSION
26
build-options:
37
- --target=2.1
48
- --enable-interfaces=yes

‎sdk/canton/community/app/src/test/daml/JsonApiTest/CIou/daml.yaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
sdk-version: 3.5.0-snapshot.20251024.14367.0.v6d15c990
1+
override-components:
2+
damlc:
3+
version: $DAML_VERSION
4+
daml-script:
5+
version: $DAML_VERSION
26
build-options:
37
- --target=2.1
48
- --enable-interfaces=yes

‎sdk/canton/community/app/src/test/daml/JsonApiTest/Upgrades/Iface/daml.yaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
sdk-version: 3.5.0-snapshot.20251024.14367.0.v6d15c990
1+
override-components:
2+
damlc:
3+
version: $DAML_VERSION
4+
daml-script:
5+
version: $DAML_VERSION
26
name: ifoo
37
source: IFoo.daml
48
version: 0.0.1

0 commit comments

Comments
 (0)