From e71754bd9346b9c468fbbe4a7692a85b6467c904 Mon Sep 17 00:00:00 2001 From: Jonas Franz Date: Fri, 31 Jul 2020 15:56:42 +0200 Subject: [PATCH] Move source files to src directory --- .drone.yml | 6 +++++- lib/db_construction_site.dart | 4 ++-- lib/models/index.dart | 3 --- lib/{ => src}/models/connection.dart | 2 +- lib/{ => src}/models/connection.g.dart | 0 lib/{ => src}/models/connection_type.dart | 0 lib/{ => src}/models/connection_type_converter.dart | 0 lib/{ => src}/models/connection_type_converter.g.dart | 0 lib/src/models/index.dart | 2 ++ lib/{ => src}/models/region.dart | 0 lib/{ => src}/models/region_converter.dart | 0 lib/{ => src}/models/region_converter.g.dart | 0 lib/{ => src}/services/connection_service.dart | 10 +++++----- pubspec.yaml | 3 +++ test/{models => }/connection_test.dart | 1 + 15 files changed, 19 insertions(+), 12 deletions(-) delete mode 100644 lib/models/index.dart rename lib/{ => src}/models/connection.dart (95%) rename lib/{ => src}/models/connection.g.dart (100%) rename lib/{ => src}/models/connection_type.dart (100%) rename lib/{ => src}/models/connection_type_converter.dart (100%) rename lib/{ => src}/models/connection_type_converter.g.dart (100%) create mode 100644 lib/src/models/index.dart rename lib/{ => src}/models/region.dart (100%) rename lib/{ => src}/models/region_converter.dart (100%) rename lib/{ => src}/models/region_converter.g.dart (100%) rename lib/{ => src}/services/connection_service.dart (72%) rename test/{models => }/connection_test.dart (96%) diff --git a/.drone.yml b/.drone.yml index c0cbbd8..a223281 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,4 +8,8 @@ steps: - pub get - dartanalyzer --fatal-infos --fatal-warnings . - dartfmt -n --set-exit-if-changed . - - pub run test \ No newline at end of file + - pub run test + - name: build + image: google/dart:2 + commands: + - pub publish --dry-run \ No newline at end of file diff --git a/lib/db_construction_site.dart b/lib/db_construction_site.dart index f8618b0..56e449e 100644 --- a/lib/db_construction_site.dart +++ b/lib/db_construction_site.dart @@ -1,8 +1,8 @@ library db_construction_site; -import 'package:db_construction_site/services/connection_service.dart'; +import 'src/services/connection_service.dart'; -export 'models/index.dart'; +export 'src/models/index.dart'; class DBConstructionSite { final ConnectionService connections; diff --git a/lib/models/index.dart b/lib/models/index.dart deleted file mode 100644 index 61e66b7..0000000 --- a/lib/models/index.dart +++ /dev/null @@ -1,3 +0,0 @@ -export 'connection.dart'; -export 'region.dart'; -export 'connection_type.dart'; diff --git a/lib/models/connection.dart b/lib/src/models/connection.dart similarity index 95% rename from lib/models/connection.dart rename to lib/src/models/connection.dart index 7fdcad2..2b14295 100644 --- a/lib/models/connection.dart +++ b/lib/src/models/connection.dart @@ -1,7 +1,7 @@ -import 'package:db_construction_site/models/region.dart'; import 'package:json_annotation/json_annotation.dart'; import 'connection_type.dart'; +import 'region.dart'; part 'connection.g.dart'; diff --git a/lib/models/connection.g.dart b/lib/src/models/connection.g.dart similarity index 100% rename from lib/models/connection.g.dart rename to lib/src/models/connection.g.dart diff --git a/lib/models/connection_type.dart b/lib/src/models/connection_type.dart similarity index 100% rename from lib/models/connection_type.dart rename to lib/src/models/connection_type.dart diff --git a/lib/models/connection_type_converter.dart b/lib/src/models/connection_type_converter.dart similarity index 100% rename from lib/models/connection_type_converter.dart rename to lib/src/models/connection_type_converter.dart diff --git a/lib/models/connection_type_converter.g.dart b/lib/src/models/connection_type_converter.g.dart similarity index 100% rename from lib/models/connection_type_converter.g.dart rename to lib/src/models/connection_type_converter.g.dart diff --git a/lib/src/models/index.dart b/lib/src/models/index.dart new file mode 100644 index 0000000..537e430 --- /dev/null +++ b/lib/src/models/index.dart @@ -0,0 +1,2 @@ +export 'region.dart'; +export 'connection_type.dart'; \ No newline at end of file diff --git a/lib/models/region.dart b/lib/src/models/region.dart similarity index 100% rename from lib/models/region.dart rename to lib/src/models/region.dart diff --git a/lib/models/region_converter.dart b/lib/src/models/region_converter.dart similarity index 100% rename from lib/models/region_converter.dart rename to lib/src/models/region_converter.dart diff --git a/lib/models/region_converter.g.dart b/lib/src/models/region_converter.g.dart similarity index 100% rename from lib/models/region_converter.g.dart rename to lib/src/models/region_converter.g.dart diff --git a/lib/services/connection_service.dart b/lib/src/services/connection_service.dart similarity index 72% rename from lib/services/connection_service.dart rename to lib/src/services/connection_service.dart index c1b54b3..2e82ccf 100644 --- a/lib/services/connection_service.dart +++ b/lib/src/services/connection_service.dart @@ -1,11 +1,11 @@ import 'dart:convert'; import 'dart:io'; -import 'package:db_construction_site/models/connection.dart'; -import 'package:db_construction_site/models/connection_type.dart'; -import 'package:db_construction_site/models/connection_type_converter.dart'; -import 'package:db_construction_site/models/region.dart'; -import 'package:db_construction_site/models/region_converter.dart'; +import 'package:db_construction_site/src/models/connection.dart'; +import 'package:db_construction_site/src/models/connection_type.dart'; +import 'package:db_construction_site/src/models/connection_type_converter.dart'; +import 'package:db_construction_site/src/models/region.dart'; +import 'package:db_construction_site/src/models/region_converter.dart'; import 'package:http/http.dart' as http; class ConnectionService { diff --git a/pubspec.yaml b/pubspec.yaml index 6eabafb..8d084ca 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,6 +4,9 @@ version: 0.0.1 author: Jonas Franz homepage: https://git.jfdev.de/JonasFranzDEV/db_construction_site +environment: + sdk: '>=2.1.0 <3.0.0' + dependencies: http: ^0.12.2 json_annotation: ^3.0.1 diff --git a/test/models/connection_test.dart b/test/connection_test.dart similarity index 96% rename from test/models/connection_test.dart rename to test/connection_test.dart index 6f4c5f4..c0ef67b 100644 --- a/test/models/connection_test.dart +++ b/test/connection_test.dart @@ -1,6 +1,7 @@ import 'dart:convert'; import 'package:db_construction_site/db_construction_site.dart'; +import 'package:db_construction_site/src/models/connection.dart'; import 'package:test/test.dart'; void main() {