Skip to content

Commit f5acaa5

Browse files
authored
Merge pull request brianegan#118 from brianegan/test-move
All of the moves in one PR!
2 parents 5bb6905 + 0447265 commit f5acaa5

File tree

1,195 files changed

+294
-297
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,195 files changed

+294
-297
lines changed

.travis.yml

+24-24
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
- ./scripts/android-wait-for-emulator.sh
7777
- adb shell input keyevent 82
7878
- flutter devices
79-
script: travis_retry ./scripts/ci.sh ./example/bloc_flutter
79+
script: travis_retry ./scripts/ci.sh ./bloc_flutter
8080
cache:
8181
directories:
8282
- $HOME/.pub-cache
@@ -110,121 +110,121 @@ jobs:
110110
- export PATH=$PWD/flutter/bin:$PWD/flutter/bin/cache/dart-sdk/bin:$PATH
111111
- flutter doctor -v
112112
- flutter devices
113-
script: travis_retry ./scripts/ci.sh ./example/bloc_flutter
113+
script: travis_retry ./scripts/ci.sh ./bloc_flutter
114114
cache:
115115
directories:
116116
- $HOME/.pub-cache
117117

118118
- <<: *integration-test-staging
119119
os: linux
120120
env: built_redux_android
121-
script: travis_retry ./scripts/ci.sh ./example/built_redux
121+
script: travis_retry ./scripts/ci.sh ./built_redux
122122
- <<: *integration-test-staging
123123
os: osx
124124
osx_image: xcode8.0
125125
env: built_redux_ios
126126
before_install: *before_install_osx
127-
script: travis_retry ./scripts/ci.sh ./example/built_redux
127+
script: travis_retry ./scripts/ci.sh ./built_redux
128128
- <<: *integration-test-staging
129129
os: linux
130130
env: firestore_redux_android
131-
script: travis_retry ./scripts/ci.sh ./example/firestore_redux
131+
script: travis_retry ./scripts/ci.sh ./firestore_redux
132132
- <<: *integration-test-staging
133133
os: osx
134134
osx_image: xcode8.0
135135
env: firestore_redux_ios
136136
before_install: *before_install_osx
137-
script: travis_retry ./scripts/ci.sh ./example/firestore_redux
137+
script: travis_retry ./scripts/ci.sh ./firestore_redux
138138
- <<: *integration-test-staging
139139
os: linux
140140
env: inherited_widget_android
141-
script: travis_retry ./scripts/ci.sh ./example/inherited_widget
141+
script: travis_retry ./scripts/ci.sh ./inherited_widget
142142
- <<: *integration-test-staging
143143
os: osx
144144
osx_image: xcode8.0
145145
env: inherited_widget_ios
146146
before_install: *before_install_osx
147-
script: travis_retry ./scripts/ci.sh ./example/inherited_widget
147+
script: travis_retry ./scripts/ci.sh ./inherited_widget
148148
- <<: *integration-test-staging
149149
os: linux
150150
env: mvc_android
151-
script: travis_retry ./scripts/ci.sh ./example/mvc
151+
script: travis_retry ./scripts/ci.sh ./mvc
152152
- <<: *integration-test-staging
153153
os: osx
154154
osx_image: xcode8.0
155155
env: mvc_ios
156156
before_install: *before_install_osx
157-
script: travis_retry ./scripts/ci.sh ./example/mvc
157+
script: travis_retry ./scripts/ci.sh ./mvc
158158
- <<: *integration-test-staging
159159
os: linux
160160
env: mvi_flutter_android
161-
script: travis_retry ./scripts/ci.sh ./example/mvi_flutter
161+
script: travis_retry ./scripts/ci.sh ./mvi_flutter
162162
- <<: *integration-test-staging
163163
os: osx
164164
osx_image: xcode8.0
165165
env: mvi_flutter_ios
166166
before_install: *before_install_osx
167-
script: travis_retry ./scripts/ci.sh ./example/mvi_flutter
167+
script: travis_retry ./scripts/ci.sh ./mvi_flutter
168168
- <<: *integration-test-staging
169169
os: linux
170170
env: mvu_android
171-
script: travis_retry ./scripts/ci.sh ./example/mvu
171+
script: travis_retry ./scripts/ci.sh ./mvu
172172
- <<: *integration-test-staging
173173
os: osx
174174
osx_image: xcode8.0
175175
env: mvu_ios
176176
before_install: *before_install_osx
177-
script: travis_retry ./scripts/ci.sh ./example/mvu
177+
script: travis_retry ./scripts/ci.sh ./mvu
178178
- <<: *integration-test-staging
179179
os: linux
180180
env: redurx_android
181-
script: travis_retry ./scripts/ci.sh ./example/redurx
181+
script: travis_retry ./scripts/ci.sh ./redurx
182182
- <<: *integration-test-staging
183183
os: osx
184184
osx_image: xcode8.0
185185
env: redurx_ios
186186
before_install: *before_install_osx
187-
script: travis_retry ./scripts/ci.sh ./example/redurx
187+
script: travis_retry ./scripts/ci.sh ./redurx
188188
- <<: *integration-test-staging
189189
os: linux
190190
env: redux_android
191-
script: travis_retry ./scripts/ci.sh ./example/redux
191+
script: travis_retry ./scripts/ci.sh ./redux
192192
- <<: *integration-test-staging
193193
os: osx
194194
osx_image: xcode8.0
195195
env: redux_ios
196196
before_install: *before_install_osx
197-
script: travis_retry ./scripts/ci.sh ./example/redux
197+
script: travis_retry ./scripts/ci.sh ./redux
198198
- <<: *integration-test-staging
199199
os: linux
200200
env: scoped_model_android
201-
script: travis_retry ./scripts/ci.sh ./example/scoped_model
201+
script: travis_retry ./scripts/ci.sh ./scoped_model
202202
- <<: *integration-test-staging
203203
os: osx
204204
osx_image: xcode8.0
205205
env: scoped_model_ios
206206
before_install: *before_install_osx
207-
script: travis_retry ./scripts/ci.sh ./example/scoped_model
207+
script: travis_retry ./scripts/ci.sh ./scoped_model
208208
- <<: *integration-test-staging
209209
os: linux
210210
env: simple_bloc_flutter_android
211-
script: travis_retry ./scripts/ci.sh ./example/simple_bloc_flutter
211+
script: travis_retry ./scripts/ci.sh ./simple_bloc_flutter
212212
- <<: *integration-test-staging
213213
os: osx
214214
osx_image: xcode8.0
215215
env: simple_bloc_flutter_ios
216216
before_install: *before_install_osx
217-
script: travis_retry ./scripts/ci.sh ./example/simple_bloc_flutter
217+
script: travis_retry ./scripts/ci.sh ./simple_bloc_flutter
218218
- <<: *integration-test-staging
219219
os: linux
220220
env: vanilla_android
221-
script: travis_retry ./scripts/ci.sh ./example/vanilla
221+
script: travis_retry ./scripts/ci.sh ./vanilla
222222
- <<: *integration-test-staging
223223
os: osx
224224
osx_image: xcode8.0
225225
env: vanilla_ios
226226
before_install: *before_install_osx
227-
script: travis_retry ./scripts/ci.sh ./example/vanilla
227+
script: travis_retry ./scripts/ci.sh ./vanilla
228228

