Skip to content
This repository was archived by the owner on Sep 7, 2022. It is now read-only.

Commit

Permalink
Rename share asset directory (#353)
Browse files Browse the repository at this point in the history
  • Loading branch information
kevmoo authored Oct 25, 2020
1 parent 35b5329 commit 163d77e
Show file tree
Hide file tree
Showing 28 changed files with 32 additions and 32 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ pubspec.lock
doc/api/

# Files with private data. Used for development and testing
shared_assets/lib/config.json
shared_assets/lib/service_account.json
_shared_assets/lib/config.json
_shared_assets/lib/service_account.json

# Firebase function files
tool/firebase_functions/.firebaserc
Expand Down
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
os: linux
script: "pub global activate mono_repo 3.0.0 && pub global run mono_repo travis --validate"
- stage: work
name: "SDK: dev; PKGS: firebase, shared_assets; TASKS: [`dartfmt -n --set-exit-if-changed .`, `dartanalyzer --fatal-warnings --fatal-infos .`]"
name: "SDK: dev; PKGS: _shared_assets, firebase; TASKS: [`dartfmt -n --set-exit-if-changed .`, `dartanalyzer --fatal-warnings --fatal-infos .`]"
dart: dev
os: linux
env: PKGS="firebase shared_assets"
env: PKGS="_shared_assets firebase"
script: tool/travis.sh dartfmt dartanalyzer
- stage: work
name: "SDK: dev; PKG: firebase; TASKS: `pub run build_runner build example --fail-on-severe --delete-conflicting-outputs`"
Expand All @@ -25,7 +25,7 @@ jobs:
env: PKGS="firebase"
script: tool/travis.sh command_0
- stage: work
name: "SDK: dev; PKG: firebase; TASKS: `pushd ../shared_assets && pub get && dart create_config.dart && popd && pub run test`"
name: "SDK: dev; PKG: firebase; TASKS: `pushd ../_shared_assets && pub get && dart create_config.dart && popd && pub run test`"
dart: dev
os: linux
env: PKGS="firebase"
Expand All @@ -37,5 +37,5 @@ stages:
cache:
directories:
- "$HOME/.pub-cache"
- _shared_assets/.dart_tool/build
- firebase/.dart_tool/build
- shared_assets/.dart_tool/build
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ Future config() async {
}

try {
var response = await sw.fetch('packages/shared_assets/config.json');
var response = await sw.fetch('packages/_shared_assets/config.json');
if (response.status > 399) {
throw StateError(
'Problem with server: ${response.status} ${response.body}');
Expand All @@ -71,7 +71,7 @@ Future config() async {
Future<dynamic> readServiceAccountJson() async {
try {
var response =
await sw.fetch('packages/shared_assets/service_account.json');
await sw.fetch('packages/_shared_assets/service_account.json');
if (response.status > 399) {
throw StateError(
'Problem with server: ${response.status} ${response.body}');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const _firebaseScopes = [

Future<AccessToken> getAccessToken(Client client) async {
var serviceAccountJsonPath = (await Isolate.resolvePackageUri(
Uri.parse('package:shared_assets/service_account.json')))
Uri.parse('package:_shared_assets/service_account.json')))
.toFilePath();

var serviceAccountJsonString =
Expand All @@ -36,7 +36,7 @@ Future<AccessToken> getAccessToken(Client client) async {

Future<String> getDatabaseUri() async {
var serviceAccountJsonPath = (await Isolate.resolvePackageUri(
Uri.parse('package:shared_assets/config.json')))
Uri.parse('package:_shared_assets/config.json')))
.toFilePath();

var jsonString = File(serviceAccountJsonPath).readAsStringSync();
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion shared_assets/pubspec.yaml → _shared_assets/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: shared_assets
name: _shared_assets
publish_to: none

environment:
Expand Down
2 changes: 1 addition & 1 deletion firebase/example/auth/index.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import 'dart:convert';
import 'dart:html';

import 'package:firebase/firebase.dart' as fb;
import 'package:shared_assets/assets.dart';
import 'package:_shared_assets/assets.dart';

void main() async {
//Use for firebase package development only
Expand Down
2 changes: 1 addition & 1 deletion firebase/example/auth_phone/index.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import 'dart:convert';
import 'dart:html';

import 'package:firebase/firebase.dart' as fb;
import 'package:shared_assets/assets.dart';
import 'package:_shared_assets/assets.dart';

void main() async {
//Use for firebase package development only
Expand Down
2 changes: 1 addition & 1 deletion firebase/example/firestore/index.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import 'dart:html';

import 'package:firebase/firebase.dart' as fb;
import 'package:firebase/firestore.dart';
import 'package:shared_assets/assets.dart';
import 'package:_shared_assets/assets.dart';

void main() async {
//Use for firebase package development only
Expand Down
2 changes: 1 addition & 1 deletion firebase/example/messaging/index.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import 'dart:html';
import 'package:firebase/firebase.dart' as fb;
import 'package:http/browser_client.dart';
import 'package:service_worker/window.dart' as sw;
import 'package:shared_assets/assets.dart';
import 'package:_shared_assets/assets.dart';

void main() async {
//Use for firebase package development only
Expand Down
2 changes: 1 addition & 1 deletion firebase/example/messaging/sw.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ library messaging_demo.service_worker;
import 'package:firebase/firebase.dart' as firebase;
import 'package:js/js.dart';
import 'package:service_worker/worker.dart' as sw;
import 'package:shared_assets/assets.dart';
import 'package:_shared_assets/assets.dart';

void main(List<String> args) async {
importScripts('https://www.gstatic.com/firebasejs/7.23.0/firebase-app.js');
Expand Down
2 changes: 1 addition & 1 deletion firebase/example/realtime_database/index.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'dart:html';

import 'package:firebase/firebase.dart' as fb;
import 'package:shared_assets/assets.dart';
import 'package:_shared_assets/assets.dart';

void main() async {
//Use for firebase package development only
Expand Down
2 changes: 1 addition & 1 deletion firebase/example/storage/index.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'dart:html';

import 'package:firebase/firebase.dart' as fb;
import 'package:shared_assets/assets.dart';
import 'package:_shared_assets/assets.dart';

void main() async {
//Use for firebase package development only
Expand Down
2 changes: 1 addition & 1 deletion firebase/mono_pkg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ stages:
dart: [dev]
- command: pub run build_runner build example --fail-on-severe --delete-conflicting-outputs
- command:
- pushd ../shared_assets
- pushd ../_shared_assets
- pub get
- dart create_config.dart
- popd
Expand Down
4 changes: 2 additions & 2 deletions firebase/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ dev_dependencies:
path: ^1.3.9
pedantic: ^1.3.0
test: ^1.6.0
shared_assets:
path: ../shared_assets
_shared_assets:
path: ../_shared_assets

build_runner: ^1.0.0
build_test: ^1.0.0
Expand Down
2 changes: 1 addition & 1 deletion firebase/test/app_test.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@TestOn('browser')
import 'package:firebase/firebase.dart' as fb;
import 'package:shared_assets/assets.dart';
import 'package:_shared_assets/assets.dart';
import 'package:test/test.dart';

void main() {
Expand Down
2 changes: 1 addition & 1 deletion firebase/test/auth_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import 'dart:core' as core show print;
import 'dart:html';

import 'package:firebase/firebase.dart';
import 'package:shared_assets/assets.dart';
import 'package:_shared_assets/assets.dart';
import 'package:test/test.dart';

import 'test_util.dart';
Expand Down
2 changes: 1 addition & 1 deletion firebase/test/database_test.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@TestOn('browser')
import 'package:firebase/firebase.dart' as fb;
import 'package:shared_assets/assets.dart';
import 'package:_shared_assets/assets.dart';
import 'package:test/test.dart';

import 'test_util.dart';
Expand Down
2 changes: 1 addition & 1 deletion firebase/test/firestore_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import 'dart:typed_data';

import 'package:firebase/firebase.dart' as fb;
import 'package:firebase/firestore.dart' as fs;
import 'package:shared_assets/assets.dart';
import 'package:_shared_assets/assets.dart';
import 'package:test/test.dart';

import 'test_util.dart' show throwsToString, validDatePathComponent;
Expand Down
2 changes: 1 addition & 1 deletion firebase/test/functions_test.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@TestOn('browser')
import 'package:firebase/firebase.dart';
import 'package:shared_assets/assets.dart';
import 'package:_shared_assets/assets.dart';
import 'package:test/test.dart';

void main() {
Expand Down
2 changes: 1 addition & 1 deletion firebase/test/io_test.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@TestOn('vm')
import 'package:firebase/firebase_io.dart';
import 'package:http/http.dart';
import 'package:shared_assets/assets_io.dart';
import 'package:_shared_assets/assets_io.dart';
import 'package:test/test.dart';

import 'test_util.dart';
Expand Down
2 changes: 1 addition & 1 deletion firebase/test/not_loaded_script_test.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@TestOn('browser')
import 'package:firebase/firebase.dart' as fb;
import 'package:shared_assets/assets.dart';
import 'package:_shared_assets/assets.dart';
import 'package:test/test.dart';

void main() {
Expand Down
2 changes: 1 addition & 1 deletion firebase/test/remote_config_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import 'dart:convert';
import 'package:firebase/firebase.dart';
import 'package:googleapis_auth/auth_io.dart';
import 'package:http/http.dart' as http;
import 'package:shared_assets/assets.dart';
import 'package:_shared_assets/assets.dart';
import 'package:test/test.dart';

/// Requires service account credentials for the project to be specified in `service_account.json`
Expand Down
2 changes: 1 addition & 1 deletion firebase/test/storage_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import 'dart:convert';

import 'package:firebase/firebase.dart';
import 'package:path/path.dart' as p;
import 'package:shared_assets/assets.dart';
import 'package:_shared_assets/assets.dart';
import 'package:test/test.dart';

import 'test_util.dart';
Expand Down
4 changes: 2 additions & 2 deletions tool/travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ for PKG in ${PKGS}; do
pub run build_runner build example --fail-on-severe --delete-conflicting-outputs || EXIT_CODE=$?
;;
command_1)
echo 'pushd ../shared_assets && pub get && dart create_config.dart && popd && pub run test'
pushd ../shared_assets && pub get && dart create_config.dart && popd && pub run test || EXIT_CODE=$?
echo 'pushd ../_shared_assets && pub get && dart create_config.dart && popd && pub run test'
pushd ../_shared_assets && pub get && dart create_config.dart && popd && pub run test || EXIT_CODE=$?
;;
dartanalyzer)
echo 'dartanalyzer --fatal-warnings --fatal-infos .'
Expand Down

0 comments on commit 163d77e

Please sign in to comment.