diff --git a/flutter_maps_firestore/.metadata b/flutter_maps_firestore/.metadata new file mode 100644 index 000000000..3af102fda --- /dev/null +++ b/flutter_maps_firestore/.metadata @@ -0,0 +1,10 @@ +# This file tracks properties of this Flutter project. +# Used by Flutter tool to assess capabilities and perform upgrades etc. +# +# This file should be version controlled and should not be manually edited. + +version: + revision: ab36346af6e6c61ab4174c753b1ec3f3260fa56a + channel: master + +project_type: app diff --git a/flutter_maps_firestore/ios/.gitignore b/flutter_maps_firestore/ios/.gitignore new file mode 100644 index 000000000..e96ef602b --- /dev/null +++ b/flutter_maps_firestore/ios/.gitignore @@ -0,0 +1,32 @@ +*.mode1v3 +*.mode2v3 +*.moved-aside +*.pbxuser +*.perspectivev3 +**/*sync/ +.sconsign.dblite +.tags* +**/.vagrant/ +**/DerivedData/ +Icon? +**/Pods/ +**/.symlinks/ +profile +xcuserdata +**/.generated/ +Flutter/App.framework +Flutter/Flutter.framework +Flutter/Flutter.podspec +Flutter/Generated.xcconfig +Flutter/app.flx +Flutter/app.zip +Flutter/flutter_assets/ +Flutter/flutter_export_environment.sh +ServiceDefinitions.json +Runner/GeneratedPluginRegistrant.* + +# Exceptions to above rules. +!default.mode1v3 +!default.mode2v3 +!default.pbxuser +!default.perspectivev3 diff --git a/flutter_maps_firestore/ios/Flutter/AppFrameworkInfo.plist b/flutter_maps_firestore/ios/Flutter/AppFrameworkInfo.plist index 9367d483e..6b4c0f78a 100644 --- a/flutter_maps_firestore/ios/Flutter/AppFrameworkInfo.plist +++ b/flutter_maps_firestore/ios/Flutter/AppFrameworkInfo.plist @@ -3,7 +3,7 @@ CFBundleDevelopmentRegion - en + $(DEVELOPMENT_LANGUAGE) CFBundleExecutable App CFBundleIdentifier diff --git a/flutter_maps_firestore/ios/Podfile b/flutter_maps_firestore/ios/Podfile index 671bf462e..53e554a60 100644 --- a/flutter_maps_firestore/ios/Podfile +++ b/flutter_maps_firestore/ios/Podfile @@ -15,51 +15,72 @@ def parse_KV_file(file, separator='=') if !File.exists? file_abs_path return []; end - pods_ary = [] + generated_key_values = {} skip_line_start_symbols = ["#", "/"] - File.foreach(file_abs_path) { |line| - next if skip_line_start_symbols.any? { |symbol| line =~ /^\s*#{symbol}/ } - plugin = line.split(pattern=separator) - if plugin.length == 2 - podname = plugin[0].strip() - path = plugin[1].strip() - podpath = File.expand_path("#{path}", file_abs_path) - pods_ary.push({:name => podname, :path => podpath}); - else - puts "Invalid plugin specification: #{line}" - end - } - return pods_ary + File.foreach(file_abs_path) do |line| + next if skip_line_start_symbols.any? { |symbol| line =~ /^\s*#{symbol}/ } + plugin = line.split(pattern=separator) + if plugin.length == 2 + podname = plugin[0].strip() + path = plugin[1].strip() + podpath = File.expand_path("#{path}", file_abs_path) + generated_key_values[podname] = podpath + else + puts "Invalid plugin specification: #{line}" + end + end + generated_key_values end target 'Runner' do - # Prepare symlinks folder. We use symlinks to avoid having Podfile.lock - # referring to absolute paths on developers' machines. - system('rm -rf .symlinks') - system('mkdir -p .symlinks/plugins') + use_frameworks! + use_modular_headers! - # Flutter Pods - generated_xcode_build_settings = parse_KV_file('./Flutter/Generated.xcconfig') - if generated_xcode_build_settings.empty? - puts "Generated.xcconfig must exist. If you're running pod install manually, make sure flutter packages get is executed first." - end - generated_xcode_build_settings.map { |p| - if p[:name] == 'FLUTTER_FRAMEWORK_DIR' - symlink = File.join('.symlinks', 'flutter') - File.symlink(File.dirname(p[:path]), symlink) - pod 'Flutter', :path => File.join(symlink, File.basename(p[:path])) + # Flutter Pod + + copied_flutter_dir = File.join(__dir__, 'Flutter') + copied_framework_path = File.join(copied_flutter_dir, 'Flutter.framework') + copied_podspec_path = File.join(copied_flutter_dir, 'Flutter.podspec') + unless File.exist?(copied_framework_path) && File.exist?(copied_podspec_path) + # Copy Flutter.framework and Flutter.podspec to Flutter/ to have something to link against if the xcode backend script has not run yet. + # That script will copy the correct debug/profile/release version of the framework based on the currently selected Xcode configuration. + # CocoaPods will not embed the framework on pod install (before any build phases can generate) if the dylib does not exist. + + generated_xcode_build_settings_path = File.join(copied_flutter_dir, 'Generated.xcconfig') + unless File.exist?(generated_xcode_build_settings_path) + raise "Generated.xcconfig must exist. If you're running pod install manually, make sure flutter pub get is executed first" end - } + generated_xcode_build_settings = parse_KV_file(generated_xcode_build_settings_path) + cached_framework_dir = generated_xcode_build_settings['FLUTTER_FRAMEWORK_DIR']; + + unless File.exist?(copied_framework_path) + FileUtils.cp_r(File.join(cached_framework_dir, 'Flutter.framework'), copied_flutter_dir) + end + unless File.exist?(copied_podspec_path) + FileUtils.cp(File.join(cached_framework_dir, 'Flutter.podspec'), copied_flutter_dir) + end + end + + # Keep pod path relative so it can be checked into Podfile.lock. + pod 'Flutter', :path => 'Flutter' # Plugin Pods + + # Prepare symlinks folder. We use symlinks to avoid having Podfile.lock + # referring to absolute paths on developers' machines. + system('rm -rf .symlinks') + system('mkdir -p .symlinks/plugins') plugin_pods = parse_KV_file('../.flutter-plugins') - plugin_pods.map { |p| - symlink = File.join('.symlinks', 'plugins', p[:name]) - File.symlink(p[:path], symlink) - pod p[:name], :path => File.join(symlink, 'ios') - } + plugin_pods.each do |name, path| + symlink = File.join('.symlinks', 'plugins', name) + File.symlink(path, symlink) + pod name, :path => File.join(symlink, 'ios') + end end +# Prevent Cocoapods from embedding a second Flutter framework and causing an error with the new Xcode build system. +install! 'cocoapods', :disable_input_output_paths => true + post_install do |installer| installer.pods_project.targets.each do |target| target.build_configurations.each do |config| diff --git a/flutter_maps_firestore/ios/Podfile.lock b/flutter_maps_firestore/ios/Podfile.lock index e72a11bc3..813a5a7a9 100644 --- a/flutter_maps_firestore/ios/Podfile.lock +++ b/flutter_maps_firestore/ios/Podfile.lock @@ -1,4 +1,163 @@ PODS: + - abseil/algorithm (0.20190808): + - abseil/algorithm/algorithm (= 0.20190808) + - abseil/algorithm/container (= 0.20190808) + - abseil/algorithm/algorithm (0.20190808) + - abseil/algorithm/container (0.20190808): + - abseil/algorithm/algorithm + - abseil/base/core_headers + - abseil/meta/type_traits + - abseil/base (0.20190808): + - abseil/base/atomic_hook (= 0.20190808) + - abseil/base/base (= 0.20190808) + - abseil/base/base_internal (= 0.20190808) + - abseil/base/bits (= 0.20190808) + - abseil/base/config (= 0.20190808) + - abseil/base/core_headers (= 0.20190808) + - abseil/base/dynamic_annotations (= 0.20190808) + - abseil/base/endian (= 0.20190808) + - abseil/base/log_severity (= 0.20190808) + - abseil/base/malloc_internal (= 0.20190808) + - abseil/base/pretty_function (= 0.20190808) + - abseil/base/spinlock_wait (= 0.20190808) + - abseil/base/throw_delegate (= 0.20190808) + - abseil/base/atomic_hook (0.20190808) + - abseil/base/base (0.20190808): + - abseil/base/atomic_hook + - abseil/base/base_internal + - abseil/base/config + - abseil/base/core_headers + - abseil/base/dynamic_annotations + - abseil/base/log_severity + - abseil/base/spinlock_wait + - abseil/meta/type_traits + - abseil/base/base_internal (0.20190808): + - abseil/meta/type_traits + - abseil/base/bits (0.20190808): + - abseil/base/core_headers + - abseil/base/config (0.20190808) + - abseil/base/core_headers (0.20190808): + - abseil/base/config + - abseil/base/dynamic_annotations (0.20190808) + - abseil/base/endian (0.20190808): + - abseil/base/config + - abseil/base/core_headers + - abseil/base/log_severity (0.20190808): + - abseil/base/core_headers + - abseil/base/malloc_internal (0.20190808): + - abseil/base/base + - abseil/base/config + - abseil/base/core_headers + - abseil/base/dynamic_annotations + - abseil/base/spinlock_wait + - abseil/base/pretty_function (0.20190808) + - abseil/base/spinlock_wait (0.20190808): + - abseil/base/core_headers + - abseil/base/throw_delegate (0.20190808): + - abseil/base/base + - abseil/base/config + - abseil/memory (0.20190808): + - abseil/memory/memory (= 0.20190808) + - abseil/memory/memory (0.20190808): + - abseil/base/core_headers + - abseil/meta/type_traits + - abseil/meta (0.20190808): + - abseil/meta/type_traits (= 0.20190808) + - abseil/meta/type_traits (0.20190808): + - abseil/base/config + - abseil/numeric/int128 (0.20190808): + - abseil/base/config + - abseil/base/core_headers + - abseil/strings/internal (0.20190808): + - abseil/base/core_headers + - abseil/base/endian + - abseil/meta/type_traits + - abseil/strings/strings (0.20190808): + - abseil/base/base + - abseil/base/bits + - abseil/base/config + - abseil/base/core_headers + - abseil/base/endian + - abseil/base/throw_delegate + - abseil/memory/memory + - abseil/meta/type_traits + - abseil/numeric/int128 + - abseil/strings/internal + - abseil/time (0.20190808): + - abseil/time/internal (= 0.20190808) + - abseil/time/time (= 0.20190808) + - abseil/time/internal (0.20190808): + - abseil/time/internal/cctz (= 0.20190808) + - abseil/time/internal/cctz (0.20190808): + - abseil/time/internal/cctz/civil_time (= 0.20190808) + - abseil/time/internal/cctz/includes (= 0.20190808) + - abseil/time/internal/cctz/time_zone (= 0.20190808) + - abseil/time/internal/cctz/civil_time (0.20190808) + - abseil/time/internal/cctz/includes (0.20190808) + - abseil/time/internal/cctz/time_zone (0.20190808): + - abseil/time/internal/cctz/civil_time + - abseil/time/time (0.20190808): + - abseil/base/base + - abseil/base/core_headers + - abseil/numeric/int128 + - abseil/strings/strings + - abseil/time/internal/cctz/civil_time + - abseil/time/internal/cctz/time_zone + - abseil/types (0.20190808): + - abseil/types/any (= 0.20190808) + - abseil/types/bad_any_cast (= 0.20190808) + - abseil/types/bad_any_cast_impl (= 0.20190808) + - abseil/types/bad_optional_access (= 0.20190808) + - abseil/types/bad_variant_access (= 0.20190808) + - abseil/types/compare (= 0.20190808) + - abseil/types/optional (= 0.20190808) + - abseil/types/span (= 0.20190808) + - abseil/types/variant (= 0.20190808) + - abseil/types/any (0.20190808): + - abseil/base/config + - abseil/base/core_headers + - abseil/meta/type_traits + - abseil/types/bad_any_cast + - abseil/utility/utility + - abseil/types/bad_any_cast (0.20190808): + - abseil/base/config + - abseil/types/bad_any_cast_impl + - abseil/types/bad_any_cast_impl (0.20190808): + - abseil/base/base + - abseil/base/config + - abseil/types/bad_optional_access (0.20190808): + - abseil/base/base + - abseil/base/config + - abseil/types/bad_variant_access (0.20190808): + - abseil/base/base + - abseil/base/config + - abseil/types/compare (0.20190808): + - abseil/base/core_headers + - abseil/meta/type_traits + - abseil/types/optional (0.20190808): + - abseil/base/base_internal + - abseil/base/config + - abseil/base/core_headers + - abseil/memory/memory + - abseil/meta/type_traits + - abseil/types/bad_optional_access + - abseil/utility/utility + - abseil/types/span (0.20190808): + - abseil/algorithm/algorithm + - abseil/base/core_headers + - abseil/base/throw_delegate + - abseil/meta/type_traits + - abseil/types/variant (0.20190808): + - abseil/base/base_internal + - abseil/base/config + - abseil/base/core_headers + - abseil/meta/type_traits + - abseil/types/bad_variant_access + - abseil/utility/utility + - abseil/utility/utility (0.20190808): + - abseil/base/base_internal + - abseil/base/config + - abseil/meta/type_traits - BoringSSL-GRPC (0.0.3): - BoringSSL-GRPC/Implementation (= 0.0.3) - BoringSSL-GRPC/Interface (= 0.0.3) @@ -9,81 +168,94 @@ PODS: - Firebase/Core - Firebase/Firestore (~> 6.0) - Flutter - - Firebase/Core (6.2.0): + - Firebase/Core (6.14.0): - Firebase/CoreOnly - - FirebaseAnalytics (= 6.0.1) - - Firebase/CoreOnly (6.2.0): - - FirebaseCore (= 6.0.2) - - Firebase/Firestore (6.2.0): + - FirebaseAnalytics (= 6.1.7) + - Firebase/CoreOnly (6.14.0): + - FirebaseCore (= 6.5.0) + - Firebase/Firestore (6.14.0): - Firebase/CoreOnly - - FirebaseFirestore (~> 1.3.2) + - FirebaseFirestore (~> 1.8.2) - firebase_core (0.0.1): - Firebase/Core - Flutter - - FirebaseAnalytics (6.0.1): - - FirebaseCore (~> 6.0) - - FirebaseInstanceID (~> 4.1) - - GoogleAppMeasurement (= 6.0.1) + - firebase_core_web (0.1.0): + - Flutter + - FirebaseAnalytics (6.1.7): + - FirebaseCore (~> 6.5) + - FirebaseInstanceID (~> 4.2) + - GoogleAppMeasurement (= 6.1.7) - GoogleUtilities/AppDelegateSwizzler (~> 6.0) - GoogleUtilities/MethodSwizzler (~> 6.0) - GoogleUtilities/Network (~> 6.0) - "GoogleUtilities/NSData+zlib (~> 6.0)" - - nanopb (~> 0.3) + - nanopb (= 0.3.9011) - FirebaseAuthInterop (1.0.0) - - FirebaseCore (6.0.2): - - GoogleUtilities/Environment (~> 6.0) - - GoogleUtilities/Logger (~> 6.0) - - FirebaseFirestore (1.3.2): - - FirebaseAuthInterop (~> 1.0) - - FirebaseCore (~> 6.0) - - FirebaseFirestore/abseil-cpp (= 1.3.2) - - "gRPC-C++ (= 0.0.9)" - - leveldb-library (~> 1.20) + - FirebaseCore (6.5.0): + - FirebaseCoreDiagnostics (~> 1.0) + - FirebaseCoreDiagnosticsInterop (~> 1.0) + - GoogleUtilities/Environment (~> 6.4) + - GoogleUtilities/Logger (~> 6.4) + - FirebaseCoreDiagnostics (1.1.2): + - FirebaseCoreDiagnosticsInterop (~> 1.0) + - GoogleDataTransportCCTSupport (~> 1.0) + - GoogleUtilities/Environment (~> 6.2) + - GoogleUtilities/Logger (~> 6.2) - nanopb (~> 0.3.901) - - Protobuf (~> 3.1) - - FirebaseFirestore/abseil-cpp (1.3.2): + - FirebaseCoreDiagnosticsInterop (1.1.0) + - FirebaseFirestore (1.8.3): + - abseil/algorithm (= 0.20190808) + - abseil/base (= 0.20190808) + - abseil/memory (= 0.20190808) + - abseil/meta (= 0.20190808) + - abseil/strings/strings (= 0.20190808) + - abseil/time (= 0.20190808) + - abseil/types (= 0.20190808) - FirebaseAuthInterop (~> 1.0) - - FirebaseCore (~> 6.0) + - FirebaseCore (~> 6.2) - "gRPC-C++ (= 0.0.9)" - - leveldb-library (~> 1.20) + - leveldb-library (~> 1.22) - nanopb (~> 0.3.901) - - Protobuf (~> 3.1) - - FirebaseInstanceID (4.1.1): - - FirebaseCore (~> 6.0) - - GoogleUtilities/Environment (~> 6.0) - - GoogleUtilities/UserDefaults (~> 6.0) + - FirebaseInstanceID (4.2.8): + - FirebaseCore (~> 6.5) + - GoogleUtilities/Environment (~> 6.4) + - GoogleUtilities/UserDefaults (~> 6.4) - Flutter (1.0.0) - google_maps_flutter (0.0.1): - Flutter - GoogleMaps - - GoogleAppMeasurement (6.0.1): + - GoogleAppMeasurement (6.1.7): - GoogleUtilities/AppDelegateSwizzler (~> 6.0) - GoogleUtilities/MethodSwizzler (~> 6.0) - GoogleUtilities/Network (~> 6.0) - "GoogleUtilities/NSData+zlib (~> 6.0)" - - nanopb (~> 0.3) - - GoogleMaps (3.1.0): - - GoogleMaps/Maps (= 3.1.0) - - GoogleMaps/Base (3.1.0) - - GoogleMaps/Maps (3.1.0): + - nanopb (= 0.3.9011) + - GoogleDataTransport (3.2.0) + - GoogleDataTransportCCTSupport (1.2.3): + - GoogleDataTransport (~> 3.2) + - nanopb (~> 0.3.901) + - GoogleMaps (3.7.0): + - GoogleMaps/Maps (= 3.7.0) + - GoogleMaps/Base (3.7.0) + - GoogleMaps/Maps (3.7.0): - GoogleMaps/Base - - GoogleUtilities/AppDelegateSwizzler (6.2.0): + - GoogleUtilities/AppDelegateSwizzler (6.4.0): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (6.2.0) - - GoogleUtilities/Logger (6.2.0): + - GoogleUtilities/Environment (6.4.0) + - GoogleUtilities/Logger (6.4.0): - GoogleUtilities/Environment - - GoogleUtilities/MethodSwizzler (6.2.0): + - GoogleUtilities/MethodSwizzler (6.4.0): - GoogleUtilities/Logger - - GoogleUtilities/Network (6.2.0): + - GoogleUtilities/Network (6.4.0): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (6.2.0)" - - GoogleUtilities/Reachability (6.2.0): + - "GoogleUtilities/NSData+zlib (6.4.0)" + - GoogleUtilities/Reachability (6.4.0): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (6.2.0): + - GoogleUtilities/UserDefaults (6.4.0): - GoogleUtilities/Logger - "gRPC-C++ (0.0.9)": - "gRPC-C++/Implementation (= 0.0.9)" @@ -101,75 +273,86 @@ PODS: - gRPC-Core/Interface (= 1.21.0) - nanopb (~> 0.3) - gRPC-Core/Interface (1.21.0) - - leveldb-library (1.20) + - leveldb-library (1.22) - location (0.0.1): - Flutter - - nanopb (0.3.901): - - nanopb/decode (= 0.3.901) - - nanopb/encode (= 0.3.901) - - nanopb/decode (0.3.901) - - nanopb/encode (0.3.901) - - Protobuf (3.8.0) + - nanopb (0.3.9011): + - nanopb/decode (= 0.3.9011) + - nanopb/encode (= 0.3.9011) + - nanopb/decode (0.3.9011) + - nanopb/encode (0.3.9011) DEPENDENCIES: - cloud_firestore (from `.symlinks/plugins/cloud_firestore/ios`) - firebase_core (from `.symlinks/plugins/firebase_core/ios`) - - Flutter (from `.symlinks/flutter/ios`) + - firebase_core_web (from `.symlinks/plugins/firebase_core_web/ios`) + - Flutter (from `Flutter`) - google_maps_flutter (from `.symlinks/plugins/google_maps_flutter/ios`) - location (from `.symlinks/plugins/location/ios`) SPEC REPOS: - https://github.com/cocoapods/specs.git: + trunk: + - abseil - BoringSSL-GRPC - Firebase - FirebaseAnalytics - FirebaseAuthInterop - FirebaseCore + - FirebaseCoreDiagnostics + - FirebaseCoreDiagnosticsInterop - FirebaseFirestore - FirebaseInstanceID - GoogleAppMeasurement + - GoogleDataTransport + - GoogleDataTransportCCTSupport - GoogleMaps - GoogleUtilities - "gRPC-C++" - gRPC-Core - leveldb-library - nanopb - - Protobuf EXTERNAL SOURCES: cloud_firestore: :path: ".symlinks/plugins/cloud_firestore/ios" firebase_core: :path: ".symlinks/plugins/firebase_core/ios" + firebase_core_web: + :path: ".symlinks/plugins/firebase_core_web/ios" Flutter: - :path: ".symlinks/flutter/ios" + :path: Flutter google_maps_flutter: :path: ".symlinks/plugins/google_maps_flutter/ios" location: :path: ".symlinks/plugins/location/ios" SPEC CHECKSUMS: + abseil: 18063d773f5366ff8736a050fe035a28f635fd27 BoringSSL-GRPC: db8764df3204ccea016e1c8dd15d9a9ad63ff318 - cloud_firestore: c6f34148c1dfbb57a6147f9bb49c1c9f5c27036e - Firebase: 5965bac23e7fcb5fa6d926ed429c9ecef8a2014e - firebase_core: ce5006bb48508ee4e71e0f429a3f519bb8ee2961 - FirebaseAnalytics: 629301c2b9925f3537d4093a17a72751ae5b7084 + cloud_firestore: 10fd4a09ebffc33efd64708106e2e7de701fe9ae + Firebase: 0219bb4782eb1406f1b9b0628a2e625484ce910d + firebase_core: 87e4c7cef68de46c0326ce2ee907fc7e365ead7e + firebase_core_web: d501d8b946b60c8af265428ce483b0fff5ad52d1 + FirebaseAnalytics: f68b9f3f1241385129ae0a83b63627fc420c05e5 FirebaseAuthInterop: 0ffa57668be100582bb7643d4fcb7615496c41fc - FirebaseCore: b0f0262acebfa540e5f97b3832dbb13186980822 - FirebaseFirestore: d9c55dfd0cd648f420cc8340c4940dc3eab2d860 - FirebaseInstanceID: cdb3827746d53ece7ae87a5c51c25c3055443366 - Flutter: 58dd7d1b27887414a370fcccb9e645c08ffd7a6a - google_maps_flutter: 924970f41ec509a201b593548db005efb2a09ee9 - GoogleAppMeasurement: 51d8d9ea48f0ca44484d29cfbdef976fbd4fc336 - GoogleMaps: 5c13302e6fe6bb6e686b267196586b91cd594225 - GoogleUtilities: 996e0db07153674fd1b54b220fda3a3dc3547cba + FirebaseCore: 632e05cc5e1199d9147122c16d92305eb04c34bd + FirebaseCoreDiagnostics: 511f4f3ed7d440bb69127e8b97c2bc8befae639e + FirebaseCoreDiagnosticsInterop: e9b1b023157e3a2fc6418b5cb601e79b9af7b3a0 + FirebaseFirestore: 52120e2833f804a874ba1a9f59aab864a8ae2286 + FirebaseInstanceID: ce993a3c3670a8f5d47ce371ac5d143c560608c5 + Flutter: 0e3d915762c693b495b44d77113d4970485de6ec + google_maps_flutter: d0dd62f5a7d39bae61057eb9f52dd778d99c7c6c + GoogleAppMeasurement: db118eb61a97dd8c4f7014e368d3c335cbbcf80a + GoogleDataTransport: 8e9b210c97d55fbff306cc5468ff91b9cb32dcf5 + GoogleDataTransportCCTSupport: 202d7cdf9c4a7d81a2bb7f7e7e1ba6faa421b1f2 + GoogleMaps: 55da829c68aa931f3ae982b9e341cc2f3d89c587 + GoogleUtilities: 29bd0d8f850efbd28cff6d99e8b7da1f8d236bcf "gRPC-C++": 9dfe7b44821e7b3e44aacad2af29d2c21f7cde83 gRPC-Core: c9aef9a261a1247e881b18059b84d597293c9947 - leveldb-library: 08cba283675b7ed2d99629a4bc5fd052cd2bb6a5 + leveldb-library: 55d93ee664b4007aac644a782d11da33fba316f7 location: 3a2eed4dd2fab25e7b7baf2a9efefe82b512d740 - nanopb: 2901f78ea1b7b4015c860c2fdd1ea2fee1a18d48 - Protobuf: 3f617b9a6e73605565086864c9bc26b2bf2dd5a3 + nanopb: 18003b5e52dab79db540fe93fe9579f399bd1ccd -PODFILE CHECKSUM: 3389836f37640698630b8f0670315d626d5f1469 +PODFILE CHECKSUM: 9ec0b926d741f3b13993aceabf2687bc78d2468b -COCOAPODS: 1.7.2 +COCOAPODS: 1.8.4 diff --git a/flutter_maps_firestore/ios/Runner.xcodeproj/project.pbxproj b/flutter_maps_firestore/ios/Runner.xcodeproj/project.pbxproj index a86522392..20969c1fa 100644 --- a/flutter_maps_firestore/ios/Runner.xcodeproj/project.pbxproj +++ b/flutter_maps_firestore/ios/Runner.xcodeproj/project.pbxproj @@ -7,19 +7,17 @@ objects = { /* Begin PBXBuildFile section */ - 1156A3B5111B89BEE7000248 /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 25786F4340AF68B454411589 /* libPods-Runner.a */; }; 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; }; 3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 728665C5E1DE178F3FFEC838 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07CFACF3F75ECC7FBEF8204B /* Pods_Runner.framework */; }; + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; 9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; }; 9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; }; - 97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; - AAA259112240D0FE0083B8D1 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = AAA259102240D0FE0083B8D1 /* GoogleService-Info.plist */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -38,27 +36,25 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 07CFACF3F75ECC7FBEF8204B /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; - 25786F4340AF68B454411589 /* libPods-Runner.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Runner.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 1A9813DF8BF9D3B9864A40FA /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; 3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = ""; }; - 43C0BB66D52882D2D652C11A /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + 6293ACCBA84D0851DD7783BF /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; - 7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; - 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; 9740EEBA1CF902C7004384FC /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = Flutter/Flutter.framework; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 97C146F21CF9000F007C117D /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - AAA259102240D0FE0083B8D1 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; - C53887ADFD868676EE4D0AEC /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; - FCDE0E0EA06E90E6810A7ABC /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; + DF0F6840D960AA5480EFCD88 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -68,31 +64,13 @@ files = ( 9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */, 3B80C3941E831B6300D905FE /* App.framework in Frameworks */, - 1156A3B5111B89BEE7000248 /* libPods-Runner.a in Frameworks */, + 728665C5E1DE178F3FFEC838 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 2C335DBC5066E653B3D5A2EF /* Frameworks */ = { - isa = PBXGroup; - children = ( - 25786F4340AF68B454411589 /* libPods-Runner.a */, - ); - name = Frameworks; - sourceTree = ""; - }; - 46C6E1EE1EE654AD0AE06F1F /* Pods */ = { - isa = PBXGroup; - children = ( - C53887ADFD868676EE4D0AEC /* Pods-Runner.debug.xcconfig */, - 43C0BB66D52882D2D652C11A /* Pods-Runner.release.xcconfig */, - FCDE0E0EA06E90E6810A7ABC /* Pods-Runner.profile.xcconfig */, - ); - path = Pods; - sourceTree = ""; - }; 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( @@ -112,8 +90,8 @@ 9740EEB11CF90186004384FC /* Flutter */, 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, - 46C6E1EE1EE654AD0AE06F1F /* Pods */, - 2C335DBC5066E653B3D5A2EF /* Frameworks */, + 9A0F3043A7DFB2C071AC3A48 /* Pods */, + CD053A799410F3DEFBB237D3 /* Frameworks */, ); sourceTree = ""; }; @@ -128,16 +106,15 @@ 97C146F01CF9000F007C117D /* Runner */ = { isa = PBXGroup; children = ( - 7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */, - 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */, 97C146FA1CF9000F007C117D /* Main.storyboard */, 97C146FD1CF9000F007C117D /* Assets.xcassets */, 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, 97C147021CF9000F007C117D /* Info.plist */, - AAA259102240D0FE0083B8D1 /* GoogleService-Info.plist */, 97C146F11CF9000F007C117D /* Supporting Files */, 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */, 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */, + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */, ); path = Runner; sourceTree = ""; @@ -145,11 +122,28 @@ 97C146F11CF9000F007C117D /* Supporting Files */ = { isa = PBXGroup; children = ( - 97C146F21CF9000F007C117D /* main.m */, ); name = "Supporting Files"; sourceTree = ""; }; + 9A0F3043A7DFB2C071AC3A48 /* Pods */ = { + isa = PBXGroup; + children = ( + DF0F6840D960AA5480EFCD88 /* Pods-Runner.debug.xcconfig */, + 6293ACCBA84D0851DD7783BF /* Pods-Runner.release.xcconfig */, + 1A9813DF8BF9D3B9864A40FA /* Pods-Runner.profile.xcconfig */, + ); + path = Pods; + sourceTree = ""; + }; + CD053A799410F3DEFBB237D3 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 07CFACF3F75ECC7FBEF8204B /* Pods_Runner.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -157,15 +151,15 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( - 4C1A28A8C31C1E3E8929E30B /* [CP] Check Pods Manifest.lock */, + 9F050A11A717C8A662EA675C /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - B849F7BA226E741C2D08FD20 /* [CP] Embed Pods Frameworks */, - 1C20093433832CAF907F1EBD /* [CP] Copy Pods Resources */, + FF95399A1C3870DC910F6294 /* [CP] Embed Pods Frameworks */, + 8EA3482E3651539943C08DC8 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -183,10 +177,11 @@ isa = PBXProject; attributes = { LastUpgradeCheck = 1020; - ORGANIZATIONNAME = "The Chromium Authors"; + ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { CreatedOnToolsVersion = 7.3.1; + LastSwiftMigration = 1100; }; }; }; @@ -217,48 +212,56 @@ 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, - AAA259112240D0FE0083B8D1 /* GoogleService-Info.plist in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 1C20093433832CAF907F1EBD /* [CP] Copy Pods Resources */ = { + 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Thin Binary"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin"; + }; + 8EA3482E3651539943C08DC8 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh", - "${PODS_ROOT}/GoogleMaps/Maps/Frameworks/GoogleMaps.framework/Resources/GoogleMaps.bundle", - "${PODS_CONFIGURATION_BUILD_DIR}/gRPC-C++/gRPCCertificates-Cpp.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleMaps.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/gRPCCertificates-Cpp.bundle", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n"; showEnvVarsInLog = 0; }; - 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { + 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Thin Binary"; + name = "Run Script"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin"; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; - 4C1A28A8C31C1E3E8929E30B /* [CP] Check Pods Manifest.lock */ = { + 9F050A11A717C8A662EA675C /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -280,32 +283,15 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 9740EEB61CF901F6004384FC /* Run Script */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "Run Script"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; - }; - B849F7BA226E741C2D08FD20 /* [CP] Embed Pods Frameworks */ = { + FF95399A1C3870DC910F6294 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", - "${PODS_ROOT}/../.symlinks/flutter/ios/Flutter.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -319,8 +305,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */, - 97C146F31CF9000F007C117D /* main.m in Sources */, + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */, 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -352,7 +337,6 @@ baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; @@ -390,9 +374,10 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; @@ -403,6 +388,7 @@ baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -416,8 +402,10 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterMapsFirestore; + PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.flutterMapsFirestore; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; }; name = Profile; @@ -427,7 +415,6 @@ baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; @@ -471,7 +458,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -484,7 +471,6 @@ baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; @@ -522,9 +508,11 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = iphoneos; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; @@ -535,6 +523,7 @@ baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -548,8 +537,11 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterMapsFirestore; + PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.flutterMapsFirestore; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; }; name = Debug; @@ -559,6 +551,7 @@ baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -572,8 +565,10 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterMapsFirestore; + PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.flutterMapsFirestore; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; }; name = Release; diff --git a/flutter_maps_firestore/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/flutter_maps_firestore/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings deleted file mode 100644 index 949b67898..000000000 --- a/flutter_maps_firestore/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings +++ /dev/null @@ -1,8 +0,0 @@ - - - - - BuildSystemType - Original - - diff --git a/flutter_maps_firestore/ios/Runner/AppDelegate.h b/flutter_maps_firestore/ios/Runner/AppDelegate.h deleted file mode 100644 index ada1244fd..000000000 --- a/flutter_maps_firestore/ios/Runner/AppDelegate.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2019 The Flutter team. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#import -#import - -@interface AppDelegate : FlutterAppDelegate - -@end diff --git a/flutter_maps_firestore/ios/Runner/AppDelegate.m b/flutter_maps_firestore/ios/Runner/AppDelegate.m deleted file mode 100644 index ec016c684..000000000 --- a/flutter_maps_firestore/ios/Runner/AppDelegate.m +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2019 The Flutter team. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "AppDelegate.h" -#include "GeneratedPluginRegistrant.h" -#import "GoogleMaps/GoogleMaps.h" - -@implementation AppDelegate - -- (BOOL)application:(UIApplication *)application - didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - // TODO: Replace this with an API key that has Google Maps for iOS enabled - // See https://developers.google.com/maps/documentation/ios-sdk/get-api-key - [GMSServices provideAPIKey: @"ADD_A_KEY_HERE"]; - [GeneratedPluginRegistrant registerWithRegistry:self]; - // Override point for customization after application launch. - return [super application:application didFinishLaunchingWithOptions:launchOptions]; -} - -@end diff --git a/flutter_maps_firestore/ios/Runner/AppDelegate.swift b/flutter_maps_firestore/ios/Runner/AppDelegate.swift new file mode 100644 index 000000000..9bd97cf87 --- /dev/null +++ b/flutter_maps_firestore/ios/Runner/AppDelegate.swift @@ -0,0 +1,18 @@ +import UIKit +import Flutter +import GoogleMaps + +@UIApplicationMain +@objc class AppDelegate: FlutterAppDelegate { + override func application( + _ application: UIApplication, + didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? + ) -> Bool { + // TODO: Replace this with an API key that has Google Maps for iOS enabled + // See https://developers.google.com/maps/documentation/ios-sdk/get-api-key + GMSServices.provideAPIKey("ADD_A_KEY_HERE") + GeneratedPluginRegistrant.register(with: self) + + return super.application(application, didFinishLaunchingWithOptions: launchOptions) + } +} diff --git a/flutter_maps_firestore/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/flutter_maps_firestore/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png index 3d43d11e6..dc9ada472 100644 Binary files a/flutter_maps_firestore/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and b/flutter_maps_firestore/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ diff --git a/flutter_maps_firestore/ios/Runner/Info.plist b/flutter_maps_firestore/ios/Runner/Info.plist index 03ea78dc3..5820ab207 100644 --- a/flutter_maps_firestore/ios/Runner/Info.plist +++ b/flutter_maps_firestore/ios/Runner/Info.plist @@ -7,7 +7,7 @@ NSLocationWhenInUseUsageDescription Finding Ice Cream stores near you CFBundleDevelopmentRegion - en + $(DEVELOPMENT_LANGUAGE) CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier diff --git a/flutter_maps_firestore/ios/Runner/Runner-Bridging-Header.h b/flutter_maps_firestore/ios/Runner/Runner-Bridging-Header.h new file mode 100644 index 000000000..308a2a560 --- /dev/null +++ b/flutter_maps_firestore/ios/Runner/Runner-Bridging-Header.h @@ -0,0 +1 @@ +#import "GeneratedPluginRegistrant.h" diff --git a/flutter_maps_firestore/ios/Runner/main.m b/flutter_maps_firestore/ios/Runner/main.m deleted file mode 100644 index 834e0add6..000000000 --- a/flutter_maps_firestore/ios/Runner/main.m +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright 2019 The Flutter team. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#import -#import -#import "AppDelegate.h" - -int main(int argc, char* argv[]) { - @autoreleasepool { - return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); - } -} diff --git a/flutter_maps_firestore/lib/generated_plugin_registrant.dart b/flutter_maps_firestore/lib/generated_plugin_registrant.dart new file mode 100644 index 000000000..c6571605e --- /dev/null +++ b/flutter_maps_firestore/lib/generated_plugin_registrant.dart @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// ignore: unused_import +import 'dart:ui'; + +import 'package:firebase_core_web/firebase_core_web.dart'; + +import 'package:flutter_web_plugins/flutter_web_plugins.dart'; + +void registerPlugins(PluginRegistry registry) { + FirebaseCoreWeb.registerWith(registry.registrarFor(FirebaseCoreWeb)); + registry.registerMessageHandler(); +}