diff --git a/engine/src/flutter/.gitignore b/engine/src/flutter/.gitignore index ed1194e1d9e..dcedccc6b2c 100644 --- a/engine/src/flutter/.gitignore +++ b/engine/src/flutter/.gitignore @@ -82,7 +82,7 @@ unlinked_spec.ds **/android/key.properties *.jks -# iOS/XCode related +# iOS/Xcode related **/ios/**/*.mode1v3 **/ios/**/*.mode2v3 **/ios/**/*.moved-aside @@ -102,7 +102,6 @@ unlinked_spec.ds **/ios/Flutter/App.framework **/ios/Flutter/Flutter.framework **/ios/Flutter/Flutter.xcframework -**/ios/Flutter/Flutter.podspec **/ios/Flutter/Generated.xcconfig **/ios/Flutter/app.flx **/ios/Flutter/app.zip diff --git a/engine/src/flutter/ci/licenses_golden/licenses_flutter b/engine/src/flutter/ci/licenses_golden/licenses_flutter index c80c2529d25..99cea9170f8 100644 --- a/engine/src/flutter/ci/licenses_golden/licenses_flutter +++ b/engine/src/flutter/ci/licenses_golden/licenses_flutter @@ -1556,7 +1556,6 @@ FILE: ../../../flutter/shell/platform/darwin/graphics/FlutterDarwinContextMetal. FILE: ../../../flutter/shell/platform/darwin/graphics/FlutterDarwinContextMetal.mm FILE: ../../../flutter/shell/platform/darwin/graphics/FlutterDarwinExternalTextureMetal.h FILE: ../../../flutter/shell/platform/darwin/graphics/FlutterDarwinExternalTextureMetal.mm -FILE: ../../../flutter/shell/platform/darwin/ios/framework/Flutter.podspec FILE: ../../../flutter/shell/platform/darwin/ios/framework/Headers/Flutter.h FILE: ../../../flutter/shell/platform/darwin/ios/framework/Headers/FlutterAppDelegate.h FILE: ../../../flutter/shell/platform/darwin/ios/framework/Headers/FlutterCallbackCache.h @@ -1696,7 +1695,6 @@ FILE: ../../../flutter/shell/platform/darwin/ios/platform_view_ios.h FILE: ../../../flutter/shell/platform/darwin/ios/platform_view_ios.mm FILE: ../../../flutter/shell/platform/darwin/ios/rendering_api_selection.h FILE: ../../../flutter/shell/platform/darwin/ios/rendering_api_selection.mm -FILE: ../../../flutter/shell/platform/darwin/macos/framework/FlutterMacOS.podspec FILE: ../../../flutter/shell/platform/darwin/macos/framework/Headers/FlutterAppDelegate.h FILE: ../../../flutter/shell/platform/darwin/macos/framework/Headers/FlutterDartProject.h FILE: ../../../flutter/shell/platform/darwin/macos/framework/Headers/FlutterEngine.h diff --git a/engine/src/flutter/shell/platform/darwin/ios/BUILD.gn b/engine/src/flutter/shell/platform/darwin/ios/BUILD.gn index 0a46c602f94..d1228200557 100644 --- a/engine/src/flutter/shell/platform/darwin/ios/BUILD.gn +++ b/engine/src/flutter/shell/platform/darwin/ios/BUILD.gn @@ -376,12 +376,6 @@ copy("copy_framework_icu") { outputs = [ "$_flutter_framework_dir/{{source_file_part}}" ] } -copy("copy_framework_podspec") { - visibility = [ ":*" ] - sources = [ "framework/Flutter.podspec" ] - outputs = [ "$root_out_dir/Flutter.podspec" ] -} - copy("copy_license") { visibility = [ ":*" ] sources = [ "//LICENSE" ] @@ -413,7 +407,6 @@ group("universal_flutter_framework") { ":copy_framework_icu", ":copy_framework_info_plist", ":copy_framework_module_map", - ":copy_framework_podspec", ":copy_license", ] diff --git a/engine/src/flutter/shell/platform/darwin/ios/framework/Flutter.podspec b/engine/src/flutter/shell/platform/darwin/ios/framework/Flutter.podspec deleted file mode 100644 index 5ca30416bac..00000000000 --- a/engine/src/flutter/shell/platform/darwin/ios/framework/Flutter.podspec +++ /dev/null @@ -1,18 +0,0 @@ -# -# NOTE: This podspec is NOT to be published. It is only used as a local source! -# - -Pod::Spec.new do |s| - s.name = 'Flutter' - s.version = '1.0.0' - s.summary = 'High-performance, high-fidelity mobile apps.' - s.description = <<-DESC -Flutter provides an easy and productive way to build and deploy high-performance mobile apps for Android and iOS. - DESC - s.homepage = 'https://flutter.io' - s.license = { :type => 'MIT' } - s.author = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' } - s.source = { :git => 'https://github.com/flutter/engine', :tag => s.version.to_s } - s.ios.deployment_target = '8.0' - s.vendored_frameworks = 'Flutter.framework' -end diff --git a/engine/src/flutter/shell/platform/darwin/macos/BUILD.gn b/engine/src/flutter/shell/platform/darwin/macos/BUILD.gn index daec61b35e6..8a33148f89d 100644 --- a/engine/src/flutter/shell/platform/darwin/macos/BUILD.gn +++ b/engine/src/flutter/shell/platform/darwin/macos/BUILD.gn @@ -308,17 +308,8 @@ action("_generate_symlinks") { ] } -copy("copy_framework_podspec") { - visibility = [ ":*" ] - sources = [ "framework/FlutterMacOS.podspec" ] - outputs = [ "$root_out_dir/FlutterMacOS.podspec" ] -} - group("flutter_framework") { - deps = [ - ":_generate_symlinks", - ":copy_framework_podspec", - ] + deps = [ ":_generate_symlinks" ] } if (build_glfw_shell) { @@ -342,10 +333,7 @@ zip_bundle("zip_macos_flutter_framework") { } zip_bundle("macos_flutter_framework_archive") { - deps = [ - ":copy_framework_podspec", - ":zip_macos_flutter_framework", - ] + deps = [ ":zip_macos_flutter_framework" ] prefix = "$full_platform_name-$flutter_runtime_mode/" if (flutter_runtime_mode == "debug") { prefix = "$full_platform_name/" @@ -356,9 +344,5 @@ zip_bundle("macos_flutter_framework_archive") { source = "$root_out_dir/zip_archives/tmp/FlutterMacOS.framework.zip" destination = "FlutterMacOS.framework.zip" }, - { - source = "$root_out_dir/FlutterMacOS.podspec" - destination = "FlutterMacOS.podspec" - }, ] } diff --git a/engine/src/flutter/shell/platform/darwin/macos/framework/FlutterMacOS.podspec b/engine/src/flutter/shell/platform/darwin/macos/framework/FlutterMacOS.podspec deleted file mode 100644 index fce016d4434..00000000000 --- a/engine/src/flutter/shell/platform/darwin/macos/framework/FlutterMacOS.podspec +++ /dev/null @@ -1,18 +0,0 @@ -# -# NOTE: This podspec is NOT to be published. It is only used as a local source! -# - -Pod::Spec.new do |s| - s.name = 'FlutterMacOS' - s.version = '1.0.0' - s.summary = 'High-performance, high-fidelity cross-platform apps.' - s.description = <<-DESC -Flutter is Google's portable UI toolkit for building beautiful, natively-compiled applications for mobile, web, and desktop from a single codebase. - DESC - s.homepage = 'https://flutter.dev' - s.license = { :type => 'MIT' } - s.author = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' } - s.source = { :git => 'https://github.com/flutter/engine', :tag => s.version.to_s } - s.osx.deployment_target = '10.11' - s.vendored_frameworks = 'FlutterMacOS.framework' -end