Rename config directory to avoid collisions

The application was failing to build due to the presence of the
"config" directory, which seems to conflict with the generation
of files with "flutter config" during builds with meta-flutter's
flutter-app bbclass.  Rename the directory and update references
to it to allow building.

Bug-AGL: SPEC-4969

Change-Id: I5d36d8fb2c91f0a1aa6c4deb86a040424bc35ac5
Signed-off-by: Scott Murray <scott.murray@konsulko.com>

diff --git a/config/config.yaml b/app-config/config.yaml
similarity index 100%
rename from config/config.yaml
rename to app-config/config.yaml

diff --git a/lib/data/data_providers/vehicle_notifier.dart b/lib/data/data_providers/vehicle_notifier.dart
index 7842311..b12cbfd 100644 (file)
--- a/lib/data/data_providers/vehicle_notifier.dart
+++ b/lib/data/data_providers/vehicle_notifier.dart
@@ -127,7 +127,7 @@ class VehicleNotifier extends StateNotifier<Vehicle> {
     String hostName = 'localhost';
     int port = 8080;
     try {
-      var data = await rootBundle.loadString('config/config.yaml');
+      var data = await rootBundle.loadString('app-config/config.yaml');
       final dynamic yamlMap = loadYaml(data);
 
       if (yamlMap.containsKey('hostname')) {

diff --git a/pubspec.yaml b/pubspec.yaml
index 5dc5224..6aa9639 100644 (file)
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -82,7 +82,7 @@ flutter:
     - assets/
     - animations/
     - animations/hybrid_model/
-    - config/
+    - app-config/
 
   # An image asset can refer to one or more resolution-specific "variants", see
   # https://flutter.dev/assets-and-images/#resolution-aware