fix: fix package structure

rIIh · Dec 25, 2020 · b5a92d1 · b5a92d1
1 parent 23b8fbc
commit b5a92d1
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 15 deletions.
diff --git a/example/main.dart b/example/main.dart
@@ -1,7 +1,7 @@
 import 'dart:io';
 
 import 'package:http/http.dart' as http;
-import 'package:oxford_dictionary/oxford_dict.dart';
+import 'package:oxford_dictionary/oxford_dictionary.dart';
 
 void main() {
   find('programming').then((word) {});

diff --git a/lib/oxford_dict.dart → lib/oxford_dictionary.dart b/lib/oxford_dict.dart → lib/oxford_dictionary.dart
@@ -1,21 +1,20 @@
-library oxford_dict;
+library oxford_dictionary;
 
-export 'src/index.dart';
+export 'src/common/exception/cache_exception.dart';
+export 'src/entities/word.dart';
 export 'src/entries/model/dictionary_entry.dart';
-export 'src/entries/model/lexical_entries.dart';
 export 'src/entries/model/domain_class.dart';
-export 'src/entries/model/grammatical_feature.dart';
-export 'src/entries/model/lexical_entry.dart';
 export 'src/entries/model/example.dart';
+export 'src/entries/model/grammatical_feature.dart';
 export 'src/entries/model/lexical_category.dart';
+export 'src/entries/model/lexical_entries.dart';
+export 'src/entries/model/lexical_entry.dart';
 export 'src/entries/model/metadata.dart';
 export 'src/entries/model/phrase.dart';
 export 'src/entries/model/pronunciation.dart';
 export 'src/entries/model/result.dart';
 export 'src/entries/model/semantic_classes.dart';
 export 'src/entries/model/sense.dart';
-export 'src/entities/word.dart';
+export 'src/index.dart';
 export 'src/lemmas/entity/lemmas.dart';
 export 'src/lemmas/model/inflection_of_data.dart';
-
-export 'src/common/exception/cache_exception.dart';
diff --git a/lib/src/entities/word.dart b/lib/src/entities/word.dart
@@ -1,6 +1,6 @@
 import 'dart:collection';
 
-import 'package:oxford_dictionary/oxford_dict.dart' as remote;
+import 'package:oxford_dictionary/oxford_dictionary.dart' as remote;
 import 'package:oxford_dictionary/src/entries/model/cross_reference.dart';
 import 'package:oxford_dictionary/src/entries/model/grammatical_feature.dart';
 

diff --git a/lib/src/lemmas/entity/lemmas.dart b/lib/src/lemmas/entity/lemmas.dart
@@ -1,4 +1,4 @@
-import 'package:oxford_dictionary/oxford_dict.dart';
+import 'package:oxford_dictionary/oxford_dictionary.dart';
 import 'package:oxford_dictionary/src/lemmas/model/inflection_of_data.dart';
 import 'package:oxford_dictionary/src/lemmas/model/lemma_response.dart';
 import 'package:oxford_dictionary/src/utils/iterable/expand.dart';

diff --git a/lib/src/lemmas/model/lemma_entry.dart b/lib/src/lemmas/model/lemma_entry.dart
@@ -1,5 +1,5 @@
 import 'package:json_annotation/json_annotation.dart';
-import 'package:oxford_dictionary/oxford_dict.dart';
+import 'package:oxford_dictionary/oxford_dictionary.dart';
 
 import 'inflection_of_data.dart';
 

diff --git a/pubspec.lock b/pubspec.lock
@@ -205,7 +205,7 @@ packages:
     source: hosted
     version: "0.2.0"
   http:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: http
       url: "https://pub.dartlang.org"

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -7,6 +7,7 @@ environment:
   sdk: ">=2.7.0 <3.0.0"
 
 dependencies:
+  http: ^0.12.2
   chopper: ^3.0.6
   json_annotation: ^3.1.0
   stash: ^1.0.2

diff --git a/test/oxford_api_test.dart b/test/oxford_api_test.dart
@@ -1,4 +1,4 @@
-import 'package:oxford_dictionary/oxford_dict.dart';
+import 'package:oxford_dictionary/oxford_dictionary.dart';
 import 'package:oxford_dictionary/src/entities/word.dart';
 import 'package:oxford_dictionary/src/index.dart';
 import 'package:test/test.dart';

diff --git a/test/test_dictionary_cache.dart b/test/test_dictionary_cache.dart
@@ -1,4 +1,4 @@
-import 'package:oxford_dictionary/oxford_dict.dart';
+import 'package:oxford_dictionary/oxford_dictionary.dart';
 import 'package:stash/stash_api.dart';
 import 'package:stash/stash_memory.dart';
 import 'package:test/test.dart';