Skip to content

Commit 80da5ab

Browse files
athomasCommit Queue
authored andcommitted
Bump SDK constraint to 3.8
* Update formatting. * Update major versions of dependencies. Closes #236 GitOrigin-RevId: af2cac8 Change-Id: I82f9c4f6a69fd60e306603640c2cdc56ab510990 Reviewed-on: https://dart-review.googlesource.com/c/dart-docker/+/432202 Reviewed-by: Ivan Inozemtsev <[email protected]> Commit-Queue: Alexander Thomas <[email protected]>
1 parent 8a21729 commit 80da5ab

File tree

5 files changed

+66
-31
lines changed

5 files changed

+66
-31
lines changed

scripts/bin/generate_library.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@ void main() {
1616
}
1717

1818
void generateLibrary(FileSystem fileSystem) {
19-
var read =
20-
(_, {headers}) =>
21-
throw StateError("generate_library should work offline");
19+
var read = (_, {headers}) =>
20+
throw StateError("generate_library should work offline");
2221
var versions = versionsFromFile(fileSystem, read);
2322
stdout.write(buildLibrary(commit, versions['stable']!, versions['beta']!));
2423
}

scripts/bin/update.dart

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,17 @@ Future<void> update(
3232
}
3333
}
3434
if (force || updated.isNotEmpty) {
35-
final template =
36-
fileSystem.file('Dockerfile-debian.template').readAsStringSync();
35+
final template = fileSystem
36+
.file('Dockerfile-debian.template')
37+
.readAsStringSync();
3738
writeVersionsFile(fileSystem, [versions['stable']!, versions['beta']!]);
3839
for (final version in updated) {
3940
final dockerfileContent = buildDockerfile(version, template);
40-
final dockerfile = (await fileSystem
41-
.directory('${version.channel}/bookworm')
42-
.create(recursive: true)).childFile('Dockerfile');
41+
final dockerfile =
42+
(await fileSystem
43+
.directory('${version.channel}/bookworm')
44+
.create(recursive: true))
45+
.childFile('Dockerfile');
4346
await dockerfile.writeAsString(dockerfileContent);
4447
}
4548
}

scripts/lib/src/library.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ GitCommit: $commit
2626
return library.toString();
2727
}
2828

29-
String _imageData(Iterable<String> tags, String channel) => '''
29+
String _imageData(Iterable<String> tags, String channel) =>
30+
'''
3031
3132
Tags: ${tags.join(', ')}
3233
Architectures: amd64, arm32v7, arm64v8

scripts/pubspec.lock

