Skip to content

Commit

Permalink
fix: parsing configuration should ignore flavor
Browse files Browse the repository at this point in the history
  • Loading branch information
knopp committed Sep 11, 2023
1 parent 52b2251 commit be425f7
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 7 deletions.
24 changes: 17 additions & 7 deletions build_tool/lib/src/builder.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import 'package:collection/collection.dart';
import 'package:logging/logging.dart';
import 'package:path/path.dart' as path;

import 'android_environment.dart';
Expand All @@ -9,6 +10,8 @@ import 'rustup.dart';
import 'target.dart';
import 'util.dart';

final _log = Logger('builder');

enum BuildConfiguration {
debug,
release,
Expand Down Expand Up @@ -61,17 +64,24 @@ class BuildEnvironment {
this.javaHome,
});

static BuildEnvironment fromEnvironment({
required bool isAndroid,
}) {
static BuildConfiguration parseBuildConfiguration(String value) {
// XCode configuration adds the flavor to configuration name.
final firstSegment = value.split('-').first;
final buildConfiguration = BuildConfiguration.values.firstWhereOrNull(
(e) => e.name == Environment.configuration,
(e) => e.name == firstSegment,
);
if (buildConfiguration == null) {
throw BuildException(
'Unknown build configuration: ${Environment.configuration}',
);
_log.warning('Unknown build configuraiton $value, will assume release');
return BuildConfiguration.release;
}
return buildConfiguration;
}

static BuildEnvironment fromEnvironment({
required bool isAndroid,
}) {
final buildConfiguration =
parseBuildConfiguration(Environment.configuration);
final manifestDir = Environment.manifestDir;
final crateOptions = CargokitCrateOptions.load(
manifestDir: manifestDir,
Expand Down
28 changes: 28 additions & 0 deletions build_tool/test/builder_test.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import 'package:build_tool/src/builder.dart';
import 'package:test/test.dart';

void main() {
test('parseBuildConfiguration', () {
var b = BuildEnvironment.parseBuildConfiguration('debug');
expect(b, BuildConfiguration.debug);

b = BuildEnvironment.parseBuildConfiguration('profile');
expect(b, BuildConfiguration.profile);

b = BuildEnvironment.parseBuildConfiguration('release');
expect(b, BuildConfiguration.release);

b = BuildEnvironment.parseBuildConfiguration('debug-dev');
expect(b, BuildConfiguration.debug);

b = BuildEnvironment.parseBuildConfiguration('profile');
expect(b, BuildConfiguration.profile);

b = BuildEnvironment.parseBuildConfiguration('profile-prod');
expect(b, BuildConfiguration.profile);

// fallback to release
b = BuildEnvironment.parseBuildConfiguration('unknown');
expect(b, BuildConfiguration.release);
});
}

0 comments on commit be425f7

Please sign in to comment.