Remove v1 Android create templates (#61203)
diff --git a/packages/flutter_tools/lib/src/commands/create.dart b/packages/flutter_tools/lib/src/commands/create.dart index 3775be5..f3b25fa 100644 --- a/packages/flutter_tools/lib/src/commands/create.dart +++ b/packages/flutter_tools/lib/src/commands/create.dart
@@ -748,7 +748,6 @@ 'macosIdentifier': appleIdentifier, 'description': projectDescription, 'dartSdk': '$flutterRoot/bin/cache/dart-sdk', - 'useAndroidEmbeddingV2': featureFlags.isAndroidEmbeddingV2Enabled, 'androidMinApiLevel': android_common.minApiLevel, 'androidSdkVersion': android_sdk.minimumAndroidSdkVersion, 'withDriverTest': renderDriverTest,
diff --git a/packages/flutter_tools/lib/src/features.dart b/packages/flutter_tools/lib/src/features.dart index b94c765..3caf9a9 100644 --- a/packages/flutter_tools/lib/src/features.dart +++ b/packages/flutter_tools/lib/src/features.dart
@@ -34,9 +34,6 @@ /// Whether flutter desktop for Windows is enabled. bool get isWindowsEnabled => isEnabled(flutterWindowsDesktopFeature); - /// Whether the Android embedding V2 is enabled. - bool get isAndroidEmbeddingV2Enabled => isEnabled(flutterAndroidEmbeddingV2Feature); - /// Whether a particular feature is enabled for the current channel. /// /// Prefer using one of the specific getters above instead of this API. @@ -68,7 +65,6 @@ flutterLinuxDesktopFeature, flutterMacOSDesktopFeature, flutterWindowsDesktopFeature, - flutterAndroidEmbeddingV2Feature, ]; /// The [Feature] for flutter web. @@ -131,29 +127,6 @@ ), ); -/// The [Feature] for generating projects using the new Android embedding. -const Feature flutterAndroidEmbeddingV2Feature = Feature( - name: 'flutter create generates projects using the Android embedding V2', - environmentOverride: 'ENABLE_ANDROID_EMBEDDING_V2', - configSetting: 'enable-android-embedding-v2', - beta: FeatureChannelSetting( - available: true, - enabledByDefault: true, - ), - dev: FeatureChannelSetting( - available: true, - enabledByDefault: true, - ), - master: FeatureChannelSetting( - available: true, - enabledByDefault: true, - ), - stable: FeatureChannelSetting( - available: true, - enabledByDefault: true, - ), -); - /// A [Feature] is a process for conditionally enabling tool features. /// /// All settings are optional, and if not provided will generally default to
diff --git a/packages/flutter_tools/lib/src/plugins.dart b/packages/flutter_tools/lib/src/plugins.dart index bc9bcee..ee4edbd 100644 --- a/packages/flutter_tools/lib/src/plugins.dart +++ b/packages/flutter_tools/lib/src/plugins.dart
@@ -644,6 +644,12 @@ break; case AndroidEmbeddingVersion.v1: default: + globals.printStatus( + 'Your Flutter application is created using an older version of the ' + "Android embedding. It's being deprecated in favor of Android embedding " + 'v2. Follow the steps on https://flutter.dev/go/android-project-migration ' + 'to migrate your project.' + ); for (final Map<String, dynamic> plugin in androidPlugins) { if (!(plugin['supportsEmbeddingV1'] as bool) && plugin['supportsEmbeddingV2'] as bool) { throwToolExit(
diff --git a/packages/flutter_tools/lib/src/project.dart b/packages/flutter_tools/lib/src/project.dart index 690877d..b870aca 100644 --- a/packages/flutter_tools/lib/src/project.dart +++ b/packages/flutter_tools/lib/src/project.dart
@@ -805,7 +805,7 @@ await _overwriteFromTemplate(globals.fs.path.join( 'module', 'android', - featureFlags.isAndroidEmbeddingV2Enabled ? 'library_new_embedding' : 'library', + 'library_new_embedding', ), ephemeralDirectory); await _overwriteFromTemplate(globals.fs.path.join('module', 'android', 'gradle'), ephemeralDirectory); gradle.gradleUtils.injectGradleWrapperIfNeeded(ephemeralDirectory); @@ -820,7 +820,6 @@ 'projectName': parent.manifest.appName, 'androidIdentifier': parent.manifest.androidPackage, 'androidX': usesAndroidX, - 'useAndroidEmbeddingV2': featureFlags.isAndroidEmbeddingV2Enabled, }, printStatusWhenWriting: false, overwriteExisting: true,