Skip to content

Commit

Permalink
Merging from dart3a
Browse files Browse the repository at this point in the history
  • Loading branch information
alextekartik committed Jan 14, 2024
2 parents b3e4755 + 6482307 commit 9917ee0
Show file tree
Hide file tree
Showing 16 changed files with 54 additions and 28 deletions.
8 changes: 4 additions & 4 deletions firebase/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
2 changes: 1 addition & 1 deletion firebase/tool/travis.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:dev_test/package.dart';
import 'package:dev_build/package.dart';

Future main() async {
await packageRunCi('.');
Expand Down
2 changes: 1 addition & 1 deletion firebase_browser/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion firebase_browser/tool/travis.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:dev_test/package.dart';
import 'package:dev_build/package.dart';

Future main() async {
await packageRunCi('.');
Expand Down
12 changes: 3 additions & 9 deletions firebase_rest/lib/src/platform_web.dart
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
@Deprecated('use firebase_rest_io')
import 'package:tekartik_firebase_rest/firebase_rest.dart';

FirebaseAdminCredentialRest newFromServiceAccountJson(String serviceAccountJson,
{List<String>? scopes}) =>
throw UnsupportedError('newFromServiceAccountJson io only');
FirebaseAdminCredentialRest newFromServiceAccountMap(Map serviceAccountMap,
{List<String>? scopes}) =>
throw UnsupportedError('newFromServiceAccountMap io only');
// This actually work on the web...
export 'firebase_rest_io.dart'
show newFromServiceAccountJson, newFromServiceAccountMap;
2 changes: 1 addition & 1 deletion firebase_rest/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dependencies:
http:
path:
dev_dependencies:
dev_test:
dev_build:
tekartik_firebase_test:
path: ../firebase_test
process_run:
Expand Down
32 changes: 32 additions & 0 deletions firebase_rest/test/firebase_rest_common_test.dart
Original file line number Diff line number Diff line change
@@ -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 (_) {}
});
}
2 changes: 1 addition & 1 deletion firebase_rest/tool/travis.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:dev_test/package.dart';
import 'package:dev_build/package.dart';

Future main() async {
await packageRunCi('.');
Expand Down
4 changes: 2 additions & 2 deletions firebase_sim/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion firebase_sim/tool/travis.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:dev_test/package.dart';
import 'package:dev_build/package.dart';

Future main() async {
await packageRunCi('.');
Expand Down
2 changes: 1 addition & 1 deletion firebase_sim_browser/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion firebase_sim_browser/tool/travis.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:dev_test/package.dart';
import 'package:dev_build/package.dart';

Future main() async {
await packageRunCi('.');
Expand Down
4 changes: 2 additions & 2 deletions firebase_sim_io/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion firebase_sim_io/tool/travis.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:dev_test/package.dart';
import 'package:dev_build/package.dart';

Future main() async {
await packageRunCi('.');
Expand Down
2 changes: 1 addition & 1 deletion repo_support/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion repo_support/tool/run_ci.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:dev_test/package.dart';
import 'package:dev_build/package.dart';
import 'package:path/path.dart';

var topDir = '..';
Expand Down

0 comments on commit 9917ee0

Please sign in to comment.