Skip to content

Commit d13508f

Browse files
Bump version and add new ios version error handling
1 parent 09533b7 commit d13508f

File tree

3 files changed

+23
-5
lines changed

3 files changed

+23
-5
lines changed

packages/flutter_migrate/CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
## NEXT
1+
## 0.1.1+1
22

33
* Updates minimum supported SDK version to Flutter 3.27/Dart 3.6.
4+
* Add ios-language error handling for Flutter 3.35
45

56
## 0.0.1+4
67

packages/flutter_migrate/lib/src/utils.dart

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ class MigrateUtils {
9292
required String name,
9393
bool legacyNameParameter = false,
9494
required String androidLanguage,
95-
required String iosLanguage,
95+
required String? iosLanguage,
9696
required String outputDirectory,
9797
String? createVersion,
9898
List<String> platforms = const <String>[],
@@ -110,7 +110,11 @@ class MigrateUtils {
110110
cmdArgs.add('--project-name=$name');
111111
}
112112
cmdArgs.add('--android-language=$androidLanguage');
113-
cmdArgs.add('--ios-language=$iosLanguage');
113+
114+
if (iosLanguage != null) {
115+
cmdArgs.add('--ios-language=$iosLanguage');
116+
}
117+
114118
if (platforms.isNotEmpty) {
115119
String platformsArg = '--platforms=';
116120
for (int i = 0; i < platforms.length; i++) {
@@ -131,7 +135,20 @@ class MigrateUtils {
131135
await _runCommand(cmdArgs, workingDirectory: outputDirectory);
132136
final String error = result.stderr as String;
133137

134-
// Catch errors due to parameters not existing.
138+
// Catch errors due to parameters not supported anymore for apps in flutter 3.35
139+
if (error.contains(
140+
'The "ios-language" option is only supported for "--template=plugin".')) {
141+
return createFromTemplates(
142+
flutterBinPath,
143+
name: name,
144+
legacyNameParameter: legacyNameParameter,
145+
androidLanguage: androidLanguage,
146+
iosLanguage: null,
147+
outputDirectory: outputDirectory,
148+
platforms: platforms,
149+
iterationsAllowed: iterationsAllowed--,
150+
);
151+
}
135152

136153
// Old versions of the tool does not include the platforms option.
137154
if (error.contains('Could not find an option named "platforms".')) {

packages/flutter_migrate/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: flutter_migrate
22
description: A tool to migrate legacy flutter projects to modern versions.
3-
version: 0.0.1+4
3+
version: 0.1.1+1
44
repository: https://github.com/flutter/packages/tree/main/packages/flutter_migrate
55
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3Ap%3A%20flutter_migrate
66
publish_to: none

0 commit comments

Comments
 (0)