fix import/export needed deps

tekartik · Sep 25, 2024 · df33e72 · df33e72
1 parent 7c161e9
commit df33e72
Show file tree

Hide file tree

Showing 24 changed files with 11 additions and 20 deletions.
diff --git a/auth_rest/example/example_google_auth.dart b/auth_rest/example/example_google_auth.dart
@@ -6,7 +6,6 @@ import 'package:http/http.dart';
 import 'package:tekartik_common_utils/common_utils_import.dart';
 // ignore: depend_on_referenced_packages
 
-import 'package:tekartik_firebase_auth/auth.dart';
 import 'package:tekartik_firebase_auth_rest/auth_rest.dart';
 import 'package:tekartik_firebase_auth_rest/src/auth_rest.dart';
 import 'package:tekartik_firebase_auth_rest/src/google_auth_rest_web.dart';

diff --git a/auth_rest/example/io/example_google_auth_io.dart b/auth_rest/example/io/example_google_auth_io.dart
@@ -3,7 +3,6 @@
 import 'dart:io';
 
 import 'package:tekartik_common_utils/common_utils_import.dart';
-import 'package:tekartik_firebase_auth_rest/auth_rest.dart';
 import 'package:tekartik_firebase_auth_rest/auth_rest_io.dart';
 import 'package:tekartik_firebase_rest/firebase_rest.dart';
 import 'package:yaml/yaml.dart';

diff --git a/auth_rest/lib/auth_rest.dart b/auth_rest/lib/auth_rest.dart
@@ -3,6 +3,7 @@ library;
 import 'package:tekartik_firebase_auth/auth.dart';
 import 'package:tekartik_firebase_auth_rest/src/auth_rest.dart' as auth_rest;
 
+export 'package:tekartik_firebase_auth/auth.dart';
 export 'package:tekartik_firebase_auth_rest/src/auth_rest.dart'
     show
         AuthRest,
@@ -16,6 +17,7 @@ export 'package:tekartik_firebase_auth_rest/src/google_auth_rest.dart'
     show GoogleAuthOptions;
 
 FirebaseAuthService get authServiceRest => auth_rest.authService;
+
 @Deprecated('Use authServiceRest')
 FirebaseAuthService get authService => authServiceRest;
 

diff --git a/auth_rest/lib/auth_rest_io.dart b/auth_rest/lib/auth_rest_io.dart
@@ -1 +1,2 @@
+export 'auth_rest.dart';
 export 'src/platform/platform.dart' show GoogleAuthProviderRestIo;
diff --git a/auth_rest/lib/auth_rest_web.dart b/auth_rest/lib/auth_rest_web.dart
@@ -1 +1,2 @@
+export 'auth_rest.dart';
 export 'src/platform/platform.dart' show GoogleAuthProviderRestWeb;
diff --git a/auth_rest/test/api_test.dart b/auth_rest/test/api_test.dart
@@ -1,5 +1,4 @@
 import 'package:tekartik_common_utils/env_utils.dart';
-import 'package:tekartik_firebase_auth_rest/auth_rest.dart';
 import 'package:tekartik_firebase_auth_rest/auth_rest_web.dart';
 import 'package:test/test.dart';
 

diff --git a/auth_rest/test/auth_rest_io_env_test.dart b/auth_rest/test/auth_rest_io_env_test.dart
@@ -2,10 +2,8 @@
 library;
 
 import 'package:tekartik_common_utils/common_utils_import.dart';
-import 'package:tekartik_firebase_auth/auth.dart';
 import 'package:tekartik_firebase_auth/utils/json_utils.dart';
 import 'package:tekartik_firebase_auth_rest/auth_rest.dart';
-import 'package:tekartik_firebase_auth_rest/src/import.dart';
 import 'package:tekartik_firebase_auth_test/auth_test.dart';
 import 'package:tekartik_firebase_rest/firebase_rest.dart';
 import 'package:tekartik_firebase_rest/test/setup.dart';

diff --git a/auth_rest/test/auth_rest_test.dart b/auth_rest/test/auth_rest_test.dart
@@ -2,10 +2,8 @@
 library;
 
 import 'package:tekartik_common_utils/common_utils_import.dart';
-import 'package:tekartik_firebase_auth/auth.dart';
 import 'package:tekartik_firebase_auth/utils/json_utils.dart';
 import 'package:tekartik_firebase_auth_rest/auth_rest.dart';
