fix(core): MainActivity.kt not found (#197)

VeryGoodOpenSource · Sep 30, 2021 · b450049 · b450049
1 parent a0145d2
commit b450049
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 86 deletions.
diff --git a/.github/workflows/very_good_cli.yaml b/.github/workflows/very_good_cli.yaml
@@ -38,7 +38,7 @@ jobs:
         run: flutter pub run test --run-skipped -t pull-request-only
 
       - name: Run Tests
-        run: flutter test -x pull-request-only --no-pub --coverage --test-randomize-ordering-seed random
+        run: flutter test -x pull-request-only -x e2e --no-pub --coverage --test-randomize-ordering-seed random
 
       - name: Check Code Coverage
         uses: VeryGoodOpenSource/very_good_coverage@v1.1.1

diff --git a/lib/src/commands/create.dart b/lib/src/commands/create.dart
@@ -143,18 +143,10 @@ class CreateCommand extends Command<int> {
   String get _description => _argResults['desc'] as String? ?? '';
 
   /// Gets the organization name.
-  List<Map<String, String>> get _orgName {
+  String get _orgName {
     final orgName = _argResults['org-name'] as String? ?? _defaultOrgName;
     _validateOrgName(orgName);
-    final segments = orgName.replaceAll(RegExp('-|_'), ' ').split('.');
-    final org = <Map<String, String>>[];
-    for (var i = 0; i < segments.length; i++) {
-      final segment = segments[i];
-      org.add(
-        {'value': segment, 'separator': i == segments.length - 1 ? '' : '.'},
-      );
-    }
-    return org;
+    return orgName;
   }
 
   Template get _template {

diff --git a/lib/src/templates/dart_package_bundle.dart b/lib/src/templates/dart_package_bundle.dart
diff --git a/lib/src/templates/flutter_package_bundle.dart b/lib/src/templates/flutter_package_bundle.dart
diff --git a/lib/src/templates/very_good_core_bundle.dart b/lib/src/templates/very_good_core_bundle.dart
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -22,7 +22,7 @@ dev_dependencies:
   build_verify: ^2.0.0
   build_version: ^2.0.0
   mocktail: ^0.1.1
-  test: ^1.17.0
+  test: ">=1.17.0 <1.18.0"
 
 executables:
   very_good:
diff --git a/test/src/commands/create_test.dart b/test/src/commands/create_test.dart
@@ -201,11 +201,7 @@ void main() {
           ),
           vars: <String, dynamic>{
             'project_name': 'my_app',
-            'org_name': [
-              {'value': 'com', 'separator': '.'},
-              {'value': 'example', 'separator': '.'},
-              {'value': 'verygoodcore', 'separator': ''}
-            ],
+            'org_name': 'com.example.verygoodcore',
             'description': '',
           },
         ),
@@ -256,11 +252,7 @@ void main() {
           ),
           vars: <String, dynamic>{
             'project_name': 'my_app',
-            'org_name': [
-              {'value': 'com', 'separator': '.'},
-              {'value': 'example', 'separator': '.'},
-              {'value': 'verygoodcore', 'separator': ''}
-            ],
+            'org_name': 'com.example.verygoodcore',
             'description': 'very good description',
           },
         ),
@@ -305,10 +297,7 @@ void main() {
       });
 
       group('valid --org-name', () {
-        Future<void> expectValidOrgName(
-          String orgName,
-          List<Map<String, String>> expected,
-        ) async {
+        Future<void> expectValidOrgName(String orgName) async {
           final argResults = MockArgResults();
           final generator = MockMasonGenerator();
           final command = CreateCommand(
@@ -343,59 +332,34 @@ void main() {
               vars: <String, dynamic>{
                 'project_name': 'my_app',
                 'description': '',
-                'org_name': expected
+                'org_name': orgName
               },
             ),
           ).called(1);
         }
 
         test('alphanumeric with three parts', () async {
-          await expectValidOrgName('very.good.ventures', [
-            {'value': 'very', 'separator': '.'},
-            {'value': 'good', 'separator': '.'},
-            {'value': 'ventures', 'separator': ''},
-          ]);
+          await expectValidOrgName('very.good.ventures');
         });
 
         test('containing an underscore', () async {
-          await expectValidOrgName('very.good.test_case', [
-            {'value': 'very', 'separator': '.'},
-            {'value': 'good', 'separator': '.'},
-            {'value': 'test case', 'separator': ''},
-          ]);
+          await expectValidOrgName('very.good.test_case');
         });
 
         test('containing a hyphen', () async {
-          await expectValidOrgName('very.bad.test-case', [
-            {'value': 'very', 'separator': '.'},
-            {'value': 'bad', 'separator': '.'},
-            {'value': 'test case', 'separator': ''},
-          ]);
+          await expectValidOrgName('very.bad.test-case');
         });
 
         test('single character parts', () async {
-          await expectValidOrgName('v.g.v', [
-            {'value': 'v', 'separator': '.'},
-            {'value': 'g', 'separator': '.'},
-            {'value': 'v', 'separator': ''},
-          ]);
+          await expectValidOrgName('v.g.v');
         });
 
         test('more than three parts', () async {
-          await expectValidOrgName('very.good.ventures.app.identifier', [
-            {'value': 'very', 'separator': '.'},
-            {'value': 'good', 'separator': '.'},
-            {'value': 'ventures', 'separator': '.'},
-            {'value': 'app', 'separator': '.'},
-            {'value': 'identifier', 'separator': ''},
-          ]);
+          await expectValidOrgName('very.good.ventures.app.identifier');
         });
 
         test('less than three parts', () async {
-          await expectValidOrgName('verygood.ventures', [
-            {'value': 'verygood', 'separator': '.'},
-            {'value': 'ventures', 'separator': ''},
-          ]);
+          await expectValidOrgName('verygood.ventures');
         });
       });
     });
@@ -468,11 +432,7 @@ void main() {
               ),
               vars: <String, dynamic>{
                 'project_name': 'my_app',
-                'org_name': [
-                  {'value': 'com', 'separator': '.'},
-                  {'value': 'example', 'separator': '.'},
-                  {'value': 'verygoodcore', 'separator': ''}
-                ],
+                'org_name': 'com.example.verygoodcore',
                 'description': '',
               },
             ),