diff --git a/unpub/CHANGELOG.md b/unpub/CHANGELOG.md index 5ff11d39..0617e1c0 100644 --- a/unpub/CHANGELOG.md +++ b/unpub/CHANGELOG.md @@ -1,3 +1,18 @@ +## 2.1.0 + +- https://github.com/bytedance/unpub/pull/85 +- https://github.com/bytedance/unpub/pull/80 +- https://github.com/bytedance/unpub/pull/70 +- https://github.com/bytedance/unpub/pull/66 +- https://github.com/bytedance/unpub/pull/60 +- https://github.com/bytedance/unpub/pull/53 +- https://github.com/bytedance/unpub/pull/51 +- https://github.com/bytedance/unpub/pull/50 +- https://github.com/bytedance/unpub/pull/48 +- https://github.com/bytedance/unpub/pull/47 +- https://github.com/bytedance/unpub/pull/38 +- https://github.com/bytedance/unpub/pull/35 + ## 2.0.0 - Supports NNBD diff --git a/unpub/lib/src/package_store.dart b/unpub/lib/src/package_store.dart index ed50aa14..5b77fdb0 100644 --- a/unpub/lib/src/package_store.dart +++ b/unpub/lib/src/package_store.dart @@ -1,4 +1,5 @@ import 'dart:async'; +import 'dart:typed_data'; abstract class PackageStore { bool supportsDownloadUrl = false; @@ -11,5 +12,5 @@ abstract class PackageStore { throw 'download not implemented'; } - Future upload(String name, String version, List content); + Future upload(String name, String version, Uint8List content); } diff --git a/unpub/lib/unpub_api/pubspec.yaml b/unpub/lib/unpub_api/pubspec.yaml index 41eec1d5..23d1c5dd 100644 --- a/unpub/lib/unpub_api/pubspec.yaml +++ b/unpub/lib/unpub_api/pubspec.yaml @@ -1,4 +1,8 @@ name: unpub_api environment: - sdk: ">=2.12.0 <3.0.0" + sdk: ">=2.12.0 <4.0.0" +dependencies: + json_annotation: ^4.8.1 +dev_dependencies: + json_serializable: ^6.7.1 diff --git a/unpub/pubspec.yaml b/unpub/pubspec.yaml index 86bd96c3..58c181fb 100644 --- a/unpub/pubspec.yaml +++ b/unpub/pubspec.yaml @@ -1,33 +1,34 @@ name: unpub description: Self-hosted private Dart Pub server for Enterprise, with a simple web interface to search and view packages information. -version: 2.0.1-dev.0 +version: 2.1.0 homepage: https://github.com/bytedance/unpub environment: - sdk: ">=2.12.0 <3.0.0" + sdk: ">=2.12.0 <4.0.0" executables: unpub: unpub dependencies: - args: ^2.2.0 - shelf: ^1.2.0 - shelf_router: ^1.1.1 - http_parser: ^4.0.0 - http: ^0.13.3 - archive: ^3.1.2 - logging: ^1.0.1 - meta: ^1.1.7 - googleapis: ^4.0.0 - yaml: ^3.1.0 - pub_semver: ^2.0.0 - json_annotation: ^4.1.0 - mongo_dart: ^0.7.1 - mime: ^1.0.0 - intl: ^0.17.0 - path: ^1.6.2 - collection: ^1.15.0 - shelf_cors_headers: ^0.1.2 + args: ^2.4.2 + shelf: ^1.4.1 + shelf_cors_headers: ^0.1.5 + shelf_router: ^1.1.4 + http_parser: ^4.0.2 + http: ^1.2.1 + archive: ^3.4.10 + logging: ^1.2.0 + meta: ^1.12.0 + googleapis: ^13.1.0 + yaml: ^3.1.2 + pub_semver: ^2.1.4 + json_annotation: ^4.8.1 + mongo_dart: ^0.10.1 + mime: ^1.0.5 + intl: ^0.19.0 + path: ^1.9.0 + collection: ^1.18.0 dev_dependencies: - test: ^1.6.1 - build_runner: ^2.1.1 - json_serializable: ^5.0.0 - shelf_router_generator: ^1.0.1 - chunked_stream: ^1.4.1 + analyzer: ^6.4.1 + test: ^1.25.2 + build_runner: ^2.4.9 + json_serializable: ^6.7.1 + shelf_router_generator: ^1.1.0 + chunked_stream: ^1.4.2 diff --git a/unpub/test/fixtures/package_0/0.0.1/pubspec.yaml b/unpub/test/fixtures/package_0/0.0.1/pubspec.yaml index f0e9949f..625542e8 100644 --- a/unpub/test/fixtures/package_0/0.0.1/pubspec.yaml +++ b/unpub/test/fixtures/package_0/0.0.1/pubspec.yaml @@ -3,4 +3,4 @@ description: test version: 0.0.1 homepage: https://example.com environment: - sdk: ">=2.0.0 <3.0.0" + sdk: ">=2.12.0 <4.0.0" diff --git a/unpub/test/fixtures/package_0/0.0.2/pubspec.yaml b/unpub/test/fixtures/package_0/0.0.2/pubspec.yaml index 9fabf2fe..66eb1bad 100644 --- a/unpub/test/fixtures/package_0/0.0.2/pubspec.yaml +++ b/unpub/test/fixtures/package_0/0.0.2/pubspec.yaml @@ -3,4 +3,4 @@ description: test version: 0.0.2 homepage: https://example.com environment: - sdk: ">=2.0.0 <3.0.0" + sdk: ">=2.12.0 <4.0.0" diff --git a/unpub/test/fixtures/package_0/0.0.3+1/pubspec.yaml b/unpub/test/fixtures/package_0/0.0.3+1/pubspec.yaml index 4a10d13c..bcfd5ba2 100644 --- a/unpub/test/fixtures/package_0/0.0.3+1/pubspec.yaml +++ b/unpub/test/fixtures/package_0/0.0.3+1/pubspec.yaml @@ -3,4 +3,4 @@ description: test version: 0.0.3+1 homepage: https://example.com environment: - sdk: ">=2.0.0 <3.0.0" + sdk: ">=2.12.0 <4.0.0" diff --git a/unpub/test/fixtures/package_0/0.0.3/pubspec.yaml b/unpub/test/fixtures/package_0/0.0.3/pubspec.yaml index 1d4fd314..27770ea7 100644 --- a/unpub/test/fixtures/package_0/0.0.3/pubspec.yaml +++ b/unpub/test/fixtures/package_0/0.0.3/pubspec.yaml @@ -3,4 +3,4 @@ description: test version: 0.0.3 homepage: https://example.com environment: - sdk: ">=2.0.0 <3.0.0" + sdk: ">=2.12.0 <4.0.0" diff --git a/unpub/test/fixtures/package_0/1.0.0-noreadme/pubspec.yaml b/unpub/test/fixtures/package_0/1.0.0-noreadme/pubspec.yaml index ae925aca..be275e27 100644 --- a/unpub/test/fixtures/package_0/1.0.0-noreadme/pubspec.yaml +++ b/unpub/test/fixtures/package_0/1.0.0-noreadme/pubspec.yaml @@ -3,4 +3,4 @@ description: test version: 1.0.0-noreadme homepage: https://example.com environment: - sdk: ">=2.0.0 <3.0.0" + sdk: ">=2.12.0 <4.0.0" diff --git a/unpub/test/fixtures/package_0/1.0.0/pubspec.yaml b/unpub/test/fixtures/package_0/1.0.0/pubspec.yaml index 01a242f3..e95c473f 100644 --- a/unpub/test/fixtures/package_0/1.0.0/pubspec.yaml +++ b/unpub/test/fixtures/package_0/1.0.0/pubspec.yaml @@ -3,4 +3,4 @@ description: test version: 1.0.0 homepage: https://example.com environment: - sdk: ">=2.0.0 <3.0.0" + sdk: ">=2.12.0 <4.0.0" diff --git a/unpub/test/fixtures/package_1/0.0.1/pubspec.yaml b/unpub/test/fixtures/package_1/0.0.1/pubspec.yaml index 38f0ebeb..6b01592e 100644 --- a/unpub/test/fixtures/package_1/0.0.1/pubspec.yaml +++ b/unpub/test/fixtures/package_1/0.0.1/pubspec.yaml @@ -3,4 +3,4 @@ description: test version: 0.0.1 homepage: https://example.com environment: - sdk: ">=2.0.0 <3.0.0" + sdk: ">=2.12.0 <4.0.0" diff --git a/unpub_auth/pubspec.yaml b/unpub_auth/pubspec.yaml index 957edc5e..91c2abc7 100644 --- a/unpub_auth/pubspec.yaml +++ b/unpub_auth/pubspec.yaml @@ -4,21 +4,21 @@ version: 0.1.0+3 homepage: https://github.com/bytedance/unpub environment: - sdk: '>=2.15.0 <3.0.0' + sdk: '>=2.15.0 <4.0.0' executables: unpub_auth: dependencies: - collection: ^1.15.0 + collection: ^1.18.0 path: ^1.8.1 - http: ^0.13.4 - shelf: ^1.2.0 - http_multi_server: ^3.0.1 - oauth2: ^2.0.0 - args: ^2.3.0 + http: ^1.2.1 + shelf: ^1.4.1 + http_multi_server: ^3.2.1 + oauth2: ^2.0.2 + args: ^2.4.2 console: ^4.1.0 dev_dependencies: - lints: ^1.0.0 - test: ^1.16.0 + lints: ^3.0.0 + test: ^1.25.2 diff --git a/unpub_auth/unpub_auth.iml b/unpub_auth/unpub_auth.iml index 0931c291..af072443 100644 --- a/unpub_auth/unpub_auth.iml +++ b/unpub_auth/unpub_auth.iml @@ -1,12 +1,15 @@ - + + + + - + diff --git a/unpub_aws/lib/s3/s3_file_store.dart b/unpub_aws/lib/s3/s3_file_store.dart index a3d1044d..0b2dca31 100644 --- a/unpub_aws/lib/s3/s3_file_store.dart +++ b/unpub_aws/lib/s3/s3_file_store.dart @@ -1,6 +1,7 @@ import 'dart:async'; import 'dart:cli'; import 'dart:io'; +import 'dart:typed_data'; import 'package:minio/minio.dart'; import 'package:unpub/unpub.dart'; @@ -52,7 +53,7 @@ class S3Store extends PackageStore { @override Future upload(String name, String version, List content) async { await minio!.putObject( - bucketName, _getObjectKey(name, version), Stream.value(content)); + bucketName, _getObjectKey(name, version), Stream.value(Uint8List.fromList(content))); } @override diff --git a/unpub_aws/pubspec.yaml b/unpub_aws/pubspec.yaml index 16436844..36b196ac 100644 --- a/unpub_aws/pubspec.yaml +++ b/unpub_aws/pubspec.yaml @@ -3,21 +3,24 @@ description: A collection of modules to use for deploying unpub into AWS infrast version: 0.1.0 homepage: https://github.com/bytedance/unpub environment: - sdk: ">=2.12.0 <3.0.0" + sdk: ">=2.12.0 <4.0.0" dependencies: - unpub: ^2.0.0 - minio: ^3.0.0 - http: ^0.13.3 + unpub: ^2.1.0 + minio: ^3.5.0 + http: ^1.2.1 dev_dependencies: - lints: ^1.0.0 - test: ^1.17.12 - chunked_stream: ^1.4.1 - mockito: ^5.0.16 - build_runner: ^2.1.2 - path: ^1.8.0 - json_annotation: ^4.1.0 -# dependency_overrides: -# unpub: -# path: ../unpub + lints: ^3.0.0 + test: ^1.25.2 + chunked_stream: ^1.4.2 + mockito: ^5.4.4 + build_runner: ^2.4.9 + path: ^1.9.0 + json_annotation: ^4.8.1 + +dependency_overrides: + unpub: + path: ../unpub + http: ^1.2.1 + intl: ^0.19.0