-import 'package:tekartik_firebase_auth_rest/src/import.dart';
 import 'package:tekartik_firebase_auth_test/auth_test.dart';
 import 'package:tekartik_firebase_rest/firebase_rest.dart';
 import 'package:test/test.dart';

diff --git a/firebase_rest/lib/firebase_rest.dart b/firebase_rest/lib/firebase_rest.dart
@@ -4,9 +4,9 @@ import 'package:tekartik_firebase/firebase.dart';
 import 'package:tekartik_firebase/firebase_admin.dart';
 import 'package:tekartik_firebase_rest/src/firebase_rest.dart';
 
+export 'package:tekartik_firebase/firebase.dart';
 export 'package:tekartik_firebase_rest/src/firebase_app_rest.dart'
     show FirebaseAppRestExt;
-
 export 'package:tekartik_firebase_rest/src/firebase_rest.dart'
     show
         AppOptionsRest,

diff --git a/firebase_rest/lib/firebase_rest_setup.dart b/firebase_rest/lib/firebase_rest_setup.dart
@@ -1,3 +1,4 @@
+export 'firebase_rest.dart';
 export 'src/rest_setup.dart' show firebaseGoogleApisFirebaseRulesApiScope;
 export 'src/test/test_setup.dart'
     show firebaseRestSetupContext, FirebaseRestSetupContext;
diff --git a/firebase_rest/lib/src/app_options_access_token.dart b/firebase_rest/lib/src/app_options_access_token.dart
@@ -1,7 +1,6 @@
 // Token data
 import 'package:googleapis_auth/googleapis_auth.dart';
 import 'package:http/http.dart';
-import 'package:tekartik_firebase/firebase.dart';
 import 'package:tekartik_firebase_rest/firebase_rest.dart';
 
 /// Get app options from access credentials

diff --git a/firebase_rest/lib/src/firebase_app_rest.dart b/firebase_rest/lib/src/firebase_app_rest.dart
@@ -1,7 +1,6 @@
 import 'package:googleapis/firebaserules/v1.dart';
 import 'package:googleapis_auth/googleapis_auth.dart';
 import 'package:http/http.dart';
-import 'package:tekartik_firebase/firebase.dart';
 import 'package:tekartik_firebase/firebase_mixin.dart';
 import 'package:tekartik_firebase_rest/firebase_rest.dart';
 

diff --git a/firebase_rest/lib/src/firebase_rest.dart b/firebase_rest/lib/src/firebase_rest.dart
@@ -1,6 +1,5 @@
 import 'package:googleapis_auth/googleapis_auth.dart';
 import 'package:http/http.dart';
-import 'package:tekartik_firebase/firebase.dart';
 import 'package:tekartik_firebase/firebase_admin.dart';
 import 'package:tekartik_firebase/src/firebase_mixin.dart'; // ignore: implementation_imports
 import 'package:tekartik_firebase_rest/firebase_rest.dart';

diff --git a/firebase_rest/test/no_auth_app.dart b/firebase_rest/test/no_auth_app.dart
@@ -1,5 +1,4 @@
 import 'package:tekartik_app_http/app_http.dart';
-import 'package:tekartik_firebase/firebase.dart';
 import 'package:tekartik_firebase_rest/firebase_rest.dart';
 
 /// Create new firestore client without auth

diff --git a/firestore_rest/lib/firestore_rest.dart b/firestore_rest/lib/firestore_rest.dart
@@ -2,6 +2,7 @@ import 'package:googleapis/firestore/v1.dart';
 import 'package:tekartik_firebase_firestore/firestore.dart';
 import 'package:tekartik_firebase_firestore_rest/src/firestore/v1.dart';
 import 'package:tekartik_firebase_firestore_rest/src/firestore_rest_impl.dart'; // ignore: implementation_imports
+export 'package:tekartik_firebase_firestore/firestore.dart';
 
 abstract class FirestoreServiceRest extends FirestoreService {}
 

diff --git a/firestore_rest/lib/snapshot.dart b/firestore_rest/lib/snapshot.dart
@@ -1,7 +1,6 @@
 import 'dart:convert';
 
 import 'package:path/path.dart';
