diff --git a/firebase/pubspec.yaml b/firebase/pubspec.yaml index 158e4db..71cd598 100644 --- a/firebase/pubspec.yaml +++ b/firebase/pubspec.yaml @@ -14,12 +14,12 @@ dependencies: url: https://github.com/tekartik/common_utils.dart ref: dart3a version: '>=0.10.1' - path: '^1.6.1' - collection: '^1.14.10' + path: '>=1.6.1' + collection: '>=1.14.10' synchronized: dev_dependencies: - dev_test: - test: "^1.0.0" + dev_build: + test: ">=1.0.0" build_runner: build_test: process_run: '>=0.10.12' diff --git a/firebase/tool/travis.dart b/firebase/tool/travis.dart index d9053ac..5fa390f 100644 --- a/firebase/tool/travis.dart +++ b/firebase/tool/travis.dart @@ -1,4 +1,4 @@ -import 'package:dev_test/package.dart'; +import 'package:dev_build/package.dart'; Future main() async { await packageRunCi('.'); diff --git a/firebase_browser/pubspec.yaml b/firebase_browser/pubspec.yaml index 2eea41e..94bac55 100644 --- a/firebase_browser/pubspec.yaml +++ b/firebase_browser/pubspec.yaml @@ -37,7 +37,7 @@ dev_dependencies: build_runner: ">=0.9.1" build_test: ">=0.10.3" build_web_compilers: ">=0.4.0+4" - dev_test: + dev_build: dependency_overrides: tekartik_firebase: diff --git a/firebase_browser/tool/travis.dart b/firebase_browser/tool/travis.dart index d9053ac..5fa390f 100644 --- a/firebase_browser/tool/travis.dart +++ b/firebase_browser/tool/travis.dart @@ -1,4 +1,4 @@ -import 'package:dev_test/package.dart'; +import 'package:dev_build/package.dart'; Future main() async { await packageRunCi('.'); diff --git a/firebase_rest/lib/src/platform_web.dart b/firebase_rest/lib/src/platform_web.dart index 80b1fd0..e8aa7e0 100644 --- a/firebase_rest/lib/src/platform_web.dart +++ b/firebase_rest/lib/src/platform_web.dart @@ -1,9 +1,3 @@ -@Deprecated('use firebase_rest_io') -import 'package:tekartik_firebase_rest/firebase_rest.dart'; - -FirebaseAdminCredentialRest newFromServiceAccountJson(String serviceAccountJson, - {List? scopes}) => - throw UnsupportedError('newFromServiceAccountJson io only'); -FirebaseAdminCredentialRest newFromServiceAccountMap(Map serviceAccountMap, - {List? scopes}) => - throw UnsupportedError('newFromServiceAccountMap io only'); +// This actually work on the web... +export 'firebase_rest_io.dart' + show newFromServiceAccountJson, newFromServiceAccountMap; diff --git a/firebase_rest/pubspec.yaml b/firebase_rest/pubspec.yaml index b7b1f23..9ced985 100644 --- a/firebase_rest/pubspec.yaml +++ b/firebase_rest/pubspec.yaml @@ -22,7 +22,7 @@ dependencies: http: path: dev_dependencies: - dev_test: + dev_build: tekartik_firebase_test: path: ../firebase_test process_run: diff --git a/firebase_rest/test/firebase_rest_common_test.dart b/firebase_rest/test/firebase_rest_common_test.dart new file mode 100644 index 0000000..5fee2db --- /dev/null +++ b/firebase_rest/test/firebase_rest_common_test.dart @@ -0,0 +1,32 @@ +library tekartik_firebase_rest.rest_common_test; + +import 'package:tekartik_firebase/firebase_admin.dart'; +import 'package:tekartik_firebase_rest/firebase_rest.dart'; +import 'package:test/test.dart'; + +Future main() async { + test('setup', () async { + var serviceAccountMap = { + 'type': 'service_account', + 'project_id': 'xxx', + 'private_key_id': 'yyy', + 'private_key': 'zzz', + 'client_email': 'aaa', + 'client_id': 'bbbb', + 'auth_uri': 'ccc', + 'token_uri': 'ddd', + 'auth_provider_x509_cert_url': 'eee', + 'client_x509_cert_url': 'fff' + }; + var firebaseAdmin = firebaseRest as FirebaseAdmin; + try { + firebaseAdmin.credential.setApplicationDefault( + FirebaseAdminCredentialRest.fromServiceAccountMap( + serviceAccountMap, + // scopes: scopes + )); + print(firebaseAdmin.credential.applicationDefault()); + await firebaseAdmin.credential.applicationDefault()?.getAccessToken(); + } catch (_) {} + }); +} diff --git a/firebase_rest/tool/travis.dart b/firebase_rest/tool/travis.dart index d9053ac..5fa390f 100644 --- a/firebase_rest/tool/travis.dart +++ b/firebase_rest/tool/travis.dart @@ -1,4 +1,4 @@ -import 'package:dev_test/package.dart'; +import 'package:dev_build/package.dart'; Future main() async { await packageRunCi('.'); diff --git a/firebase_sim/pubspec.yaml b/firebase_sim/pubspec.yaml index 863940f..8aaff05 100644 --- a/firebase_sim/pubspec.yaml +++ b/firebase_sim/pubspec.yaml @@ -27,8 +27,8 @@ dependencies: json_rpc_2: dev_dependencies: - dev_test: - test: "^1.0.0" + dev_build: + test: '>=1.0.0' build_runner: ">=0.9.1" build_web_compilers: ">=0.4.0+4" build_test: ">=0.10.3" diff --git a/firebase_sim/tool/travis.dart b/firebase_sim/tool/travis.dart index d9053ac..5fa390f 100644 --- a/firebase_sim/tool/travis.dart +++ b/firebase_sim/tool/travis.dart @@ -1,4 +1,4 @@ -import 'package:dev_test/package.dart'; +import 'package:dev_build/package.dart'; Future main() async { await packageRunCi('.'); diff --git a/firebase_sim_browser/pubspec.yaml b/firebase_sim_browser/pubspec.yaml index 187036b..1c28113 100644 --- a/firebase_sim_browser/pubspec.yaml +++ b/firebase_sim_browser/pubspec.yaml @@ -23,7 +23,7 @@ dependencies: version: '>=0.2.1' dev_dependencies: - dev_test: + dev_build: test: ">=0.12.37" build_runner: ">=0.9.1" build_web_compilers: ">=0.4.0+4" diff --git a/firebase_sim_browser/tool/travis.dart b/firebase_sim_browser/tool/travis.dart index d9053ac..5fa390f 100644 --- a/firebase_sim_browser/tool/travis.dart +++ b/firebase_sim_browser/tool/travis.dart @@ -1,4 +1,4 @@ -import 'package:dev_test/package.dart'; +import 'package:dev_build/package.dart'; Future main() async { await packageRunCi('.'); diff --git a/firebase_sim_io/pubspec.yaml b/firebase_sim_io/pubspec.yaml index 9d683af..febb506 100644 --- a/firebase_sim_io/pubspec.yaml +++ b/firebase_sim_io/pubspec.yaml @@ -32,8 +32,8 @@ dev_dependencies: url: https://github.com/tekartik/firebase.dart path: firebase_test ref: dart3a - dev_test: - test: "^1.0.0" + dev_build: + test: ">=1.0.0" build_runner: ">=0.9.1" build_test: ">=0.10.3" process_run: diff --git a/firebase_sim_io/tool/travis.dart b/firebase_sim_io/tool/travis.dart index d9053ac..5fa390f 100644 --- a/firebase_sim_io/tool/travis.dart +++ b/firebase_sim_io/tool/travis.dart @@ -1,4 +1,4 @@ -import 'package:dev_test/package.dart'; +import 'package:dev_build/package.dart'; Future main() async { await packageRunCi('.'); diff --git a/repo_support/pubspec.yaml b/repo_support/pubspec.yaml index fb40c81..8265f8f 100644 --- a/repo_support/pubspec.yaml +++ b/repo_support/pubspec.yaml @@ -11,7 +11,7 @@ dev_dependencies: pub_semver: process_run: '>=0.10.3' test: - dev_test: + dev_build: tekartik_lints: git: url: https://github.com/tekartik/common.dart diff --git a/repo_support/tool/run_ci.dart b/repo_support/tool/run_ci.dart index 679eb80..2b1a704 100644 --- a/repo_support/tool/run_ci.dart +++ b/repo_support/tool/run_ci.dart @@ -1,4 +1,4 @@ -import 'package:dev_test/package.dart'; +import 'package:dev_build/package.dart'; import 'package:path/path.dart'; var topDir = '..';