flutter/shorebird
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

feat(shorebird_cli): shorebird patch includes Flutter version when building (#1925)

Browse Source
This commit is contained in:
Felix Angelov
2024-04-17 15:47:53 -05:00
committed by GitHub
parent c99ed4e3e3
commit 10f4461018
8 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/shorebird_cli/lib/src/commands/patch/patch_aar_command.dart
+5 -1
View File
@@ -177,7 +177,11 @@ Please re-run the release command for this version or create a new release.''');
return await runScoped(
() async {
final buildNumber = results['build-number'] as String;
final buildProgress = logger.progress('Building patch');
final flutterVersionString =
await shorebirdFlutter.getVersionAndRevision();
final buildProgress = logger.progress(
'Building patch with Flutter $flutterVersionString',
);
try {
await buildAar(buildNumber: buildNumber);
buildProgress.complete();
packages/shorebird_cli/lib/src/commands/patch/patch_android_command.dart
+5 -1
View File
@@ -139,7 +139,11 @@ If this option is not provided, the version number will be determined from the p
releaseVersion = argReleaseVersion;
} else {
logger.detail('No release version provided. Determining from bundle.');
final buildProgress = logger.progress('Building patch');
final flutterVersionString =
await shorebirdFlutter.getVersionAndRevision();
final buildProgress = logger.progress(
'Building patch with Flutter $flutterVersionString',
);
try {
await buildAppBundle(flavor: flavor, target: target);
buildProgress.complete();
packages/shorebird_cli/lib/src/commands/patch/patch_ios_command.dart
+4 -1
View File
@@ -479,7 +479,10 @@ ${summary.join('\n')}
required String? target,
}) async {
final shouldCodesign = results['codesign'] == true;
final buildProgress = logger.progress('Building patch');
final flutterVersionString = await shorebirdFlutter.getVersionAndRevision();
final buildProgress = logger.progress(
'Building patch with Flutter $flutterVersionString',
);
try {
// If buildIpa is called with a different codesign value than the release
// was, we will erroneously report native diffs.
packages/shorebird_cli/lib/src/commands/patch/patch_ios_framework_command.dart
+5 -1
View File
@@ -148,7 +148,11 @@ Please re-run the release command for this version or create a new release.''');
return await runScoped(
() async {
final buildProgress = logger.progress('Building patch');
final flutterVersionString =
await shorebirdFlutter.getVersionAndRevision();
final buildProgress = logger.progress(
'Building patch with Flutter $flutterVersionString',
);
try {
await buildIosFramework();
buildProgress.complete();
packages/shorebird_cli/test/src/commands/patch/patch_aar_command_test.dart
+4
View File
@@ -36,6 +36,7 @@ import '../../mocks.dart';
void main() {
group(PatchAarCommand, () {
const flutterRevision = '83305b5088e6fe327fb3334a73ff190828d85713';
const flutterVersionAndRevision = '3.10.6 (83305b5088)';
const appId = 'test-app-id';
const shorebirdYaml = ShorebirdYaml(appId: appId);
const buildNumber = '1.0';
@@ -321,6 +322,9 @@ void main() {
when(
() => cache.getArtifactDirectory(any()),
).thenReturn(Directory.systemTemp.createTempSync());
when(
() => shorebirdFlutter.getVersionAndRevision(),
).thenAnswer((_) async => flutterVersionAndRevision);
when(
() => shorebirdFlutter.installRevision(
revision: any(named: 'revision'),
packages/shorebird_cli/test/src/commands/patch/patch_android_command_test.dart
+4
View File
@@ -39,6 +39,7 @@ import '../../mocks.dart';
void main() {
group(PatchAndroidCommand, () {
const flutterRevision = '83305b5088e6fe327fb3334a73ff190828d85713';
const flutterVersionAndRevision = '3.10.6 (83305b5088)';
const appId = 'test-app-id';
const shorebirdYaml = ShorebirdYaml(appId: appId);
const versionName = '1.2.3';
@@ -236,6 +237,9 @@ flutter:
});
when(() => shorebirdEnv.flutterDirectory).thenReturn(flutterDirectory);
when(() => shorebirdEnv.flutterRevision).thenReturn(flutterRevision);
when(
() => shorebirdFlutter.getVersionAndRevision(),
).thenAnswer((_) async => flutterVersionAndRevision);
when(
() => shorebirdFlutter.installRevision(
revision: any(named: 'revision'),
packages/shorebird_cli/test/src/commands/patch/patch_ios_command_test.dart
+4
View File
@@ -41,6 +41,7 @@ import '../../mocks.dart';
void main() {
const preLinkerFlutterRevision = '83305b5088e6fe327fb3334a73ff190828d85713';
const postLinkerFlutterRevision = 'deadbeefdeadbeefdeadbeefdeadbeefdeadbeef';
const flutterVersionAndRevision = '3.10.6 (83305b5088)';
const appId = 'test-app-id';
const shorebirdYaml = ShorebirdYaml(appId: appId);
const versionName = '1.2.3';
@@ -462,6 +463,9 @@ flutter:
when(() => shorebirdEnv.flutterRevision)
.thenReturn(preLinkerFlutterRevision);
when(() => shorebirdEnv.canAcceptUserInput).thenReturn(true);
when(
() => shorebirdFlutter.getVersionAndRevision(),
).thenAnswer((_) async => flutterVersionAndRevision);
when(
() => shorebirdFlutter.installRevision(
revision: any(named: 'revision'),
packages/shorebird_cli/test/src/commands/patch/patch_ios_framework_command_test.dart
+4
View File
@@ -53,6 +53,7 @@ void main() {
'deadbeefdeadbeefdeadbeefdeadbeefdeadbeef';
const preLinkerFlutterRevision =
'83305b5088e6fe327fb3334a73ff190828d85713';
const flutterVersionAndRevision = '3.10.6 (83305b5088)';
const pubspecYamlContent = '''
name: example
version: $version
@@ -340,6 +341,9 @@ flutter:
artifact: ShorebirdArtifact.analyzeSnapshot,
),
).thenReturn(analyzeSnapshotFile.path);
when(
() => shorebirdFlutter.getVersionAndRevision(),
).thenAnswer((_) async => flutterVersionAndRevision);
when(
() => shorebirdFlutter.installRevision(
revision: any(named: 'revision'),