Skip to content

Commit 9929fef

Browse files
authored
Merge pull request #558 from Concordium/sdk-11-merge-main
Sdk 11 merge `main`
2 parents 962979d + 4b0dc5a commit 9929fef

File tree

9 files changed

+566
-1122
lines changed

9 files changed

+566
-1122
lines changed

.github/workflows/pipeline.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313

1414
env:
1515
DUMMY: 3 # For cache busting.
16-
NODE_VERSION: 18.16.0
16+
NODE_VERSION: 20.19.5
1717
RUST_VERSION: 1.85
1818
WASM_PACK_VERSION: 0.13.1
1919

@@ -353,7 +353,7 @@ jobs:
353353
if: ${{ always() }}
354354
runs-on: ubuntu-latest
355355
name: Workflow result
356-
needs: [tests, typedoc, lint, markdown-lint, markdown-linkcheck, rust_lint_fmt, rust_lint_clippy]
356+
needs: [deps, build, tests, typedoc, lint, markdown-lint, markdown-linkcheck, rust_lint_fmt, rust_lint_clippy]
357357
steps:
358358
- run: exit 1
359359
# see https://stackoverflow.com/a/67532120/4907315

examples/nodejs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"dependencies": {
1212
"@concordium/ccd-js-gen": "workspace:^",
1313
"@concordium/web-sdk": "workspace:^",
14-
"@grpc/grpc-js": "^1.3.4",
14+
"@grpc/grpc-js": "^1.14.0",
1515
"@noble/ed25519": "^2.0.0",
1616
"buffer": "^6.0.3",
1717
"meow": "11.0",

examples/reactnative/Gemfile.lock

Lines changed: 31 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,30 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.6)
4+
CFPropertyList (3.0.7)
5+
base64
6+
nkf
57
rexml
6-
activesupport (6.1.7.6)
8+
activesupport (6.1.7.10)
79
concurrent-ruby (~> 1.0, >= 1.0.2)
810
i18n (>= 1.6, < 2)
911
minitest (>= 5.1)
1012
tzinfo (~> 2.0)
1113
zeitwerk (~> 2.3)
12-
addressable (2.8.5)
13-
public_suffix (>= 2.0.2, < 6.0)
14+
addressable (2.8.7)
15+
public_suffix (>= 2.0.2, < 7.0)
1416
algoliasearch (1.27.5)
1517
httpclient (~> 2.8, >= 2.8.3)
1618
json (>= 1.5.1)
1719
atomos (0.1.3)
20+
base64 (0.3.0)
1821
claide (1.1.0)
19-
cocoapods (1.13.0)
22+
cocoapods (1.16.2)
2023
addressable (~> 2.8)
2124
claide (>= 1.0.2, < 2.0)
22-
cocoapods-core (= 1.13.0)
25+
cocoapods-core (= 1.16.2)
2326
cocoapods-deintegrate (>= 1.0.3, < 2.0)
24-
cocoapods-downloader (>= 1.6.0, < 2.0)
27+
cocoapods-downloader (>= 2.1, < 3.0)
2528
cocoapods-plugins (>= 1.0.0, < 2.0)
2629
cocoapods-search (>= 1.0.0, < 2.0)
2730
cocoapods-trunk (>= 1.6.0, < 2.0)
@@ -33,8 +36,8 @@ GEM
3336
molinillo (~> 0.8.0)
3437
nap (~> 1.0)
3538
ruby-macho (>= 2.3.0, < 3.0)
36-
xcodeproj (>= 1.23.0, < 2.0)
37-
cocoapods-core (1.13.0)
39+
xcodeproj (>= 1.27.0, < 2.0)
40+
cocoapods-core (1.16.2)
3841
activesupport (>= 5.0, < 8)
3942
addressable (~> 2.8)
4043
algoliasearch (~> 1.0)
@@ -45,7 +48,7 @@ GEM
4548
public_suffix (~> 4.0)
4649
typhoeus (~> 1.0)
4750
cocoapods-deintegrate (1.0.5)
48-
cocoapods-downloader (1.6.3)
51+
cocoapods-downloader (2.1)
4952
cocoapods-plugins (1.0.0)
5053
nap
5154
cocoapods-search (1.0.1)
@@ -54,38 +57,41 @@ GEM
5457
netrc (~> 0.11)
5558
cocoapods-try (1.2.0)
5659
colored2 (3.1.2)
57-
concurrent-ruby (1.2.2)
60+
concurrent-ruby (1.3.5)
5861
escape (0.0.4)
59-
ethon (0.16.0)
62+
ethon (0.15.0)
6063
ffi (>= 1.15.0)
61-
ffi (1.16.3)
64+
ffi (1.17.2)
6265
fourflusher (2.3.1)
6366
fuzzy_match (2.0.4)
6467
gh_inspector (1.1.3)
65-
httpclient (2.8.3)
66-
i18n (1.14.1)
68+
httpclient (2.9.0)
69+
mutex_m
70+
i18n (1.14.7)
6771
concurrent-ruby (~> 1.0)
68-
json (2.6.3)
69-
minitest (5.20.0)
72+
json (2.7.6)
73+
minitest (5.25.4)
7074
molinillo (0.8.0)
71-
nanaimo (0.3.0)
75+
mutex_m (0.3.0)
76+
nanaimo (0.4.0)
7277
nap (1.1.0)
7378
netrc (0.11.0)
79+
nkf (0.2.0)
7480
public_suffix (4.0.7)
75-
rexml (3.2.6)
81+
rexml (3.4.4)
7682
ruby-macho (2.5.1)
77-
typhoeus (1.4.0)
78-
ethon (>= 0.9.0)
83+
typhoeus (1.5.0)
84+
ethon (>= 0.9.0, < 0.16.0)
7985
tzinfo (2.0.6)
8086
concurrent-ruby (~> 1.0)
81-
xcodeproj (1.23.0)
87+
xcodeproj (1.27.0)
8288
CFPropertyList (>= 2.3.3, < 4.0)
8389
atomos (~> 0.1.3)
8490
claide (>= 1.0.2, < 2.0)
8591
colored2 (~> 3.1)
86-
nanaimo (~> 0.3.0)
87-
rexml (~> 3.2.4)
88-
zeitwerk (2.6.12)
92+
nanaimo (~> 0.4.0)
93+
rexml (>= 3.3.6, < 4.0)
94+
zeitwerk (2.6.18)
8995

9096
PLATFORMS
9197
ruby

examples/reactnative/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"devDependencies": {
3232
"@babel/core": "^7.20.0",
3333
"@babel/preset-env": "^7.20.0",
34-
"@babel/runtime": "^7.20.0",
34+
"@babel/runtime": "^7.28.4",
3535
"@jest/globals": "^29.7.0",
3636
"@react-native/eslint-config": "^0.74.83",
3737
"@react-native/metro-config": "^0.72.11",

examples/wallet/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"eslint": "8",
2121
"ts-node": "10.9",
2222
"typescript": "^5.2.2",
23-
"vite": "^4.5.0",
23+
"vite": "^7.1.9",
2424
"vite-plugin-svgr": "^4.1.0",
2525
"vite-plugin-top-level-await": "^1.3.1",
2626
"vite-plugin-wasm": "^3.2.2"

examples/wallet/vite.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ export default defineConfig({
1919
},
2020
},
2121
worker: {
22-
plugins: [wasm(), topLevelAwait()],
22+
plugins: () => [wasm(), topLevelAwait()],
2323
},
2424
});

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@
3535
},
3636
"resolutions": {
3737
"@walletconnect/types": "2.13.0",
38-
"@protobuf-ts/runtime-rpc": "2.9.1"
38+
"@protobuf-ts/runtime-rpc": "2.9.1",
39+
"css-select@npm:2.1.0/nth-check": "2.1.1",
40+
"resolve-url-loader@npm:4.0.0/postcss": "8.4.31"
3941
},
4042
"scripts": {
4143
"test-ci": "yarn workspace @concordium/web-sdk run test-ci && yarn workspaces foreach --no-private --exclude @concordium/web-sdk run test",

packages/sdk/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
},
107107
"dependencies": {
108108
"@concordium/rust-bindings": "workspace:^",
109-
"@grpc/grpc-js": "^1.9.4",
109+
"@grpc/grpc-js": "^1.14.0",
110110
"@noble/ed25519": "^2.0.0",
111111
"@noble/hashes": "^1.3.2",
112112
"@protobuf-ts/grpc-transport": "^2.9.1",

0 commit comments

Comments
 (0)