Lines changed: 53 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ packages:
55
dependency: transitive
66
description:
77
name: _fe_analyzer_shared
8-
sha256: dc27559385e905ad30838356c5f5d574014ba39872d732111cd07ac0beff4c57
8+
sha256: e55636ed79578b9abca5fecf9437947798f5ef7456308b5cb85720b793eac92f
99
url: "https://pub.dev"
1010
source: hosted
11-
version: "80.0.0"
11+
version: "82.0.0"
1212
analyzer:
1313
dependency: transitive
1414
description:
1515
name: analyzer
16-
sha256: "192d1c5b944e7e53b24b5586db760db934b177d4147c42fbca8c8c5f1eb8d11e"
16+
sha256: "904ae5bb474d32c38fb9482e2d925d5454cda04ddd0e55d2e6826bc72f6ba8c0"
1717
url: "https://pub.dev"
1818
source: hosted
19-
version: "7.3.0"
19+
version: "7.4.5"
2020
args:
2121
dependency: "direct main"
2222
description:
@@ -41,6 +41,22 @@ packages:
4141
url: "https://pub.dev"
4242
source: hosted
4343
version: "2.1.2"
44+
checked_yaml:
45+
dependency: transitive
46+
description:
47+
name: checked_yaml
48+
sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff
49+
url: "https://pub.dev"
50+
source: hosted
51+
version: "2.0.3"
52+
cli_config:
53+
dependency: transitive
54+
description:
55+
name: cli_config
56+
sha256: ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec
57+
url: "https://pub.dev"
58+
source: hosted
59+
version: "0.2.0"
4460
collection:
4561
dependency: "direct main"
4662
description:
@@ -61,10 +77,10 @@ packages:
6177
dependency: transitive
6278
description:
6379
name: coverage
64-
sha256: e3493833ea012784c740e341952298f1cc77f1f01b1bbc3eb4eecf6984fb7f43
80+
sha256: "4b8701e48a58f7712492c9b1f7ba0bb9d525644dd66d023b62e1fc8cdb560c8a"
6581
url: "https://pub.dev"
6682
source: hosted
67-
version: "1.11.1"
83+
version: "1.14.0"
6884
crypto:
6985
dependency: transitive
7086
description:
@@ -77,10 +93,10 @@ packages:
7793
dependency: "direct dev"
7894
description:
7995
name: dart_flutter_team_lints
80-
sha256: "4c8f38142598339cd28c0b48a66b6b04434ee0499b6e40baf7c62c76daa1fcad"
96+
sha256: ce0f23e2cf95cbd21766d17a7cf88584758b67fd77338d61f2ce77e3cf6d763c
8197
url: "https://pub.dev"
8298
source: hosted
83-
version: "3.5.1"
99+
version: "3.5.2"
84100
file:
85101
dependency: "direct main"
86102
description:
@@ -145,14 +161,22 @@ packages:
145161
url: "https://pub.dev"
146162
source: hosted
147163
version: "0.7.2"
164+
json_annotation:
165+
dependency: transitive
166+
description:
167+
name: json_annotation
168+
sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
169+
url: "https://pub.dev"
170+
source: hosted
171+
version: "4.9.0"
148172
lints:
149173
dependency: transitive
150174
description:
151175
name: lints
152-
sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7
176+
sha256: a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0
153177
url: "https://pub.dev"
154178
source: hosted
155-
version: "5.1.1"
179+
version: "6.0.0"
156180
logging:
157181
dependency: transitive
158182
description:
@@ -173,10 +197,10 @@ packages:
173197
dependency: transitive
174198
description:
175199
name: meta
176-
sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
200+
sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
177201
url: "https://pub.dev"
178202
source: hosted
179-
version: "1.16.0"
203+
version: "1.17.0"
180204
mime:
181205
dependency: transitive
182206
description:
@@ -197,10 +221,10 @@ packages:
197221
dependency: transitive
198222
description:
199223
name: package_config
200-
sha256: "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67"
224+
sha256: f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc
201225
url: "https://pub.dev"
202226
source: hosted
203-
version: "2.1.1"
227+
version: "2.2.0"
204228
path:
205229
dependency: transitive
206230
description:
@@ -225,6 +249,14 @@ packages:
225249
url: "https://pub.dev"
226250
source: hosted
227251
version: "2.2.0"
252+
pubspec_parse:
253+
dependency: transitive
254+
description:
255+
name: pubspec_parse
256+
sha256: "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082"
257+
url: "https://pub.dev"
258+
source: hosted
259+
version: "1.5.0"
228260
shelf:
229261
dependency: transitive
230262
description:
@@ -349,10 +381,10 @@ packages:
349381
dependency: transitive
350382
description:
351383
name: vm_service
352-
sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02
384+
sha256: "6f82e9ee8e7339f5d8b699317f6f3afc17c80a68ebef1bc0d6f52a678c14b1e6"
353385
url: "https://pub.dev"
354386
source: hosted
355-
version: "15.0.0"
387+
version: "15.0.1"
356388
watcher:
357389
dependency: transitive
358390
description:
@@ -373,18 +405,18 @@ packages:
373405
dependency: transitive
374406
description:
375407
name: web_socket
376-
sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83"
408+
sha256: "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c"
377409
url: "https://pub.dev"
378410
source: hosted
379-
version: "0.1.6"
411+
version: "1.0.1"
380412
web_socket_channel:
381413
dependency: transitive
382414
description:
383415
name: web_socket_channel
384-
sha256: "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5"
416+
sha256: d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8
385417
url: "https://pub.dev"
386418
source: hosted
387-
version: "3.0.2"
419+
version: "3.0.3"
388420
webkit_inspection_protocol:
389421
dependency: transitive
390422
description:
@@ -402,4 +434,4 @@ packages:
402434
source: hosted
403435
version: "3.1.3"
404436
sdks:
405-
dart: ">=3.7.0 <4.0.0"
437+
dart: ">=3.8.0 <4.0.0"

scripts/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: Scripts that support the creation of Dart's docker images.
33
version: 0.0.1
44
publish_to: none
55
environment:
6-
sdk: ^3.7.0
6+
sdk: ^3.8.0
77

88
dependencies:
99
args: ^2.7.0

0 commit comments

Comments
 (0)