Skip to content

[ci] Add a legacy Android build-all test #4005

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

Merged
merged 21 commits into from
May 22, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Specify Kotlin version as well
  • Loading branch information
stuartmorgan-g committed May 16, 2023
commit ece81a4c8d89f9c16eaa256bff45aa415b9e682c
2 changes: 1 addition & 1 deletion .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ task:
CHANNEL: "stable"
<< : *BUILD_ALL_PACKAGES_APP_TEMPLATE
create_all_packages_app_legacy_script:
- $PLUGIN_TOOL_COMMAND create-all-packages-app --agp-version=4.1.0 --gradle-version=6.5 --output-dir=legacy/ --android-language=java --exclude script/configs/exclude_all_packages_app.yaml
- $PLUGIN_TOOL_COMMAND create-all-packages-app --agp-version=4.1.0 --gradle-version=6.5 --kotlin-version=1.4.32 --output-dir=legacy/ --android-language=java --exclude script/configs/exclude_all_packages_app.yaml
build_all_packages_legacy_script:
- cd legacy/all_packages
- flutter build $BUILD_ALL_ARGS --debug
Expand Down
17 changes: 15 additions & 2 deletions script/tool/lib/src/create_all_packages_app_command.dart
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,15 @@ class CreateAllPackagesAppCommand extends PackageCommand {
help: 'The Gradle version to use in the created app, instead of the '
'default `flutter create`d version. Will generally need to be used '
' with $_agpVersionFlag due to compatibility limits.');
argParser.addOption(_kotlinVersionFlag,
help: 'The Kotlin version to use in the created app, instead of the '
'default `flutter create`d version.');
}

static const String _androidLanguageFlag = 'android-language';
static const String _agpVersionFlag = 'agp-version';
static const String _gradleVersionFlag = 'gradle-version';
static const String _kotlinVersionFlag = 'kotlin-version';
static const String _outputDirectoryFlag = 'output-dir';

/// The location to create the synthesized app project.
Expand Down Expand Up @@ -105,7 +109,9 @@ class CreateAllPackagesAppCommand extends PackageCommand {
}

await Future.wait(<Future<void>>[
_updateTopLevelGradle(agpVersion: getNullableStringArg(_agpVersionFlag)),
_updateTopLevelGradle(
agpVersion: getNullableStringArg(_agpVersionFlag),
kotlinVersion: getNullableStringArg(_kotlinVersionFlag)),
_updateGradleWrapper(
gradleVersion: getNullableStringArg(_gradleVersionFlag)),
_updateAppGradle(),
Expand Down Expand Up @@ -178,7 +184,10 @@ class CreateAllPackagesAppCommand extends PackageCommand {
file.writeAsStringSync(output.toString());
}

Future<void> _updateTopLevelGradle({String? agpVersion}) async {
Future<void> _updateTopLevelGradle({
String? agpVersion,
String? kotlinVersion,
}) async {
final File gradleFile = app
.platformDirectory(FlutterPlatform.android)
.childFile('build.gradle');
Expand All @@ -189,6 +198,10 @@ class CreateAllPackagesAppCommand extends PackageCommand {
'com.android.tools.build:': <String>[
" classpath 'com.android.tools.build:gradle:$agpVersion'"
],
if (kotlinVersion != null)
'ext.kotlin_version =': <String>[
" ext.kotlin_version = '$kotlinVersion'"
],
},
);
}
Expand Down
12 changes: 8 additions & 4 deletions script/tool/test/create_all_packages_app_command_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -332,16 +332,18 @@ project 'Runner', {
]));
});

test('Android AGP and Gradle versions are modified if requested', () async {
test('Android dependency versions are modified if requested', () async {
writeFakeFlutterCreateOutput(testRoot);
createFakePlugin('plugina', packagesDir);

const String agpVersion = '9.8.7';
const String gradleVersion = '99.87';
const String kotlinVersion = '7.8.9';
await runCapturingPrint(runner, <String>[
'create-all-packages-app',
'--agp-version=$agpVersion',
'--gradle-version=$gradleVersion'
'--gradle-version=$gradleVersion',
'--kotlin-version=$kotlinVersion',
]);

final List<String> buildGradle = command.app
Expand All @@ -357,8 +359,10 @@ project 'Runner', {

expect(
buildGradle,
contains(contains(
"classpath 'com.android.tools.build:gradle:$agpVersion'")));
containsAll(<Matcher>[
contains("ext.kotlin_version = '$kotlinVersion'"),
contains("classpath 'com.android.tools.build:gradle:$agpVersion'"),
]));
expect(
gradleWrapper,
contains(contains(
Expand Down