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.

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

chore(deps): bump the shorebird_cli-deps group in /packages/shorebird_cli with 8 updates #2730

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions packages/shorebird_cli/lib/src/archive/directory_archive.dart
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ extension DirectoryArchive on Directory {
final tempDir = await Directory.systemTemp.createTemp();
final fileName = name ?? p.basename(path);
final outFile = File(p.join(tempDir.path, '$fileName.zip'));
await Isolate.run(() {
ZipFileEncoder().zipDirectory(this, filename: outFile.path);
await Isolate.run(() async {
await ZipFileEncoder().zipDirectory(this, filename: outFile.path);
});
return outFile;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ class AppleArchiveDiffer extends ArchiveDiffer {

List<ArchiveFile> _filesToUnsign(String archivePath) {
return ZipDecoder()
.decodeBuffer(InputFileStream(archivePath))
.decodeStream(InputFileStream(archivePath))
.files
.where((file) => file.isFile)
.where(
Expand All @@ -110,7 +110,7 @@ class AppleArchiveDiffer extends ArchiveDiffer {

List<ArchiveFile> _carFiles(String archivePath) {
return ZipDecoder()
.decodeBuffer(InputFileStream(archivePath))
.decodeStream(InputFileStream(archivePath))
.files
.where((file) => file.isFile && p.basename(file.name) == 'Assets.car')
.toList();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,14 +96,14 @@ abstract class ArchiveDiffer {
/// Returns a map of file paths to their respective checksums.
Future<PathHashes> fileHashes(File archive) async {
return Isolate.run(() {
final zipDirectory = ZipDirectory.read(InputFileStream(archive.path));
final zipDirectory = ZipDirectory()..read(InputFileStream(archive.path));

return {
for (final file in zipDirectory.fileHeaders)
// Zip files contain an (optional) crc32 checksum for a file. IPAs and
// AARs seem to always include this for files, so a quick way for us
// to tell if file contents differ is if their checksums differ.
file.filename: file.crc32!.toString(),
file.filename: file.crc32.toString(),
};
});
}
Expand Down
2 changes: 1 addition & 1 deletion packages/shorebird_cli/lib/src/artifact_manager.dart
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ class ArtifactManager {
}) async {
await Isolate.run(() async {
final inputStream = InputFileStream(zipFile.path);
final archive = ZipDecoder().decodeBuffer(inputStream);
final archive = ZipDecoder().decodeStream(inputStream);
await extractArchiveToDisk(archive, outputDirectory.path);
inputStream.closeSync();
});
Expand Down
54 changes: 31 additions & 23 deletions packages/shorebird_cli/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ packages:
dependency: "direct main"
description:
name: archive
sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d
sha256: "6199c74e3db4fbfbd04f66d739e72fe11c8a8957d5f219f1f4482dbde6420b5a"
url: "https://pub.dev"
source: hosted
version: "3.6.1"
version: "4.0.2"
args:
dependency: "direct main"
description:
Expand Down Expand Up @@ -106,18 +106,18 @@ packages:
dependency: "direct dev"
description:
name: build_runner
sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d"
sha256: "74691599a5bc750dc96a6b4bfd48f7d9d66453eab04c7f4063134800d6a5c573"
url: "https://pub.dev"
source: hosted
version: "2.4.13"
version: "2.4.14"
build_runner_core:
dependency: transitive
description:
name: build_runner_core
sha256: f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0
sha256: "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021"
url: "https://pub.dev"
source: hosted
version: "7.3.2"
version: "8.0.0"
build_verify:
dependency: "direct dev"
description:
Expand Down Expand Up @@ -394,10 +394,10 @@ packages:
dependency: "direct dev"
description:
name: json_serializable
sha256: c2fcb3920cf2b6ae6845954186420fca40bc0a8abcc84903b7801f17d7050d7c
sha256: "8f52361c07497a7f2c16c13aac159f9be6fb12b1d67719eac98a21d9a205d571"
url: "https://pub.dev"
source: hosted
version: "6.9.0"
version: "6.9.2"
jwt:
dependency: "direct main"
description:
Expand Down Expand Up @@ -533,6 +533,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.5.1"
posix:
dependency: transitive
description:
name: posix
sha256: a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a
url: "https://pub.dev"
source: hosted
version: "6.0.1"
propertylistserialization:
dependency: "direct main"
description:
Expand All @@ -553,10 +561,10 @@ packages:
dependency: "direct main"
description:
name: pubspec_parse
sha256: c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8
sha256: "81876843eb50dc2e1e5b151792c9a985c5ed2536914115ed04e9c8528f6647b0"
url: "https://pub.dev"
source: hosted
version: "1.3.0"
version: "1.4.0"
rational:
dependency: transitive
description:
Expand Down Expand Up @@ -647,18 +655,18 @@ packages:
dependency: transitive
description:
name: source_gen
sha256: "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832"
sha256: "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b"
url: "https://pub.dev"
source: hosted
version: "1.5.0"
version: "2.0.0"
source_helper:
dependency: transitive
description:
name: source_helper
sha256: "6adebc0006c37dd63fe05bca0a929b99f06402fc95aa35bf36d67f5c06de01fd"
sha256: "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c"
url: "https://pub.dev"
source: hosted
version: "1.3.4"
version: "1.3.5"
source_map_stack_trace:
dependency: transitive
description:
Expand Down Expand Up @@ -711,10 +719,10 @@ packages:
dependency: "direct main"
description:
name: stream_transform
sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f"
sha256: ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871
url: "https://pub.dev"
source: hosted
version: "2.1.0"
version: "2.1.1"
string_scanner:
dependency: transitive
description:
Expand Down Expand Up @@ -743,10 +751,10 @@ packages:
dependency: "direct dev"
description:
name: test
sha256: "22eb7769bee38c7e032d532e8daa2e1cc901b799f603550a4db8f3a5f5173ea2"
sha256: "8391fbe68d520daf2314121764d38e37f934c02fd7301ad18307bd93bd6b725d"
url: "https://pub.dev"
source: hosted
version: "1.25.12"
version: "1.25.14"
test_api:
dependency: transitive
description:
Expand Down Expand Up @@ -871,17 +879,17 @@ packages:
dependency: "direct main"
description:
name: yaml
sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5"
sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce
url: "https://pub.dev"
source: hosted
version: "3.1.2"
version: "3.1.3"
yaml_edit:
dependency: "direct main"
description:
name: yaml_edit
sha256: e9c1a3543d2da0db3e90270dbb1e4eebc985ee5e3ffe468d83224472b2194a5f
sha256: fb38626579fb345ad00e674e2af3a5c9b0cc4b9bfb8fd7f7ff322c7c9e62aef5
url: "https://pub.dev"
source: hosted
version: "2.2.1"
version: "2.2.2"
sdks:
dart: ">=3.5.0 <4.0.0"
dart: ">=3.6.0 <4.0.0"
16 changes: 8 additions & 8 deletions packages/shorebird_cli/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ environment:
sdk: ">=3.3.0 <4.0.0"

dependencies:
archive: ^3.6.1
archive: ^4.0.2
args: ^2.6.0
barbecue: ^0.5.0
checked_yaml: ^2.0.3
Expand All @@ -35,26 +35,26 @@ dependencies:
pointycastle: ^3.9.1
propertylistserialization: ^1.3.0
pub_semver: ^2.1.5
pubspec_parse: ^1.2.3
pubspec_parse: ^1.4.0
retry: ^3.1.2
scoped_deps: ^0.1.0
shorebird_code_push_client:
path: ../shorebird_code_push_client
shorebird_code_push_protocol:
path: ../shorebird_code_push_protocol
stream_transform: ^2.1.0
stream_transform: ^2.1.1
uuid: ^4.5.1
xml: ^6.5.0
yaml: ^3.1.2
yaml_edit: ^2.2.0
yaml: ^3.1.3
yaml_edit: ^2.2.2

dev_dependencies:
build_runner: ^2.4.13
build_runner: ^2.4.14
build_verify: ^3.1.0
build_version: ^2.1.1
json_serializable: ^6.9.0
json_serializable: ^6.9.2
mocktail: ^1.0.3
test: ^1.25.9
test: ^1.25.14
very_good_analysis: ^7.0.0

executables:
Expand Down
4 changes: 2 additions & 2 deletions packages/shorebird_cli/test/src/cache_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ void main() {
);
when(() => httpClient.send(any())).thenAnswer(
(_) async => http.StreamedResponse(
Stream.value(ZipEncoder().encode(Archive())!),
Stream.value(ZipEncoder().encode(Archive())),
HttpStatus.ok,
),
);
Expand Down Expand Up @@ -282,7 +282,7 @@ void main() {
);
}
return http.StreamedResponse(
Stream.value(ZipEncoder().encode(Archive())!),
Stream.value(ZipEncoder().encode(Archive())),
HttpStatus.ok,
);
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ void main() {
..writeAsStringSync('app_id: $appId', flush: true);
}

File createAabFile({required String? channel}) {
Future<File> createAabFile({required String? channel}) async {
final tempDir = Directory.systemTemp.createTempSync();
final aabDirectory = Directory(p.join(tempDir.path, 'app-release'))
..createSync(recursive: true);
Expand All @@ -127,7 +127,7 @@ void main() {
..createSync(recursive: true)
..writeAsStringSync(yamlContents);

ZipFileEncoder().zipDirectory(aabDirectory, filename: aabPath());
await ZipFileEncoder().zipDirectory(aabDirectory, filename: aabPath());

return File(aabPath());
}
Expand Down Expand Up @@ -658,7 +658,7 @@ void main() {
group('when channel is not set', () {
group('when target channel is production', () {
test('does not change shorebird.yaml', () async {
aabFile = createAabFile(channel: null);
aabFile = await createAabFile(channel: null);
await runWithOverrides(
() => command.setChannelOnAab(
aabFile: aabFile,
Expand All @@ -677,7 +677,7 @@ void main() {

group('when target channel is not production', () {
test('sets shorebird.yaml channel to target channel', () async {
aabFile = createAabFile(channel: null);
aabFile = await createAabFile(channel: null);
await runWithOverrides(
() => command.setChannelOnAab(
aabFile: aabFile,
Expand All @@ -697,7 +697,7 @@ channel: live

group('when channel is set to target channel', () {
test('does not attempt to set channel', () async {
aabFile = createAabFile(channel: track.channel);
aabFile = await createAabFile(channel: track.channel);
final originalModificationTime = aabFile.statSync().modified;
await runWithOverrides(
() => command.setChannelOnAab(
Expand All @@ -719,7 +719,7 @@ channel: ${track.channel}

group('when channel is set to a different channel', () {
test('sets shorebird.yaml channel to target channel', () async {
aabFile = createAabFile(channel: 'dev');
aabFile = await createAabFile(channel: 'dev');
await runWithOverrides(
() => command.setChannelOnAab(
aabFile: aabFile,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,7 @@ void main() {
File(p.join(apksDir.path, apkFileName))
..createSync(recursive: true)
..writeAsStringSync('hello');
ZipFileEncoder().zipDirectory(
apksDir,
filename: apksFile.path,
);
await ZipFileEncoder().zipDirectory(apksDir, filename: apksFile.path);
return apksFile;
}

Expand Down
2 changes: 1 addition & 1 deletion packages/shorebird_cli/test/src/pubspec_editor_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,9 @@ flutter:
equals('''
$basePubspecContents
flutter:
uses-material-design: true
assets:
- shorebird.yaml
uses-material-design: true
'''),
);
});
Expand Down
Loading