diff --git a/cherrypick/.gitignore b/cherrypick/.gitignore index dbef116..16cc011 100644 --- a/cherrypick/.gitignore +++ b/cherrypick/.gitignore @@ -19,3 +19,6 @@ doc/api/ *.js_ *.js.deps *.js.map + +# FVM Version Cache +.fvm/ \ No newline at end of file diff --git a/cherrypick/example/bin/main.dart b/cherrypick/example/bin/main.dart index f9251c6..5da6cb9 100644 --- a/cherrypick/example/bin/main.dart +++ b/cherrypick/example/bin/main.dart @@ -109,6 +109,7 @@ abstract class ApiClient { } class ApiClientMock implements ApiClient { + @override Future sendRequest({ @required String? url, String? token, @@ -120,6 +121,7 @@ class ApiClientMock implements ApiClient { } class ApiClientImpl implements ApiClient { + @override Future sendRequest({ @required String? url, String? token, diff --git a/cherrypick/lib/cherrypick.dart b/cherrypick/lib/cherrypick.dart index 053877e..f229438 100644 --- a/cherrypick/lib/cherrypick.dart +++ b/cherrypick/lib/cherrypick.dart @@ -1,3 +1,5 @@ +library; + /// /// Copyright 2021 Sergey Penkovsky /// Licensed under the Apache License, Version 2.0 (the "License"); @@ -11,8 +13,6 @@ /// limitations under the License. /// -library cherrypick; - export 'package:cherrypick/src/binding.dart'; export 'package:cherrypick/src/helper.dart'; export 'package:cherrypick/src/module.dart'; diff --git a/cherrypick/lib/src/binding.dart b/cherrypick/lib/src/binding.dart index d460880..4ce8d0c 100644 --- a/cherrypick/lib/src/binding.dart +++ b/cherrypick/lib/src/binding.dart @@ -1,15 +1,15 @@ -/// -/// Copyright 2021 Sergey Penkovsky -/// Licensed under the Apache License, Version 2.0 (the "License"); -/// you may not use this file except in compliance with the License. -/// You may obtain a copy of the License at -/// http://www.apache.org/licenses/LICENSE-2.0 -/// Unless required by applicable law or agreed to in writing, software -/// distributed under the License is distributed on an "AS IS" BASIS, -/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -/// See the License for the specific language governing permissions and -/// limitations under the License. -/// +// +// Copyright 2021 Sergey Penkovsky +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// enum Mode { simple, instance, providerInstance, providerInstanceWithParams } diff --git a/cherrypick/lib/src/factory.dart b/cherrypick/lib/src/factory.dart index f2bbb89..cbf9d4c 100644 --- a/cherrypick/lib/src/factory.dart +++ b/cherrypick/lib/src/factory.dart @@ -1,15 +1,15 @@ -/// -/// Copyright 2021 Sergey Penkovsky -/// Licensed under the Apache License, Version 2.0 (the "License"); -/// you may not use this file except in compliance with the License. -/// You may obtain a copy of the License at -/// http://www.apache.org/licenses/LICENSE-2.0 -/// Unless required by applicable law or agreed to in writing, software -/// distributed under the License is distributed on an "AS IS" BASIS, -/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -/// See the License for the specific language governing permissions and -/// limitations under the License. -/// +// +// Copyright 2021 Sergey Penkovsky +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// import 'package:cherrypick/src/scope.dart'; abstract class Factory { diff --git a/cherrypick/lib/src/helper.dart b/cherrypick/lib/src/helper.dart index 3295c96..e9e2895 100644 --- a/cherrypick/lib/src/helper.dart +++ b/cherrypick/lib/src/helper.dart @@ -1,15 +1,15 @@ -/// -/// Copyright 2021 Sergey Penkovsky -/// Licensed under the Apache License, Version 2.0 (the "License"); -/// you may not use this file except in compliance with the License. -/// You may obtain a copy of the License at -/// http://www.apache.org/licenses/LICENSE-2.0 -/// Unless required by applicable law or agreed to in writing, software -/// distributed under the License is distributed on an "AS IS" BASIS, -/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -/// See the License for the specific language governing permissions and -/// limitations under the License. -/// +// +// Copyright 2021 Sergey Penkovsky +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// import 'package:cherrypick/src/scope.dart'; import 'package:meta/meta.dart'; diff --git a/cherrypick/lib/src/module.dart b/cherrypick/lib/src/module.dart index 32be9d9..0eab282 100644 --- a/cherrypick/lib/src/module.dart +++ b/cherrypick/lib/src/module.dart @@ -1,15 +1,15 @@ -/// -/// Copyright 2021 Sergey Penkovsky -/// Licensed under the Apache License, Version 2.0 (the "License"); -/// you may not use this file except in compliance with the License. -/// You may obtain a copy of the License at -/// http://www.apache.org/licenses/LICENSE-2.0 -/// Unless required by applicable law or agreed to in writing, software -/// distributed under the License is distributed on an "AS IS" BASIS, -/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -/// See the License for the specific language governing permissions and -/// limitations under the License. -/// +// +// Copyright 2021 Sergey Penkovsky +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// import 'dart:collection'; import 'package:cherrypick/src/binding.dart'; diff --git a/cherrypick/lib/src/scope.dart b/cherrypick/lib/src/scope.dart index 5ed650f..ca53dcb 100644 --- a/cherrypick/lib/src/scope.dart +++ b/cherrypick/lib/src/scope.dart @@ -1,15 +1,15 @@ -/// -/// Copyright 2021 Sergey Penkovsky -/// Licensed under the Apache License, Version 2.0 (the "License"); -/// you may not use this file except in compliance with the License. -/// You may obtain a copy of the License at -/// http://www.apache.org/licenses/LICENSE-2.0 -/// Unless required by applicable law or agreed to in writing, software -/// distributed under the License is distributed on an "AS IS" BASIS, -/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -/// See the License for the specific language governing permissions and -/// limitations under the License. -/// +// +// Copyright 2021 Sergey Penkovsky +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// import 'dart:collection'; import 'package:cherrypick/src/binding.dart'; diff --git a/cherrypick/pubspec.yaml b/cherrypick/pubspec.yaml index 3874e61..f9be141 100644 --- a/cherrypick/pubspec.yaml +++ b/cherrypick/pubspec.yaml @@ -13,9 +13,7 @@ dependencies: meta: ^1.3.0 dev_dependencies: - #pedantic: ^1.11.0 - - test: ^1.17.2 + lints: ^5.0.0 + test: ^1.25.15 mockito: ^5.0.6 - lints: ^2.1.0 diff --git a/cherrypick_flutter/lib/cherrypick_flutter.dart b/cherrypick_flutter/lib/cherrypick_flutter.dart index 8085ee2..48fdf3a 100644 --- a/cherrypick_flutter/lib/cherrypick_flutter.dart +++ b/cherrypick_flutter/lib/cherrypick_flutter.dart @@ -1,3 +1,5 @@ +library; + /// /// Copyright 2021 Sergey Penkovsky /// Licensed under the Apache License, Version 2.0 (the "License"); @@ -10,6 +12,5 @@ /// See the License for the specific language governing permissions and /// limitations under the License. /// -library cherrypick_flutter; export 'src/cherrypick_provider.dart'; diff --git a/cherrypick_flutter/pubspec.yaml b/cherrypick_flutter/pubspec.yaml index 9d70582..cdebd0e 100644 --- a/cherrypick_flutter/pubspec.yaml +++ b/cherrypick_flutter/pubspec.yaml @@ -18,7 +18,8 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^4.0.0 + flutter_lints: ^5.0.0 + test: ^1.25.7 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec diff --git a/melos.yaml b/melos.yaml index b0165cf..dfb13a0 100644 --- a/melos.yaml +++ b/melos.yaml @@ -8,8 +8,10 @@ packages: scripts: analyze: - run: | - flutter analyze + exec: dart analyze + format: - run: | - flutter format \ No newline at end of file + exec: dart format + + test: + exec: dart test ./test \ No newline at end of file