-import 'package:tekartik_firebase/firebase.dart';
 import 'package:tekartik_firebase_firestore/firestore.dart';
 import 'package:tekartik_firebase_firestore/src/firestore.dart'; // ignore: implementation_imports
 

diff --git a/firestore_rest/lib/src/firestore_rest_impl.dart b/firestore_rest/lib/src/firestore_rest_impl.dart
@@ -3,7 +3,6 @@ import 'dart:typed_data';
 import 'package:http/http.dart' as http;
 import 'package:path/path.dart';
 import 'package:tekartik_common_utils/env_utils.dart';
-import 'package:tekartik_firebase/firebase.dart';
 import 'package:tekartik_firebase/firebase_mixin.dart';
 import 'package:tekartik_firebase_firestore/utils/json_utils.dart';
 import 'package:tekartik_firebase_firestore_rest/firestore_rest.dart';

diff --git a/firestore_rest/test/firestore_rest_impl_test.dart b/firestore_rest/test/firestore_rest_impl_test.dart
@@ -1,8 +1,6 @@
 // ignore_for_file: avoid_print
 
 import 'package:http/http.dart';
-import 'package:tekartik_firebase/firebase.dart';
-import 'package:tekartik_firebase_firestore/firestore.dart';
 import 'package:tekartik_firebase_firestore_rest/firestore_rest.dart';
 import 'package:tekartik_firebase_firestore_rest/src/firestore/v1.dart' as api;
 import 'package:tekartik_firebase_firestore_rest/src/firestore_rest_impl.dart';

diff --git a/firestore_rest/test/no_auth_firestore.dart b/firestore_rest/test/no_auth_firestore.dart
@@ -1,5 +1,4 @@
 import 'package:tekartik_app_http/app_http.dart';
-import 'package:tekartik_firebase_firestore/firestore.dart';
 import 'package:tekartik_firebase_firestore_rest/firestore_rest.dart';
 import 'package:tekartik_firebase_rest/firebase_rest.dart';
 

diff --git a/firestore_rest/test/snapshot_test.dart b/firestore_rest/test/snapshot_test.dart
@@ -1,6 +1,5 @@
 // ignore_for_file: prefer_const_constructors
 
-import 'package:tekartik_firebase/firebase.dart';
 import 'package:tekartik_firebase_firestore/firestore.dart';
 import 'package:tekartik_firebase_firestore/src/firestore.dart';
 import 'package:tekartik_firebase_firestore/utils/firestore_mixin.dart';

diff --git a/storage_rest/lib/src/storage_rest_impl.dart b/storage_rest/lib/src/storage_rest_impl.dart
@@ -3,7 +3,6 @@ import 'dart:typed_data';
 import 'package:googleapis/bigquery/v2.dart';
 import 'package:googleapis/storage/v1.dart' as api;
 import 'package:http/http.dart';
-import 'package:tekartik_firebase/firebase.dart';
 import 'package:tekartik_firebase/firebase_mixin.dart';
 import 'package:tekartik_firebase_rest/firebase_rest.dart';
 import 'package:tekartik_firebase_storage/storage.dart';

diff --git a/storage_rest/lib/storage_json.dart b/storage_rest/lib/storage_json.dart
@@ -7,6 +7,8 @@ import 'package:tekartik_http/http_client.dart';
 
 import 'src/import.dart';
 
+export 'package:tekartik_firebase_storage/storage.dart';
+
 // {
 //  "prefixes": [],
 //  "items": [

diff --git a/storage_rest/lib/storage_rest.dart b/storage_rest/lib/storage_rest.dart
@@ -1,3 +1,5 @@
+export 'package:tekartik_firebase_storage/storage.dart';
+
 export 'src/storage_rest_impl.dart'
     show
         StorageServiceRest,

diff --git a/storage_rest/test/no_auth_storage_rest.dart b/storage_rest/test/no_auth_storage_rest.dart
@@ -1,6 +1,5 @@
 import 'package:tekartik_app_http/app_http.dart';
 import 'package:tekartik_firebase_rest/firebase_rest.dart';
-import 'package:tekartik_firebase_storage/storage.dart';
 import 'package:tekartik_firebase_storage_rest/storage_rest.dart';
 
 /// Create new firestore client without auth
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		export 'auth_rest.dart';
		export 'src/platform/platform.dart' show GoogleAuthProviderRestIo;