229229
- stage: Ready to deploy
230230
os: osx

README.md

+20-20
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

example/bloc_flutter/lib/dependency_injection.dart renamed to bloc_flutter/lib/dependency_injection.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ library dependency_injector;
99
import 'package:blocs/blocs.dart';
1010
import 'package:flutter/widgets.dart';
1111
import 'package:meta/meta.dart';
12-
import 'package:todos_repository/todos_repository.dart';
12+
import 'package:todos_repository_core/todos_repository_core.dart';
1313

1414
class Injector extends InheritedWidget {
1515
final TodosInteractor todosInteractor;

example/bloc_flutter/lib/main.dart renamed to bloc_flutter/lib/main.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import 'package:blocs/blocs.dart';
1111
import 'package:flutter/material.dart';
1212
import 'package:todos_app_core/todos_app_core.dart';
1313
import 'package:meta/meta.dart';
14-
import 'package:todos_repository/todos_repository.dart';
14+
import 'package:todos_repository_core/todos_repository_core.dart';
1515

1616
void main({
1717
@required TodosInteractor todosInteractor,

example/bloc_flutter/lib/main_local_storage.dart renamed to bloc_flutter/lib/main_local_storage.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import 'dart:async';
77
import 'package:bloc_flutter_sample/main.dart' as app;
88
import 'package:blocs/blocs.dart';
99
import 'package:path_provider/path_provider.dart';
10-
import 'package:todos_repository/todos_repository.dart';
11-
import 'package:todos_repository_flutter/todos_repository_flutter.dart';
10+
import 'package:todos_repository_core/todos_repository_core.dart';
11+
import 'package:todos_repository_simple/todos_repository_simple.dart';
1212

1313
void main() {
1414
app.main(

example/bloc_flutter/lib/screens/home_screen.dart renamed to bloc_flutter/lib/screens/home_screen.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import 'package:flutter/material.dart';
1717
import 'package:todos_app_core/todos_app_core.dart';
1818
import 'package:meta/meta.dart';
1919
import 'package:rxdart/rxdart.dart';
20-
import 'package:todos_repository/todos_repository.dart';
20+
import 'package:todos_repository_core/todos_repository_core.dart';
2121

2222
enum AppTab { todos, stats }
2323

example/bloc_flutter/pubspec.yaml renamed to bloc_flutter/pubspec.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ environment:
55
sdk: '>=2.0.0 <3.0.0'
66

77
dependencies:
8-
todos_repository_flutter:
9-
path: ../todos_repository_flutter
8+
todos_repository_simple:
9+
path: ../todos_repository_simple
1010
firebase_flutter_repository:
1111
path: ../firebase_flutter_repository
1212
todos_app_core:
13-
path: ../../todos_app_core
13+
path: ../todos_app_core
1414
blocs:
1515
path: ../blocs
1616
flutter:
File renamed without changes.
File renamed without changes.
File renamed without changes.

example/blocs/lib/src/models/todo.dart renamed to blocs/lib/src/models/todo.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import 'package:blocs/src/uuid.dart';
66
import 'package:meta/meta.dart';
7-
import 'package:todos_repository/todos_repository.dart';
7+
import 'package:todos_repository_core/todos_repository_core.dart';
88

99
@immutable
1010
class Todo {
File renamed without changes.
File renamed without changes.

example/blocs/lib/src/todos_interactor.dart renamed to blocs/lib/src/todos_interactor.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import 'dart:async';
66

77
import 'package:blocs/blocs.dart';
8-
import 'package:todos_repository/todos_repository.dart';
8+
import 'package:todos_repository_core/todos_repository_core.dart';
99

1010
class TodosInteractor {
1111
final ReactiveTodosRepository repository;

example/blocs/lib/src/user_bloc.dart renamed to blocs/lib/src/user_bloc.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import 'dart:async';
66

7-
import 'package:todos_repository/todos_repository.dart';
7+
import 'package:todos_repository_core/todos_repository_core.dart';
88

99
class UserBloc {
1010
final UserRepository _repository;
File renamed without changes.

example/blocs/pubspec.yaml renamed to blocs/pubspec.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ environment:
55
sdk: '>=2.0.0-dev.28.0 <3.0.0'
66

77
dependencies:
8-
todos_repository:
9-
path: ../todos_repository
8+
todos_repository_core:
9+
path: ../todos_repository_core
1010
rxdart: 0.18.0
1111

1212
dev_dependencies:
File renamed without changes.

example/blocs/test/todos_bloc_test.dart renamed to blocs/test/todos_bloc_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import 'package:blocs/blocs.dart';
44
import 'package:blocs/src/models/models.dart';
55
import 'package:mockito/mockito.dart';
66
import 'package:test/test.dart';
7-
import 'package:todos_repository/todos_repository.dart';
7+
import 'package:todos_repository_core/todos_repository_core.dart';
88

99
class MockReactiveTodosRepository extends Mock
1010
implements ReactiveTodosRepository {}

example/blocs/test/todos_interactor_test.dart renamed to blocs/test/todos_interactor_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import 'package:blocs/blocs.dart';
88
import 'package:mockito/mockito.dart';
99
import 'package:rxdart/rxdart.dart';
1010
import 'package:test/test.dart';
11-
import 'package:todos_repository/todos_repository.dart';
11+
import 'package:todos_repository_core/todos_repository_core.dart';
1212

1313
class MockReactiveTodosRepository extends Mock
1414
implements ReactiveTodosRepository {}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

example/built_redux/pubspec.yaml renamed to built_redux/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dependencies:
1212
built_value: ^5.5.5
1313
built_collection: ^3.1.3
1414
todos_app_core:
15-
path: ../../todos_app_core
15+
path: ../todos_app_core
1616

1717
dev_dependencies:
1818
flutter_test:

example/firebase_flutter_repository/lib/reactive_todos_repository.dart renamed to firebase_flutter_repository/lib/reactive_todos_repository.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import 'dart:async';
66

77
import 'package:cloud_firestore/cloud_firestore.dart';
8-
import 'package:todos_repository/todos_repository.dart';
8+
import 'package:todos_repository_core/todos_repository_core.dart';
99

1010
class FirestoreReactiveTodosRepository implements ReactiveTodosRepository {
1111
static const String path = 'todo';

example/firebase_rtdb_flutter_repository/lib/user_repository.dart renamed to firebase_flutter_repository/lib/user_repository.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import 'dart:async';
66

77
import 'package:firebase_auth/firebase_auth.dart';
8-
import 'package:todos_repository/todos_repository.dart';
8+
import 'package:todos_repository_core/todos_repository_core.dart';
99

1010
class FirebaseUserRepository implements UserRepository {
1111
final FirebaseAuth auth;

example/firebase_flutter_repository/pubspec.yaml renamed to firebase_flutter_repository/pubspec.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ environment:
77
dependencies:
88
flutter:
99
sdk: flutter
10-
todos_repository:
11-
path: ../todos_repository
10+
todos_repository_core:
11+
path: ../todos_repository_core
1212
firebase_auth: 0.5.19
1313
cloud_firestore: 0.7.4
1414

example/firebase_flutter_repository/test/firebase_flutter_repository_test.dart renamed to firebase_flutter_repository/test/firebase_flutter_repository_test.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import 'package:firebase_flutter_repository/reactive_todos_repository.dart';
1010
import 'package:firebase_flutter_repository/user_repository.dart';
1111
import 'package:mockito/mockito.dart';
1212
import 'package:test/test.dart';
13-
import 'package:todos_repository/todos_repository.dart';
13+
import 'package:todos_repository_core/todos_repository_core.dart';
1414

1515
main() {
1616
group('FirebaseUserRepository', () {

example/firebase_rtdb_flutter_repository/lib/reactive_todos_repository.dart renamed to firebase_rtdb_flutter_repository/lib/reactive_todos_repository.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import 'dart:async';
66

77
import 'package:firebase_database/firebase_database.dart';
8-
import 'package:todos_repository/todos_repository.dart';
8+
import 'package:todos_repository_core/todos_repository_core.dart';
99

1010
class FirebaseReactiveTodosRepository implements ReactiveTodosRepository {
1111
static const String path = 'todo';

example/firebase_flutter_repository/lib/user_repository.dart renamed to firebase_rtdb_flutter_repository/lib/user_repository.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import 'dart:async';
66

77
import 'package:firebase_auth/firebase_auth.dart';
8-
import 'package:todos_repository/todos_repository.dart';
8+
import 'package:todos_repository_core/todos_repository_core.dart';
99

1010
class FirebaseUserRepository implements UserRepository {
1111
final FirebaseAuth auth;

0 commit comments

Comments
 (0)