From df33e72d7682d1c3f223dab81a51f3e7120d5c14 Mon Sep 17 00:00:00 2001 From: Alexandre Roux Date: Wed, 25 Sep 2024 16:19:32 +0200 Subject: [PATCH] fix import/export needed deps --- auth_rest/example/example_google_auth.dart | 1 - auth_rest/example/io/example_google_auth_io.dart | 1 - auth_rest/lib/auth_rest.dart | 2 ++ auth_rest/lib/auth_rest_io.dart | 1 + auth_rest/lib/auth_rest_web.dart | 1 + auth_rest/test/api_test.dart | 1 - auth_rest/test/auth_rest_io_env_test.dart | 2 -- auth_rest/test/auth_rest_test.dart | 2 -- firebase_rest/lib/firebase_rest.dart | 2 +- firebase_rest/lib/firebase_rest_setup.dart | 1 + firebase_rest/lib/src/app_options_access_token.dart | 1 - firebase_rest/lib/src/firebase_app_rest.dart | 1 - firebase_rest/lib/src/firebase_rest.dart | 1 - firebase_rest/test/no_auth_app.dart | 1 - firestore_rest/lib/firestore_rest.dart | 1 + firestore_rest/lib/snapshot.dart | 1 - firestore_rest/lib/src/firestore_rest_impl.dart | 1 - firestore_rest/test/firestore_rest_impl_test.dart | 2 -- firestore_rest/test/no_auth_firestore.dart | 1 - firestore_rest/test/snapshot_test.dart | 1 - storage_rest/lib/src/storage_rest_impl.dart | 1 - storage_rest/lib/storage_json.dart | 2 ++ storage_rest/lib/storage_rest.dart | 2 ++ storage_rest/test/no_auth_storage_rest.dart | 1 - 24 files changed, 11 insertions(+), 20 deletions(-) diff --git a/auth_rest/example/example_google_auth.dart b/auth_rest/example/example_google_auth.dart index 71d1dd7..5923086 100644 --- 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 index d6627a0..75aee22 100644 --- 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 index 99595da..6387f63 100644 --- 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 index 0350acc..45cbd0c 100644 --- 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 index 6763a2e..ac4c3f5 100644 --- 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 index 697b07d..3c55fec 100644 --- 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 index ee027d6..2b582b9 100644 --- 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 index 41eceb3..ee43ef2 100644 --- 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 index 248d3cf..2ca86e3 100644 --- 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 index 1ca1d8a..486600a 100644 --- 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 index 94e0edc..c88a854 100644 --- 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 index 8bb14c5..a5247ca 100644 --- 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 index 27a38f5..6a0a91d 100644 --- 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 index 60fce1c..ac94e80 100644 --- 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 index 36817ab..75f6efa 100644 --- 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 index 6ae4210..defc428 100644 --- 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 index c5cc660..377039a 100644 --- 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 index 7e873a3..27334e7 100644 --- 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 index f0f35b8..79c496d 100644 --- 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 index 14fff67..8c82bdd 100644 --- 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 index ef474b4..c010c59 100644 --- 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 index 74919b1..aa2e0c4 100644 --- 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 index ef7f128..1b28808 100644 --- 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 index 1580350..8d8e2fc 100644 --- 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