Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Optionally specify min_sdk in pubspec.yaml or flutter_launcher_icons.yaml #372

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 19 additions & 6 deletions lib/android.dart
Expand Up @@ -299,17 +299,30 @@ List<String> transformAndroidManifestWithNewLauncherIcon(
}

/// Retrieves the minSdk value from the Android build.gradle file or local.properties file
int minSdk() {
int minSdk(Map<String, dynamic> config) {
final androidGradleFile = File(constants.androidGradleFile);
final androidLocalPropertiesFile = File(constants.androidLocalPropertiesFile);

// look in build.gradle first
final minSdkValue = getMinSdkFromFile(androidGradleFile);
var minSdkValue = getMinSdkFromFile(androidGradleFile);

// look in local.properties. Didn't find minSdk, assume the worst
return minSdkValue != 0
? minSdkValue
: getMinSdkFromFile(androidLocalPropertiesFile);
if (minSdkValue != 0) {
return minSdkValue;
}

// then look in local.properties.
minSdkValue = getMinSdkFromFile(androidLocalPropertiesFile);

if (minSdkValue != 0) {
return minSdkValue;
}

// finally look in the pubspec.yaml or flutter_launcher_icons.yaml
minSdkValue = (config.containsKey('min_sdk') && config['min_sdk'] is int)
? config['min_sdk']
: 0;

return minSdkValue;
}

/// Retrieves the minSdk value from [File]
Expand Down
10 changes: 7 additions & 3 deletions lib/constants.dart
Expand Up @@ -25,9 +25,13 @@ const String errorMissingPlatform =
const String errorMissingRegularAndroid =
'Adaptive icon config found but no regular Android config. '
'Below API 26 the regular Android config is required';
const String errorMissingMinSdk =
'Cannot not find minSdk from android/app/build.gradle or android/local.properties'
'Specify minSdk in either android/app/build.gradle or android/local.properties';
const String errorMissingMinSdk = '''
Cannot find minSdk in android/app/build.gradle or android/local.properties.
Cannot find min_sdk in pubspec.yaml or flutter_launcher_icons.yaml
Specify minSdk in android/app/build.gradle or android/local.properties
-- or --
Specify min_sdk in pubspec.yaml or flutter_launcher_icons.yaml
''';
const String errorIncorrectIconName =
'The icon name must contain only lowercase a-z, 0-9, or underscore: '
'E.g. "ic_my_new_icon"';
Expand Down
2 changes: 1 addition & 1 deletion lib/main.dart
Expand Up @@ -91,7 +91,7 @@ Future<void> createIconsFromConfig(Map<String, dynamic> config,
}

if (isNeedingNewAndroidIcon(config) || hasAndroidAdaptiveConfig(config)) {
final int minSdk = android_launcher_icons.minSdk();
final int minSdk = android_launcher_icons.minSdk(config);
if (minSdk == 0) {
throw const InvalidConfigException(errorMissingMinSdk);
}
Expand Down