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

Update packege deps for newer MongoDB versions on host systems #97

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
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
15 changes: 15 additions & 0 deletions unpub/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion unpub/lib/src/package_store.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import 'dart:async';
import 'dart:typed_data';

abstract class PackageStore {
bool supportsDownloadUrl = false;
Expand All @@ -11,5 +12,5 @@ abstract class PackageStore {
throw 'download not implemented';
}

Future<void> upload(String name, String version, List<int> content);
Future<void> upload(String name, String version, Uint8List content);
}
6 changes: 5 additions & 1 deletion unpub/lib/unpub_api/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -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
51 changes: 26 additions & 25 deletions unpub/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion unpub/test/fixtures/package_0/0.0.1/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion unpub/test/fixtures/package_0/0.0.2/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion unpub/test/fixtures/package_0/0.0.3+1/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion unpub/test/fixtures/package_0/0.0.3/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion unpub/test/fixtures/package_0/1.0.0-noreadme/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion unpub/test/fixtures/package_0/1.0.0/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion unpub/test/fixtures/package_1/0.0.1/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
18 changes: 9 additions & 9 deletions unpub_auth/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 5 additions & 2 deletions unpub_auth/unpub_auth.iml
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/bin" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/lib" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/.dart_tool" />
<excludeFolder url="file://$MODULE_DIR$/.pub" />
<excludeFolder url="file://$MODULE_DIR$/build" />
<excludeFolder url="file://$MODULE_DIR$/.dart_tool" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Dart SDK" level="project" />
<orderEntry type="library" name="Dart Packages" level="project" />
Expand Down
3 changes: 2 additions & 1 deletion unpub_aws/lib/s3/s3_file_store.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -52,7 +53,7 @@ class S3Store extends PackageStore {
@override
Future<void> upload(String name, String version, List<int> content) async {
await minio!.putObject(
bucketName, _getObjectKey(name, version), Stream.value(content));
bucketName, _getObjectKey(name, version), Stream.value(Uint8List.fromList(content)));
}

@override
Expand Down
31 changes: 17 additions & 14 deletions unpub_aws/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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