fix: flutter build without flavor

impaktfull · Sep 24, 2024 · 1258482 · 1258482
1 parent aa6eb98
commit 1258482
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 0.15.1
+
+## Fix
+
+- Issue where flavor was still used even if it was null (flutter build)
+
 # 0.15.0
 
 ## Added

diff --git a/lib/src/integrations/flutter/build/model/flutter_build_android_extension.dart b/lib/src/integrations/flutter/build/model/flutter_build_android_extension.dart
@@ -17,13 +17,30 @@ enum FlutterBuildAndroidExtension {
 
 extension FlutterBuildAndroidExtensions on FlutterBuildAndroidExtension {
   Directory getBuildDirectory({String? flavor}) {
+    final List<String> parts;
     switch (this) {
       case FlutterBuildAndroidExtension.apk:
-        return Directory(
-            join('build', 'app', 'outputs', 'apk', flavor, 'release'));
+        parts = [
+          'build',
+          'app',
+          'outputs',
+          'apk',
+          if (flavor != null) flavor,
+          'release',
+        ];
       case FlutterBuildAndroidExtension.aab:
-        return Directory(
-            join('build', 'app', 'outputs', 'bundle', '${flavor}Release'));
+        parts = [
+          'build',
+          'app',
+          'outputs',
+          'bundle',
+          if (flavor == null) ...[
+            'release',
+          ] else ...[
+            '${flavor}Release',
+          ]
+        ];
     }
+    return Directory(joinAll(parts));
   }
 }
diff --git a/lib/src/integrations/flutter/build/plugin/flutter_build_plugin.dart b/lib/src/integrations/flutter/build/plugin/flutter_build_plugin.dart
@@ -115,8 +115,16 @@ class FlutterBuildPlugin extends ImpaktfullCliPlugin {
         '--build-number=$buildNr',
       ],
     ]);
-    final file = File(join(extension.getBuildDirectory(flavor: flavor).path,
-        'app-$flavor-release.${extension.fileExtension}'));
+    final file = File(joinAll(
+      [
+        extension.getBuildDirectory(flavor: flavor).path,
+        if (flavor == null) ...[
+          'app-release.${extension.fileExtension}',
+        ] else ...[
+          'app-$flavor-release.${extension.fileExtension}',
+        ],
+      ],
+    ));
     if (!file.existsSync()) {
       throw ImpaktfullCliError(
           'After building $flavor for Android, `${file.path}` does not exists.');