diff --git a/.gitignore b/.gitignore index e8f27b1d288..f28aa3ff73e 100644 --- a/.gitignore +++ b/.gitignore @@ -50,6 +50,7 @@ unlinked_spec.ds **/android/gradlew **/android/gradlew.bat **/android/local.properties +**/android/**/GeneratedPluginRegistrant.java # iOS/XCode related **/ios/**/*.mode1v3 @@ -74,6 +75,7 @@ unlinked_spec.ds **/ios/Flutter/app.zip **/ios/Flutter/flutter_assets/ **/ios/ServiceDefinitions.json +**/ios/Runner/GeneratedPluginRegistrant.* # Exceptions to above rules. !**/ios/**/default.mode1v3 diff --git a/dev/integration_tests/channels/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java b/dev/integration_tests/channels/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java deleted file mode 100644 index d007606a44d..00000000000 --- a/dev/integration_tests/channels/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java +++ /dev/null @@ -1,23 +0,0 @@ -package io.flutter.plugins; - -import io.flutter.plugin.common.PluginRegistry; - -/** - * Generated file. Do not edit. - */ -public final class GeneratedPluginRegistrant { - public static void registerWith(PluginRegistry registry) { - if (alreadyRegisteredWith(registry)) { - return; - } - } - - private static boolean alreadyRegisteredWith(PluginRegistry registry) { - final String key = GeneratedPluginRegistrant.class.getCanonicalName(); - if (registry.hasPlugin(key)) { - return true; - } - registry.registrarFor(key); - return false; - } -} diff --git a/dev/integration_tests/channels/ios/Runner/GeneratedPluginRegistrant.h b/dev/integration_tests/channels/ios/Runner/GeneratedPluginRegistrant.h deleted file mode 100644 index 3b700eb4819..00000000000 --- a/dev/integration_tests/channels/ios/Runner/GeneratedPluginRegistrant.h +++ /dev/null @@ -1,14 +0,0 @@ -// -// Generated file. Do not edit. -// - -#ifndef GeneratedPluginRegistrant_h -#define GeneratedPluginRegistrant_h - -#import - -@interface GeneratedPluginRegistrant : NSObject -+ (void)registerWithRegistry:(NSObject*)registry; -@end - -#endif /* GeneratedPluginRegistrant_h */ diff --git a/dev/integration_tests/channels/ios/Runner/GeneratedPluginRegistrant.m b/dev/integration_tests/channels/ios/Runner/GeneratedPluginRegistrant.m deleted file mode 100644 index 60dfa42b328..00000000000 --- a/dev/integration_tests/channels/ios/Runner/GeneratedPluginRegistrant.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// Generated file. Do not edit. -// - -#import "GeneratedPluginRegistrant.h" - -@implementation GeneratedPluginRegistrant - -+ (void)registerWithRegistry:(NSObject*)registry { -} - -@end diff --git a/dev/integration_tests/ui/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java b/dev/integration_tests/ui/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java deleted file mode 100644 index d007606a44d..00000000000 --- a/dev/integration_tests/ui/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java +++ /dev/null @@ -1,23 +0,0 @@ -package io.flutter.plugins; - -import io.flutter.plugin.common.PluginRegistry; - -/** - * Generated file. Do not edit. - */ -public final class GeneratedPluginRegistrant { - public static void registerWith(PluginRegistry registry) { - if (alreadyRegisteredWith(registry)) { - return; - } - } - - private static boolean alreadyRegisteredWith(PluginRegistry registry) { - final String key = GeneratedPluginRegistrant.class.getCanonicalName(); - if (registry.hasPlugin(key)) { - return true; - } - registry.registrarFor(key); - return false; - } -} diff --git a/dev/integration_tests/ui/ios/Runner/GeneratedPluginRegistrant.h b/dev/integration_tests/ui/ios/Runner/GeneratedPluginRegistrant.h deleted file mode 100644 index 3b700eb4819..00000000000 --- a/dev/integration_tests/ui/ios/Runner/GeneratedPluginRegistrant.h +++ /dev/null @@ -1,14 +0,0 @@ -// -// Generated file. Do not edit. -// - -#ifndef GeneratedPluginRegistrant_h -#define GeneratedPluginRegistrant_h - -#import - -@interface GeneratedPluginRegistrant : NSObject -+ (void)registerWithRegistry:(NSObject*)registry; -@end - -#endif /* GeneratedPluginRegistrant_h */ diff --git a/dev/integration_tests/ui/ios/Runner/GeneratedPluginRegistrant.m b/dev/integration_tests/ui/ios/Runner/GeneratedPluginRegistrant.m deleted file mode 100644 index 60dfa42b328..00000000000 --- a/dev/integration_tests/ui/ios/Runner/GeneratedPluginRegistrant.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// Generated file. Do not edit. -// - -#import "GeneratedPluginRegistrant.h" - -@implementation GeneratedPluginRegistrant - -+ (void)registerWithRegistry:(NSObject*)registry { -} - -@end diff --git a/dev/manual_tests/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java b/dev/manual_tests/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java deleted file mode 100644 index d007606a44d..00000000000 --- a/dev/manual_tests/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java +++ /dev/null @@ -1,23 +0,0 @@ -package io.flutter.plugins; - -import io.flutter.plugin.common.PluginRegistry; - -/** - * Generated file. Do not edit. - */ -public final class GeneratedPluginRegistrant { - public static void registerWith(PluginRegistry registry) { - if (alreadyRegisteredWith(registry)) { - return; - } - } - - private static boolean alreadyRegisteredWith(PluginRegistry registry) { - final String key = GeneratedPluginRegistrant.class.getCanonicalName(); - if (registry.hasPlugin(key)) { - return true; - } - registry.registrarFor(key); - return false; - } -} diff --git a/dev/manual_tests/ios/Runner/GeneratedPluginRegistrant.h b/dev/manual_tests/ios/Runner/GeneratedPluginRegistrant.h deleted file mode 100644 index 3b700eb4819..00000000000 --- a/dev/manual_tests/ios/Runner/GeneratedPluginRegistrant.h +++ /dev/null @@ -1,14 +0,0 @@ -// -// Generated file. Do not edit. -// - -#ifndef GeneratedPluginRegistrant_h -#define GeneratedPluginRegistrant_h - -#import - -@interface GeneratedPluginRegistrant : NSObject -+ (void)registerWithRegistry:(NSObject*)registry; -@end - -#endif /* GeneratedPluginRegistrant_h */ diff --git a/dev/manual_tests/ios/Runner/GeneratedPluginRegistrant.m b/dev/manual_tests/ios/Runner/GeneratedPluginRegistrant.m deleted file mode 100644 index 60dfa42b328..00000000000 --- a/dev/manual_tests/ios/Runner/GeneratedPluginRegistrant.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// Generated file. Do not edit. -// - -#import "GeneratedPluginRegistrant.h" - -@implementation GeneratedPluginRegistrant - -+ (void)registerWithRegistry:(NSObject*)registry { -} - -@end diff --git a/examples/catalog/android/app/src/main/java/io/flutter/plugins/PluginRegistry.java b/examples/catalog/android/app/src/main/java/io/flutter/plugins/PluginRegistry.java deleted file mode 100644 index 92f7a749c4d..00000000000 --- a/examples/catalog/android/app/src/main/java/io/flutter/plugins/PluginRegistry.java +++ /dev/null @@ -1,14 +0,0 @@ -package io.flutter.plugins; - -import io.flutter.app.FlutterActivity; - - -/** - * Generated file. Do not edit. - */ - -public class PluginRegistry { - - public void registerAll(FlutterActivity activity) { - } -} diff --git a/examples/flutter_gallery/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java b/examples/flutter_gallery/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java deleted file mode 100644 index fdcb3de4857..00000000000 --- a/examples/flutter_gallery/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java +++ /dev/null @@ -1,31 +0,0 @@ -package io.flutter.plugins; - -import io.flutter.plugin.common.PluginRegistry; -import io.flutter.plugins.connectivity.ConnectivityPlugin; -import io.flutter.plugins.deviceinfo.DeviceInfoPlugin; -import io.flutter.plugins.urllauncher.UrlLauncherPlugin; -import io.flutter.plugins.videoplayer.VideoPlayerPlugin; - -/** - * Generated file. Do not edit. - */ -public final class GeneratedPluginRegistrant { - public static void registerWith(PluginRegistry registry) { - if (alreadyRegisteredWith(registry)) { - return; - } - ConnectivityPlugin.registerWith(registry.registrarFor("io.flutter.plugins.connectivity.ConnectivityPlugin")); - DeviceInfoPlugin.registerWith(registry.registrarFor("io.flutter.plugins.deviceinfo.DeviceInfoPlugin")); - UrlLauncherPlugin.registerWith(registry.registrarFor("io.flutter.plugins.urllauncher.UrlLauncherPlugin")); - VideoPlayerPlugin.registerWith(registry.registrarFor("io.flutter.plugins.videoplayer.VideoPlayerPlugin")); - } - - private static boolean alreadyRegisteredWith(PluginRegistry registry) { - final String key = GeneratedPluginRegistrant.class.getCanonicalName(); - if (registry.hasPlugin(key)) { - return true; - } - registry.registrarFor(key); - return false; - } -} diff --git a/examples/flutter_gallery/ios/Flutter/Debug.xcconfig b/examples/flutter_gallery/ios/Flutter/Debug.xcconfig index 592ceee85b8..9803018ca79 100644 --- a/examples/flutter_gallery/ios/Flutter/Debug.xcconfig +++ b/examples/flutter_gallery/ios/Flutter/Debug.xcconfig @@ -1 +1,2 @@ #include "Generated.xcconfig" +#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" diff --git a/examples/flutter_gallery/ios/Flutter/Release.xcconfig b/examples/flutter_gallery/ios/Flutter/Release.xcconfig index 592ceee85b8..a4a8c604e13 100644 --- a/examples/flutter_gallery/ios/Flutter/Release.xcconfig +++ b/examples/flutter_gallery/ios/Flutter/Release.xcconfig @@ -1 +1,2 @@ #include "Generated.xcconfig" +#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" diff --git a/examples/flutter_gallery/ios/Runner/GeneratedPluginRegistrant.h b/examples/flutter_gallery/ios/Runner/GeneratedPluginRegistrant.h deleted file mode 100644 index 3b700eb4819..00000000000 --- a/examples/flutter_gallery/ios/Runner/GeneratedPluginRegistrant.h +++ /dev/null @@ -1,14 +0,0 @@ -// -// Generated file. Do not edit. -// - -#ifndef GeneratedPluginRegistrant_h -#define GeneratedPluginRegistrant_h - -#import - -@interface GeneratedPluginRegistrant : NSObject -+ (void)registerWithRegistry:(NSObject*)registry; -@end - -#endif /* GeneratedPluginRegistrant_h */ diff --git a/examples/flutter_gallery/ios/Runner/GeneratedPluginRegistrant.m b/examples/flutter_gallery/ios/Runner/GeneratedPluginRegistrant.m deleted file mode 100644 index 3d3d0fb80cb..00000000000 --- a/examples/flutter_gallery/ios/Runner/GeneratedPluginRegistrant.m +++ /dev/null @@ -1,20 +0,0 @@ -// -// Generated file. Do not edit. -// - -#import "GeneratedPluginRegistrant.h" -#import -#import -#import -#import - -@implementation GeneratedPluginRegistrant - -+ (void)registerWithRegistry:(NSObject*)registry { - [FLTConnectivityPlugin registerWithRegistrar:[registry registrarForPlugin:@"FLTConnectivityPlugin"]]; - [FLTDeviceInfoPlugin registerWithRegistrar:[registry registrarForPlugin:@"FLTDeviceInfoPlugin"]]; - [FLTUrlLauncherPlugin registerWithRegistrar:[registry registrarForPlugin:@"FLTUrlLauncherPlugin"]]; - [FLTVideoPlayerPlugin registerWithRegistrar:[registry registrarForPlugin:@"FLTVideoPlayerPlugin"]]; -} - -@end diff --git a/examples/hello_world/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java b/examples/hello_world/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java deleted file mode 100644 index d007606a44d..00000000000 --- a/examples/hello_world/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java +++ /dev/null @@ -1,23 +0,0 @@ -package io.flutter.plugins; - -import io.flutter.plugin.common.PluginRegistry; - -/** - * Generated file. Do not edit. - */ -public final class GeneratedPluginRegistrant { - public static void registerWith(PluginRegistry registry) { - if (alreadyRegisteredWith(registry)) { - return; - } - } - - private static boolean alreadyRegisteredWith(PluginRegistry registry) { - final String key = GeneratedPluginRegistrant.class.getCanonicalName(); - if (registry.hasPlugin(key)) { - return true; - } - registry.registrarFor(key); - return false; - } -} diff --git a/examples/layers/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java b/examples/layers/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java deleted file mode 100644 index d007606a44d..00000000000 --- a/examples/layers/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java +++ /dev/null @@ -1,23 +0,0 @@ -package io.flutter.plugins; - -import io.flutter.plugin.common.PluginRegistry; - -/** - * Generated file. Do not edit. - */ -public final class GeneratedPluginRegistrant { - public static void registerWith(PluginRegistry registry) { - if (alreadyRegisteredWith(registry)) { - return; - } - } - - private static boolean alreadyRegisteredWith(PluginRegistry registry) { - final String key = GeneratedPluginRegistrant.class.getCanonicalName(); - if (registry.hasPlugin(key)) { - return true; - } - registry.registrarFor(key); - return false; - } -} diff --git a/examples/layers/ios/Runner/GeneratedPluginRegistrant.h b/examples/layers/ios/Runner/GeneratedPluginRegistrant.h deleted file mode 100644 index 3b700eb4819..00000000000 --- a/examples/layers/ios/Runner/GeneratedPluginRegistrant.h +++ /dev/null @@ -1,14 +0,0 @@ -// -// Generated file. Do not edit. -// - -#ifndef GeneratedPluginRegistrant_h -#define GeneratedPluginRegistrant_h - -#import - -@interface GeneratedPluginRegistrant : NSObject -+ (void)registerWithRegistry:(NSObject*)registry; -@end - -#endif /* GeneratedPluginRegistrant_h */ diff --git a/examples/layers/ios/Runner/GeneratedPluginRegistrant.m b/examples/layers/ios/Runner/GeneratedPluginRegistrant.m deleted file mode 100644 index 60dfa42b328..00000000000 --- a/examples/layers/ios/Runner/GeneratedPluginRegistrant.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// Generated file. Do not edit. -// - -#import "GeneratedPluginRegistrant.h" - -@implementation GeneratedPluginRegistrant - -+ (void)registerWithRegistry:(NSObject*)registry { -} - -@end diff --git a/examples/platform_channel/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java b/examples/platform_channel/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java deleted file mode 100644 index d007606a44d..00000000000 --- a/examples/platform_channel/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java +++ /dev/null @@ -1,23 +0,0 @@ -package io.flutter.plugins; - -import io.flutter.plugin.common.PluginRegistry; - -/** - * Generated file. Do not edit. - */ -public final class GeneratedPluginRegistrant { - public static void registerWith(PluginRegistry registry) { - if (alreadyRegisteredWith(registry)) { - return; - } - } - - private static boolean alreadyRegisteredWith(PluginRegistry registry) { - final String key = GeneratedPluginRegistrant.class.getCanonicalName(); - if (registry.hasPlugin(key)) { - return true; - } - registry.registrarFor(key); - return false; - } -} diff --git a/examples/platform_channel/ios/Runner/GeneratedPluginRegistrant.h b/examples/platform_channel/ios/Runner/GeneratedPluginRegistrant.h deleted file mode 100644 index 3b700eb4819..00000000000 --- a/examples/platform_channel/ios/Runner/GeneratedPluginRegistrant.h +++ /dev/null @@ -1,14 +0,0 @@ -// -// Generated file. Do not edit. -// - -#ifndef GeneratedPluginRegistrant_h -#define GeneratedPluginRegistrant_h - -#import - -@interface GeneratedPluginRegistrant : NSObject -+ (void)registerWithRegistry:(NSObject*)registry; -@end - -#endif /* GeneratedPluginRegistrant_h */ diff --git a/examples/platform_channel/ios/Runner/GeneratedPluginRegistrant.m b/examples/platform_channel/ios/Runner/GeneratedPluginRegistrant.m deleted file mode 100644 index 60dfa42b328..00000000000 --- a/examples/platform_channel/ios/Runner/GeneratedPluginRegistrant.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// Generated file. Do not edit. -// - -#import "GeneratedPluginRegistrant.h" - -@implementation GeneratedPluginRegistrant - -+ (void)registerWithRegistry:(NSObject*)registry { -} - -@end diff --git a/examples/platform_channel_swift/ios/Runner/GeneratedPluginRegistrant.h b/examples/platform_channel_swift/ios/Runner/GeneratedPluginRegistrant.h deleted file mode 100644 index 3b700eb4819..00000000000 --- a/examples/platform_channel_swift/ios/Runner/GeneratedPluginRegistrant.h +++ /dev/null @@ -1,14 +0,0 @@ -// -// Generated file. Do not edit. -// - -#ifndef GeneratedPluginRegistrant_h -#define GeneratedPluginRegistrant_h - -#import - -@interface GeneratedPluginRegistrant : NSObject -+ (void)registerWithRegistry:(NSObject*)registry; -@end - -#endif /* GeneratedPluginRegistrant_h */ diff --git a/examples/platform_channel_swift/ios/Runner/GeneratedPluginRegistrant.m b/examples/platform_channel_swift/ios/Runner/GeneratedPluginRegistrant.m deleted file mode 100644 index 60dfa42b328..00000000000 --- a/examples/platform_channel_swift/ios/Runner/GeneratedPluginRegistrant.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// Generated file. Do not edit. -// - -#import "GeneratedPluginRegistrant.h" - -@implementation GeneratedPluginRegistrant - -+ (void)registerWithRegistry:(NSObject*)registry { -} - -@end diff --git a/examples/platform_view/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java b/examples/platform_view/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java deleted file mode 100644 index d007606a44d..00000000000 --- a/examples/platform_view/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java +++ /dev/null @@ -1,23 +0,0 @@ -package io.flutter.plugins; - -import io.flutter.plugin.common.PluginRegistry; - -/** - * Generated file. Do not edit. - */ -public final class GeneratedPluginRegistrant { - public static void registerWith(PluginRegistry registry) { - if (alreadyRegisteredWith(registry)) { - return; - } - } - - private static boolean alreadyRegisteredWith(PluginRegistry registry) { - final String key = GeneratedPluginRegistrant.class.getCanonicalName(); - if (registry.hasPlugin(key)) { - return true; - } - registry.registrarFor(key); - return false; - } -} diff --git a/examples/platform_view/ios/Runner/GeneratedPluginRegistrant.h b/examples/platform_view/ios/Runner/GeneratedPluginRegistrant.h deleted file mode 100644 index 3b700eb4819..00000000000 --- a/examples/platform_view/ios/Runner/GeneratedPluginRegistrant.h +++ /dev/null @@ -1,14 +0,0 @@ -// -// Generated file. Do not edit. -// - -#ifndef GeneratedPluginRegistrant_h -#define GeneratedPluginRegistrant_h - -#import - -@interface GeneratedPluginRegistrant : NSObject -+ (void)registerWithRegistry:(NSObject*)registry; -@end - -#endif /* GeneratedPluginRegistrant_h */ diff --git a/examples/platform_view/ios/Runner/GeneratedPluginRegistrant.m b/examples/platform_view/ios/Runner/GeneratedPluginRegistrant.m deleted file mode 100644 index 60dfa42b328..00000000000 --- a/examples/platform_view/ios/Runner/GeneratedPluginRegistrant.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// Generated file. Do not edit. -// - -#import "GeneratedPluginRegistrant.h" - -@implementation GeneratedPluginRegistrant - -+ (void)registerWithRegistry:(NSObject*)registry { -} - -@end diff --git a/examples/stocks/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java b/examples/stocks/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java deleted file mode 100644 index d007606a44d..00000000000 --- a/examples/stocks/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java +++ /dev/null @@ -1,23 +0,0 @@ -package io.flutter.plugins; - -import io.flutter.plugin.common.PluginRegistry; - -/** - * Generated file. Do not edit. - */ -public final class GeneratedPluginRegistrant { - public static void registerWith(PluginRegistry registry) { - if (alreadyRegisteredWith(registry)) { - return; - } - } - - private static boolean alreadyRegisteredWith(PluginRegistry registry) { - final String key = GeneratedPluginRegistrant.class.getCanonicalName(); - if (registry.hasPlugin(key)) { - return true; - } - registry.registrarFor(key); - return false; - } -} diff --git a/examples/stocks/ios/Runner/GeneratedPluginRegistrant.h b/examples/stocks/ios/Runner/GeneratedPluginRegistrant.h deleted file mode 100644 index 3b700eb4819..00000000000 --- a/examples/stocks/ios/Runner/GeneratedPluginRegistrant.h +++ /dev/null @@ -1,14 +0,0 @@ -// -// Generated file. Do not edit. -// - -#ifndef GeneratedPluginRegistrant_h -#define GeneratedPluginRegistrant_h - -#import - -@interface GeneratedPluginRegistrant : NSObject -+ (void)registerWithRegistry:(NSObject*)registry; -@end - -#endif /* GeneratedPluginRegistrant_h */ diff --git a/examples/stocks/ios/Runner/GeneratedPluginRegistrant.m b/examples/stocks/ios/Runner/GeneratedPluginRegistrant.m deleted file mode 100644 index 60dfa42b328..00000000000 --- a/examples/stocks/ios/Runner/GeneratedPluginRegistrant.m +++ /dev/null @@ -1,12 +0,0 @@ -// -// Generated file. Do not edit. -// - -#import "GeneratedPluginRegistrant.h" - -@implementation GeneratedPluginRegistrant - -+ (void)registerWithRegistry:(NSObject*)registry { -} - -@end