Unverified Commit 6ee8b654 authored by Greg Spencer's avatar Greg Spencer Committed by GitHub

Revert "Always use new plugin schema for plugin template (#48258)" (#49827)

This reverts commit 9d4a35ba because it appears to break

the gradle_non_android_plugin_test.
parent 0be9127d
...@@ -642,6 +642,10 @@ To edit platform code in an IDE see https://flutter.dev/developing-packages/#edi ...@@ -642,6 +642,10 @@ To edit platform code in an IDE see https://flutter.dev/developing-packages/#edi
'web': web, 'web': web,
'macos': macos, 'macos': macos,
'year': DateTime.now().year, 'year': DateTime.now().year,
// For now, the new plugin schema is only used when a desktop plugin is
// enabled. Once the new schema is supported on stable, this should be
// removed, and the new schema should always be used.
'useNewPluginSchema': macos,
// If a desktop platform is included, add a workaround for #31366. // If a desktop platform is included, add a workaround for #31366.
// When Linux and Windows are added, we will need this workaround again. // When Linux and Windows are added, we will need this workaround again.
'includeTargetPlatformWorkaround': false, 'includeTargetPlatformWorkaround': false,
......
...@@ -21,9 +21,23 @@ dev_dependencies: ...@@ -21,9 +21,23 @@ dev_dependencies:
# The following section is specific to Flutter. # The following section is specific to Flutter.
flutter: flutter:
# This section identifies this Flutter project as a plugin project. # This section identifies this Flutter project as a plugin project.
{{^useNewPluginSchema}}
# The androidPackage and pluginClass identifiers should not ordinarily
# be modified. They are used by the tooling to maintain consistency when
# adding or updating assets for this project.
plugin:
androidPackage: {{androidIdentifier}}
pluginClass: {{pluginClass}}
{{/useNewPluginSchema}}
{{#useNewPluginSchema}}
# The 'pluginClass' and Android 'package' identifiers should not ordinarily # The 'pluginClass' and Android 'package' identifiers should not ordinarily
# be modified. They are used by the tooling to maintain consistency when # be modified. They are used by the tooling to maintain consistency when
# adding or updating assets for this project. # adding or updating assets for this project.
#
# NOTE: This new plugin description format is not supported on Flutter's
# stable channel as of 1.9.1. A plugin published using this format will not
# work for most clients until the next major stable release.
# However, it is required in order to declare macOS support.
plugin: plugin:
platforms: platforms:
android: android:
...@@ -31,10 +45,9 @@ flutter: ...@@ -31,10 +45,9 @@ flutter:
pluginClass: {{pluginClass}} pluginClass: {{pluginClass}}
ios: ios:
pluginClass: {{pluginClass}} pluginClass: {{pluginClass}}
{{#macos}}
macos: macos:
pluginClass: {{pluginClass}} pluginClass: {{pluginClass}}
{{/macos}} {{/useNewPluginSchema}}
# To add assets to your plugin package, add an assets section, like this: # To add assets to your plugin package, add an assets section, like this:
# assets: # assets:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment