From 149c5dd2eb3f1a198b97bd304b4f40725f252721 Mon Sep 17 00:00:00 2001 From: Salvatore Giordano Date: Fri, 2 Oct 2020 15:38:39 +0200 Subject: [PATCH] comment out notification handling code on ios due to incompatible dependencies --- example/ios/Flutter/.last_build_id | 1 + .../Notifications/NotificationService.swift | 292 +++++++++--------- example/ios/Podfile | 79 +---- example/ios/Podfile.lock | 288 +++++++---------- example/ios/Runner.xcodeproj/project.pbxproj | 54 +++- example/pubspec.yaml | 2 +- 6 files changed, 331 insertions(+), 385 deletions(-) create mode 100644 example/ios/Flutter/.last_build_id diff --git a/example/ios/Flutter/.last_build_id b/example/ios/Flutter/.last_build_id new file mode 100644 index 00000000..082cee61 --- /dev/null +++ b/example/ios/Flutter/.last_build_id @@ -0,0 +1 @@ +62487e5075f4f51e065cb6460a926b6a \ No newline at end of file diff --git a/example/ios/Notifications/NotificationService.swift b/example/ios/Notifications/NotificationService.swift index 7d085536..60e44390 100644 --- a/example/ios/Notifications/NotificationService.swift +++ b/example/ios/Notifications/NotificationService.swift @@ -7,7 +7,7 @@ // import UserNotifications -import StreamChatClient +//import StreamChatClient final class NotificationService: UNNotificationServiceExtension { @@ -26,29 +26,29 @@ final class NotificationService: UNNotificationServiceExtension { return } - Client.config = .init(apiKey: apiKey, logOptions: .error) - Client.shared.set(user: User(id: userId), token: token) { res in - guard res.isConnected else { - return - } - - Client.shared.message(withId: messageId) { [weak self] res in - if let message = res.value?.message, - let channel = res.value?.channel { - let messageWrapper = MessageWrapper(channel: channel, message: message) - if let encodedData = try? JSONEncoder.stream.encode(messageWrapper), - let encodedString = String(data: encodedData, encoding: .utf8) { - let storedMessages = sharedDefaults.stringArray(forKey: "messageQueue") ?? [] - sharedDefaults.setValue(storedMessages + [encodedString], forKey: "messageQueue") - - // Modify the notification content here... - self?.bestAttemptContent?.title = "[modified] \(self?.bestAttemptContent?.title ?? "")" - contentHandler(self?.bestAttemptContent ?? request.content) - } - Client.shared.disconnect() - } - } - } +// Client.config = .init(apiKey: apiKey, logOptions: .error) +// Client.shared.set(user: User(id: userId), token: token) { res in +// guard res.isConnected else { +// return +// } +// +// Client.shared.message(withId: messageId) { [weak self] res in +// if let message = res.value?.message, +// let channel = res.value?.channel { +// let messageWrapper = MessageWrapper(channel: channel, message: message) +// if let encodedData = try? JSONEncoder.stream.encode(messageWrapper), +// let encodedString = String(data: encodedData, encoding: .utf8) { +// let storedMessages = sharedDefaults.stringArray(forKey: "messageQueue") ?? [] +// sharedDefaults.setValue(storedMessages + [encodedString], forKey: "messageQueue") +// +// // Modify the notification content here... +// self?.bestAttemptContent?.title = "[modified] \(self?.bestAttemptContent?.title ?? "")" +// contentHandler(self?.bestAttemptContent ?? request.content) +// } +// Client.shared.disconnect() +// } +// } +// } } override func serviceExtensionTimeWillExpire() { @@ -58,125 +58,125 @@ final class NotificationService: UNNotificationServiceExtension { } } -public struct MessageWrapper: Encodable { - private enum CodingKeys: String, CodingKey { - case id - case channel - case type - case user - case created = "created_at" - case updated = "updated_at" - case text - case command - case args - case attachments - case parentId = "parent_id" - case showReplyInChannel = "show_in_channel" - case mentionedUsers = "mentioned_users" - } - - init(channel: Channel, message: Message) { - id = message.id - type = message.type - user = message.user - created = message.created - updated = message.updated - text = message.text - command = message.command - args = message.args - attachments = message.attachments - parentId = message.parentId - showReplyInChannel = message.showReplyInChannel - mentionedUsers = message.mentionedUsers - extraData = message.extraData - self.channel = ChannelWrapper(channel: channel) - } - - /// A message id. - public let id: String - /// The channel cid. - public let channel: ChannelWrapper? - /// A message type (see `MessageType`). - public let type: MessageType - /// A user (see `User`). - public let user: User - /// A created date. - public let created: Date - /// A updated date. - public let updated: Date - /// A text. - public let text: String - /// A used command name. - public let command: String? - /// A used command args. - public let args: String? - /// Attachments (see `Attachment`). - public let attachments: [Attachment] - /// A parent message id. - public let parentId: String? - /// Check if this reply message needs to show in the channel. - public let showReplyInChannel: Bool - /// Mentioned users (see `User`). - public let mentionedUsers: [User] - /// An extra data for the message. - public let extraData: Codable? -} - -public struct ChannelWrapper: Encodable { - /// Coding keys for the encoding. - private enum CodingKeys: String, CodingKey { - case id - case cid - case type - case name - case imageURL = "image" - case members - case lastMessageDate = "last_message_at" - case createdBy = "created_by" - case created = "created_at" - case deleted = "deleted_at" - case frozen - } - - init(channel: Channel) { - id = channel.id - cid = channel.cid - type = channel.type - name = channel.name - imageURL = channel.imageURL - lastMessageDate = channel.lastMessageDate - created = channel.created - deleted = channel.deleted - createdBy = channel.createdBy - config = channel.config - frozen = channel.frozen - extraData = channel.extraData - } - - /// A channel id. - public let id: String - /// A channel type + id. - public let cid: ChannelId - /// A channel type. - public let type: ChannelType - /// A channel name. - public let name: String? - /// An image of the channel. - public let imageURL: URL? - /// The last message date. - public let lastMessageDate: Date? - /// A channel created date. - public let created: Date - /// A channel deleted date. - public let deleted: Date? - /// A creator of the channel. - public let createdBy: User? - /// A config. - public let config: Channel.Config - /// Checks if the channel is frozen. - public let frozen: Bool - /// A list of user ids of the channel members. - public let members = Set() - /// An extra data for the channel. - public let extraData: Codable? -} +//public struct MessageWrapper: Encodable { +// private enum CodingKeys: String, CodingKey { +// case id +// case channel +// case type +// case user +// case created = "created_at" +// case updated = "updated_at" +// case text +// case command +// case args +// case attachments +// case parentId = "parent_id" +// case showReplyInChannel = "show_in_channel" +// case mentionedUsers = "mentioned_users" +// } +// +// init(channel: Channel, message: Message) { +// id = message.id +// type = message.type +// user = message.user +// created = message.created +// updated = message.updated +// text = message.text +// command = message.command +// args = message.args +// attachments = message.attachments +// parentId = message.parentId +// showReplyInChannel = message.showReplyInChannel +// mentionedUsers = message.mentionedUsers +// extraData = message.extraData +// self.channel = ChannelWrapper(channel: channel) +// } +// +// /// A message id. +// public let id: String +// /// The channel cid. +// public let channel: ChannelWrapper? +// /// A message type (see `MessageType`). +// public let type: MessageType +// /// A user (see `User`). +// public let user: User +// /// A created date. +// public let created: Date +// /// A updated date. +// public let updated: Date +// /// A text. +// public let text: String +// /// A used command name. +// public let command: String? +// /// A used command args. +// public let args: String? +// /// Attachments (see `Attachment`). +// public let attachments: [Attachment] +// /// A parent message id. +// public let parentId: String? +// /// Check if this reply message needs to show in the channel. +// public let showReplyInChannel: Bool +// /// Mentioned users (see `User`). +// public let mentionedUsers: [User] +// /// An extra data for the message. +// public let extraData: Codable? +//} +// +//public struct ChannelWrapper: Encodable { +// /// Coding keys for the encoding. +// private enum CodingKeys: String, CodingKey { +// case id +// case cid +// case type +// case name +// case imageURL = "image" +// case members +// case lastMessageDate = "last_message_at" +// case createdBy = "created_by" +// case created = "created_at" +// case deleted = "deleted_at" +// case frozen +// } +// +// init(channel: Channel) { +// id = channel.id +// cid = channel.cid +// type = channel.type +// name = channel.name +// imageURL = channel.imageURL +// lastMessageDate = channel.lastMessageDate +// created = channel.created +// deleted = channel.deleted +// createdBy = channel.createdBy +// config = channel.config +// frozen = channel.frozen +// extraData = channel.extraData +// } +// +// /// A channel id. +// public let id: String +// /// A channel type + id. +// public let cid: ChannelId +// /// A channel type. +// public let type: ChannelType +// /// A channel name. +// public let name: String? +// /// An image of the channel. +// public let imageURL: URL? +// /// The last message date. +// public let lastMessageDate: Date? +// /// A channel created date. +// public let created: Date +// /// A channel deleted date. +// public let deleted: Date? +// /// A creator of the channel. +// public let createdBy: User? +// /// A config. +// public let config: Channel.Config +// /// Checks if the channel is frozen. +// public let frozen: Bool +// /// A list of user ids of the channel members. +// public let members = Set() +// /// An extra data for the channel. +// public let extraData: Codable? +//} diff --git a/example/ios/Podfile b/example/ios/Podfile index ad84eb7b..63861e27 100644 --- a/example/ios/Podfile +++ b/example/ios/Podfile @@ -10,81 +10,34 @@ project 'Runner', { 'Release' => :release, } -def parse_KV_file(file, separator='=') - file_abs_path = File.expand_path(file) - if !File.exists? file_abs_path - return []; +def flutter_root + generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__) + unless File.exist?(generated_xcode_build_settings_path) + raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first" end - generated_key_values = {} - skip_line_start_symbols = ["#", "/"] - 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 + + File.foreach(generated_xcode_build_settings_path) do |line| + matches = line.match(/FLUTTER_ROOT\=(.*)/) + return matches[1].strip if matches end - generated_key_values + raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get" end +require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) + +flutter_ios_podfile_setup + target 'Runner' do use_frameworks! use_modular_headers! - - # 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' - pod 'StreamChatClient' - # 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.each do |name, path| - symlink = File.join('.symlinks', 'plugins', name) - File.symlink(path, symlink) - pod name, :path => File.join(symlink, 'ios') - end + flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) 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 +pod 'StreamChatClient' post_install do |installer| installer.pods_project.targets.each do |target| - target.build_configurations.each do |config| - config.build_settings['ENABLE_BITCODE'] = 'NO' - end + flutter_additional_ios_build_settings(target) end end diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index a3821dbf..28b42300 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -1,82 +1,74 @@ PODS: - - DKImagePickerController/Core (4.2.2): + - DKImagePickerController/Core (4.3.2): - DKImagePickerController/ImageDataManager - DKImagePickerController/Resource - - DKImagePickerController/ImageDataManager (4.2.2) - - DKImagePickerController/PhotoGallery (4.2.2): + - DKImagePickerController/ImageDataManager (4.3.2) + - DKImagePickerController/PhotoGallery (4.3.2): - DKImagePickerController/Core - DKPhotoGallery - - DKImagePickerController/Resource (4.2.2) - - DKPhotoGallery (0.0.14): - - DKPhotoGallery/Core (= 0.0.14) - - DKPhotoGallery/Model (= 0.0.14) - - DKPhotoGallery/Preview (= 0.0.14) - - DKPhotoGallery/Resource (= 0.0.14) + - DKImagePickerController/Resource (4.3.2) + - DKPhotoGallery (0.0.17): + - DKPhotoGallery/Core (= 0.0.17) + - DKPhotoGallery/Model (= 0.0.17) + - DKPhotoGallery/Preview (= 0.0.17) + - DKPhotoGallery/Resource (= 0.0.17) - SDWebImage - - SDWebImageFLPlugin - - DKPhotoGallery/Core (0.0.14): + - SwiftyGif + - DKPhotoGallery/Core (0.0.17): - DKPhotoGallery/Model - DKPhotoGallery/Preview - SDWebImage - - SDWebImageFLPlugin - - DKPhotoGallery/Model (0.0.14): + - SwiftyGif + - DKPhotoGallery/Model (0.0.17): - SDWebImage - - SDWebImageFLPlugin - - DKPhotoGallery/Preview (0.0.14): + - SwiftyGif + - DKPhotoGallery/Preview (0.0.17): - DKPhotoGallery/Model - DKPhotoGallery/Resource - SDWebImage - - SDWebImageFLPlugin - - DKPhotoGallery/Resource (0.0.14): + - SwiftyGif + - DKPhotoGallery/Resource (0.0.17): - SDWebImage - - SDWebImageFLPlugin + - SwiftyGif - file_picker (0.0.1): - DKImagePickerController/PhotoGallery - Flutter - - Firebase/Core (6.20.0): + - Firebase/CoreOnly (6.26.0): + - FirebaseCore (= 6.7.2) + - Firebase/Messaging (6.26.0): - Firebase/CoreOnly - - FirebaseAnalytics (= 6.3.1) - - Firebase/CoreOnly (6.20.0): - - FirebaseCore (= 6.6.4) - - Firebase/Messaging (6.20.0): - - Firebase/CoreOnly - - FirebaseMessaging (~> 4.3.0) - - firebase_messaging (0.0.1): - - Firebase/Core - - Firebase/Messaging + - FirebaseMessaging (~> 4.4.1) + - firebase_core (0.5.0): + - Firebase/CoreOnly (~> 6.26.0) + - Flutter + - firebase_messaging (7.0.2): + - Firebase/CoreOnly (~> 6.26.0) + - Firebase/Messaging (~> 6.26.0) + - firebase_core - Flutter - - FirebaseAnalytics (6.3.1): - - FirebaseCore (~> 6.6) - - FirebaseInstallations (~> 1.1) - - GoogleAppMeasurement (= 6.3.1) - - GoogleUtilities/AppDelegateSwizzler (~> 6.0) - - GoogleUtilities/MethodSwizzler (~> 6.0) - - GoogleUtilities/Network (~> 6.0) - - "GoogleUtilities/NSData+zlib (~> 6.0)" - - nanopb (= 0.3.9011) - FirebaseAnalyticsInterop (1.5.0) - - FirebaseCore (6.6.4): - - FirebaseCoreDiagnostics (~> 1.2) + - FirebaseCore (6.7.2): + - FirebaseCoreDiagnostics (~> 1.3) - FirebaseCoreDiagnosticsInterop (~> 1.2) - GoogleUtilities/Environment (~> 6.5) - GoogleUtilities/Logger (~> 6.5) - - FirebaseCoreDiagnostics (1.2.2): - - FirebaseCoreDiagnosticsInterop (~> 1.2) - - GoogleDataTransportCCTSupport (~> 2.0) - - GoogleUtilities/Environment (~> 6.5) - - GoogleUtilities/Logger (~> 6.5) - - nanopb (~> 0.3.901) + - FirebaseCoreDiagnostics (1.7.0): + - GoogleDataTransport (~> 7.4) + - GoogleUtilities/Environment (~> 6.7) + - GoogleUtilities/Logger (~> 6.7) + - nanopb (~> 1.30906.0) - FirebaseCoreDiagnosticsInterop (1.2.0) - - FirebaseInstallations (1.1.0): + - FirebaseInstallations (1.3.0): - FirebaseCore (~> 6.6) - - GoogleUtilities/UserDefaults (~> 6.5) + - GoogleUtilities/Environment (~> 6.6) + - GoogleUtilities/UserDefaults (~> 6.6) - PromisesObjC (~> 1.2) - - FirebaseInstanceID (4.3.2): + - FirebaseInstanceID (4.3.4): - FirebaseCore (~> 6.6) - FirebaseInstallations (~> 1.0) - GoogleUtilities/Environment (~> 6.5) - GoogleUtilities/UserDefaults (~> 6.5) - - FirebaseMessaging (4.3.0): + - FirebaseMessaging (4.4.1): - FirebaseAnalyticsInterop (~> 1.5) - FirebaseCore (~> 6.6) - FirebaseInstanceID (~> 4.3) @@ -85,119 +77,99 @@ PODS: - GoogleUtilities/Reachability (~> 6.5) - GoogleUtilities/UserDefaults (~> 6.5) - Protobuf (>= 3.9.2, ~> 3.9) - - FLAnimatedImage (1.0.12) - Flutter (1.0.0) - flutter_apns (0.0.1): - Flutter - - flutter_keyboard_visibility (0.7.0): + - flutter_keyboard_visibility (0.0.1): - Flutter - flutter_local_notifications (0.0.1): - Flutter - - flutter_plugin_android_lifecycle (0.0.1): - - Flutter - FMDB (2.7.5): - FMDB/standard (= 2.7.5) - FMDB/standard (2.7.5) - - GoogleAppMeasurement (6.3.1): - - GoogleUtilities/AppDelegateSwizzler (~> 6.0) - - GoogleUtilities/MethodSwizzler (~> 6.0) - - GoogleUtilities/Network (~> 6.0) - - "GoogleUtilities/NSData+zlib (~> 6.0)" - - nanopb (= 0.3.9011) - - GoogleDataTransport (5.0.0) - - GoogleDataTransportCCTSupport (2.0.0): - - GoogleDataTransport (~> 5.0) - - nanopb (~> 0.3.901) - - GoogleUtilities/AppDelegateSwizzler (6.5.2): + - GoogleDataTransport (7.4.0): + - nanopb (~> 1.30906.0) + - GoogleUtilities/AppDelegateSwizzler (6.7.2): - GoogleUtilities/Environment - GoogleUtilities/Logger - GoogleUtilities/Network - - GoogleUtilities/Environment (6.5.2) - - GoogleUtilities/Logger (6.5.2): + - GoogleUtilities/Environment (6.7.2): + - PromisesObjC (~> 1.2) + - GoogleUtilities/Logger (6.7.2): - GoogleUtilities/Environment - - GoogleUtilities/MethodSwizzler (6.5.2): - - GoogleUtilities/Logger - - GoogleUtilities/Network (6.5.2): + - GoogleUtilities/Network (6.7.2): - GoogleUtilities/Logger - "GoogleUtilities/NSData+zlib" - GoogleUtilities/Reachability - - "GoogleUtilities/NSData+zlib (6.5.2)" - - GoogleUtilities/Reachability (6.5.2): + - "GoogleUtilities/NSData+zlib (6.7.2)" + - GoogleUtilities/Reachability (6.7.2): - GoogleUtilities/Logger - - GoogleUtilities/UserDefaults (6.5.2): + - GoogleUtilities/UserDefaults (6.7.2): - GoogleUtilities/Logger - - GzipSwift (5.1.1) - image_picker (0.0.1): - Flutter - - moor_ffi (0.0.1): - - Flutter - - nanopb (0.3.9011): - - nanopb/decode (= 0.3.9011) - - nanopb/encode (= 0.3.9011) - - nanopb/decode (0.3.9011) - - nanopb/encode (0.3.9011) + - nanopb (1.30906.0): + - nanopb/decode (= 1.30906.0) + - nanopb/encode (= 1.30906.0) + - nanopb/decode (1.30906.0) + - nanopb/encode (1.30906.0) - path_provider (0.0.1): - Flutter - - path_provider_macos (0.0.1): - - Flutter - - PromisesObjC (1.2.8) - - Protobuf (3.11.4) - - ReachabilitySwift (5.0.0) - - SDWebImage (5.8.0): - - SDWebImage/Core (= 5.8.0) - - SDWebImage/Core (5.8.0) - - SDWebImageFLPlugin (0.4.0): - - FLAnimatedImage (>= 1.0.11) - - SDWebImage/Core (~> 5.6) + - PromisesObjC (1.2.10) + - Protobuf (3.13.0) + - SDWebImage (5.9.2): + - SDWebImage/Core (= 5.9.2) + - SDWebImage/Core (5.9.2) - shared_preferences (0.0.1): - Flutter - - shared_preferences_macos (0.0.1): - - Flutter - - shared_preferences_web (0.0.1): - - Flutter - sqflite (0.0.1): - Flutter - FMDB (~> 2.7.2) - - Starscream (3.1.1) - - StreamChatClient (2.0.1): - - GzipSwift (~> 5.1) - - ReachabilitySwift (~> 5.0) - - Starscream (~> 3.1) + - sqlite3 (3.32.3): + - sqlite3/common (= 3.32.3) + - sqlite3/common (3.32.3) + - sqlite3/fts5 (3.32.3): + - sqlite3/common + - sqlite3/json1 (3.32.3): + - sqlite3/common + - sqlite3/perf-threadsafe (3.32.3): + - sqlite3/common + - sqlite3/rtree (3.32.3): + - sqlite3/common + - sqlite3_flutter_libs (0.0.1): + - Flutter + - sqlite3 (~> 3.32.3) + - sqlite3/fts5 + - sqlite3/json1 + - sqlite3/perf-threadsafe + - sqlite3/rtree + - Starscream (4.0.4) + - StreamChatClient (2.4.0): + - Starscream (~> 4.0) + - SwiftyGif (5.3.0) - url_launcher (0.0.1): - Flutter - - url_launcher_macos (0.0.1): - - Flutter - - url_launcher_web (0.0.1): - - Flutter - video_player (0.0.1): - Flutter - - video_player_web (0.0.1): - - Flutter - wakelock (0.0.1): - Flutter DEPENDENCIES: - file_picker (from `.symlinks/plugins/file_picker/ios`) + - firebase_core (from `.symlinks/plugins/firebase_core/ios`) - firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`) - Flutter (from `Flutter`) - flutter_apns (from `.symlinks/plugins/flutter_apns/ios`) - flutter_keyboard_visibility (from `.symlinks/plugins/flutter_keyboard_visibility/ios`) - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`) - - flutter_plugin_android_lifecycle (from `.symlinks/plugins/flutter_plugin_android_lifecycle/ios`) - image_picker (from `.symlinks/plugins/image_picker/ios`) - - moor_ffi (from `.symlinks/plugins/moor_ffi/ios`) - path_provider (from `.symlinks/plugins/path_provider/ios`) - - path_provider_macos (from `.symlinks/plugins/path_provider_macos/ios`) - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`) - - shared_preferences_macos (from `.symlinks/plugins/shared_preferences_macos/ios`) - - shared_preferences_web (from `.symlinks/plugins/shared_preferences_web/ios`) - sqflite (from `.symlinks/plugins/sqflite/ios`) + - sqlite3_flutter_libs (from `.symlinks/plugins/sqlite3_flutter_libs/ios`) - StreamChatClient - url_launcher (from `.symlinks/plugins/url_launcher/ios`) - - url_launcher_macos (from `.symlinks/plugins/url_launcher_macos/ios`) - - url_launcher_web (from `.symlinks/plugins/url_launcher_web/ios`) - video_player (from `.symlinks/plugins/video_player/ios`) - - video_player_web (from `.symlinks/plugins/video_player_web/ios`) - wakelock (from `.symlinks/plugins/wakelock/ios`) SPEC REPOS: @@ -205,7 +177,6 @@ SPEC REPOS: - DKImagePickerController - DKPhotoGallery - Firebase - - FirebaseAnalytics - FirebaseAnalyticsInterop - FirebaseCore - FirebaseCoreDiagnostics @@ -213,25 +184,23 @@ SPEC REPOS: - FirebaseInstallations - FirebaseInstanceID - FirebaseMessaging - - FLAnimatedImage - FMDB - - GoogleAppMeasurement - GoogleDataTransport - - GoogleDataTransportCCTSupport - GoogleUtilities - - GzipSwift - nanopb - PromisesObjC - Protobuf - - ReachabilitySwift - SDWebImage - - SDWebImageFLPlugin + - sqlite3 - Starscream - StreamChatClient + - SwiftyGif EXTERNAL SOURCES: file_picker: :path: ".symlinks/plugins/file_picker/ios" + firebase_core: + :path: ".symlinks/plugins/firebase_core/ios" firebase_messaging: :path: ".symlinks/plugins/firebase_messaging/ios" Flutter: @@ -242,86 +211,61 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/flutter_keyboard_visibility/ios" flutter_local_notifications: :path: ".symlinks/plugins/flutter_local_notifications/ios" - flutter_plugin_android_lifecycle: - :path: ".symlinks/plugins/flutter_plugin_android_lifecycle/ios" image_picker: :path: ".symlinks/plugins/image_picker/ios" - moor_ffi: - :path: ".symlinks/plugins/moor_ffi/ios" path_provider: :path: ".symlinks/plugins/path_provider/ios" - path_provider_macos: - :path: ".symlinks/plugins/path_provider_macos/ios" shared_preferences: :path: ".symlinks/plugins/shared_preferences/ios" - shared_preferences_macos: - :path: ".symlinks/plugins/shared_preferences_macos/ios" - shared_preferences_web: - :path: ".symlinks/plugins/shared_preferences_web/ios" sqflite: :path: ".symlinks/plugins/sqflite/ios" + sqlite3_flutter_libs: + :path: ".symlinks/plugins/sqlite3_flutter_libs/ios" url_launcher: :path: ".symlinks/plugins/url_launcher/ios" - url_launcher_macos: - :path: ".symlinks/plugins/url_launcher_macos/ios" - url_launcher_web: - :path: ".symlinks/plugins/url_launcher_web/ios" video_player: :path: ".symlinks/plugins/video_player/ios" - video_player_web: - :path: ".symlinks/plugins/video_player_web/ios" wakelock: :path: ".symlinks/plugins/wakelock/ios" SPEC CHECKSUMS: - DKImagePickerController: 4a3e7948a848c4348e600b3fe5ce41478835fa10 - DKPhotoGallery: 0290d32343574f06eaa4c26f8f2f8a1035e916be + DKImagePickerController: b5eb7f7a388e4643264105d648d01f727110fc3d + DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179 file_picker: 3e6c3790de664ccf9b882732d9db5eaf6b8d4eb1 - Firebase: fe7f74012742ab403451dd283e6909b8f1fb348a - firebase_messaging: 21344b3b3a7d9d325d63a70e3750c0c798fe1e03 - FirebaseAnalytics: 572e467f3d977825266e8ccd52674aa3e6f47eac + Firebase: 7cf5f9c67f03cb3b606d1d6535286e1080e57eb6 + firebase_core: 3134fe79d257d430f163b558caf52a10a87efe8a + firebase_messaging: 2844c37f9ce87c0904b38fe435223161b1a71528 FirebaseAnalyticsInterop: 3f86269c38ae41f47afeb43ebf32a001f58fcdae - FirebaseCore: ed0a24c758a57c2b88c5efa8e6a8195e868af589 - FirebaseCoreDiagnostics: e9b4cd8ba60dee0f2d13347332e4b7898cca5b61 + FirebaseCore: f42e5e5f382cdcf6b617ed737bf6c871a6947b17 + FirebaseCoreDiagnostics: 770ac5958e1372ce67959ae4b4f31d8e127c3ac1 FirebaseCoreDiagnosticsInterop: 296e2c5f5314500a850ad0b83e9e7c10b011a850 - FirebaseInstallations: 575cd32f2aec0feeb0e44f5d0110a09e5e60b47b - FirebaseInstanceID: 7ee0d6777013bb952f377b41965bf132b6a075be - FirebaseMessaging: 4ec33842d36b3319e062e51fb8b35a74f726950d - FLAnimatedImage: 4a0b56255d9b05f18b6dd7ee06871be5d3b89e31 + FirebaseInstallations: 6f5f680e65dc374397a483c32d1799ba822a395b + FirebaseInstanceID: cef67c4967c7cecb56ea65d8acbb4834825c587b + FirebaseMessaging: 29543feb343b09546ab3aa04d008ee8595b43c44 Flutter: 0e3d915762c693b495b44d77113d4970485de6ec flutter_apns: f516b118e423fe7c0a38771180549c4d6cb67c2f - flutter_keyboard_visibility: 6195387fb6d8f46e5cd6dda4a4154e41f800f545 + flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069 flutter_local_notifications: 9e4738ce2471c5af910d961a6b7eadcf57c50186 - flutter_plugin_android_lifecycle: dc0b544e129eebb77a6bfb1239d4d1c673a60a35 FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a - GoogleAppMeasurement: c29d405ff76e18551b5d158eaba6753fda8c7542 - GoogleDataTransport: a857c6a002d201b524dd4bc2ed7e7355ed07e785 - GoogleDataTransportCCTSupport: 32f75fbe904c82772fcbb6b6bd4525bfb6f2a862 - GoogleUtilities: ad0f3b691c67909d03a3327cc205222ab8f42e0e - GzipSwift: 893f3e48e597a1a4f62fafcb6514220fcf8287fa - image_picker: 66aa71bc96850a90590a35d4c4a2907b0d823109 - moor_ffi: d66c9470c18e9cb333423bbcb493c105c6c774c6 - nanopb: 18003b5e52dab79db540fe93fe9579f399bd1ccd + GoogleDataTransport: b7f406340a291370045a270c599e53c6fa6ec20f + GoogleUtilities: 7f2f5a07f888cdb145101d6042bc4422f57e70b3 + image_picker: 9c3312491f862b28d21ecd8fdf0ee14e601b3f09 + nanopb: 59317e09cf1f1a0af72f12af412d54edf52603fc path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c - path_provider_macos: f760a3c5b04357c380e2fddb6f9db6f3015897e0 - PromisesObjC: c119f3cd559f50b7ae681fa59dc1acd19173b7e6 - Protobuf: 176220c526ad8bd09ab1fb40a978eac3fef665f7 - ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825 - SDWebImage: 84000f962cbfa70c07f19d2234cbfcf5d779b5dc - SDWebImageFLPlugin: 6c2295fb1242d44467c6c87dc5db6b0a13228fd8 + PromisesObjC: b14b1c6b68e306650688599de8a45e49fae81151 + Protobuf: 3dac39b34a08151c6d949560efe3f86134a3f748 + SDWebImage: 0b42b8719ab0c5257177d5894306e8a336b21cbb shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d - shared_preferences_macos: f3f29b71ccbb56bf40c9dd6396c9acf15e214087 - shared_preferences_web: 141cce0c3ed1a1c5bf2a0e44f52d31eeb66e5ea9 sqflite: 4001a31ff81d210346b500c55b17f4d6c7589dd0 - Starscream: 4bb2f9942274833f7b4d296a55504dcfc7edb7b0 - StreamChatClient: 91b0f585e7dc92ade58e657daffafb16d485b2a6 + sqlite3: 8f7d2078ae27778699a622a94b853285793422a2 + sqlite3_flutter_libs: 5651f8ff48e3b44d910863c4ea5916085b1b245f + Starscream: 5178aed56b316f13fa3bc55694e583d35dd414d9 + StreamChatClient: 8c83a141e753e45fa096ff56d4b782d59e46f251 + SwiftyGif: e466e86c660d343357ab944a819a101c4127cb40 url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef - url_launcher_macos: fd7894421cd39320dce5f292fc99ea9270b2a313 - url_launcher_web: e5527357f037c87560776e36436bf2b0288b965c video_player: 9cc823b1d9da7e8427ee591e8438bfbcde500e6e - video_player_web: da8cadb8274ed4f8dbee8d7171b420dedd437ce7 wakelock: 0d4a70faf8950410735e3f61fb15d517c8a6efc4 -PODFILE CHECKSUM: 5cc7e2f1316491ee530029e2e8391f4100d41fbd +PODFILE CHECKSUM: eb001256612a59f8f9e4d083ad8b9671e69dd184 COCOAPODS: 1.8.4 diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj index 456c5e1f..58907d4a 100644 --- a/example/ios/Runner.xcodeproj/project.pbxproj +++ b/example/ios/Runner.xcodeproj/project.pbxproj @@ -308,9 +308,60 @@ files = ( ); inputPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/Starscream-framework/Starscream.framework", + "${BUILT_PRODUCTS_DIR}/StreamChatClient-framework/StreamChatClient.framework", + "${BUILT_PRODUCTS_DIR}/DKImagePickerController/DKImagePickerController.framework", + "${BUILT_PRODUCTS_DIR}/DKPhotoGallery/DKPhotoGallery.framework", + "${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework", + "${PODS_ROOT}/../Flutter/Flutter.framework", + "${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework", + "${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework", + "${BUILT_PRODUCTS_DIR}/Protobuf/Protobuf.framework", + "${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework", + "${BUILT_PRODUCTS_DIR}/SwiftyGif/SwiftyGif.framework", + "${BUILT_PRODUCTS_DIR}/file_picker/file_picker.framework", + "${BUILT_PRODUCTS_DIR}/flutter_apns/flutter_apns.framework", + "${BUILT_PRODUCTS_DIR}/flutter_keyboard_visibility/flutter_keyboard_visibility.framework", + "${BUILT_PRODUCTS_DIR}/flutter_local_notifications/flutter_local_notifications.framework", + "${BUILT_PRODUCTS_DIR}/image_picker/image_picker.framework", + "${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework", + "${BUILT_PRODUCTS_DIR}/path_provider/path_provider.framework", + "${BUILT_PRODUCTS_DIR}/shared_preferences/shared_preferences.framework", + "${BUILT_PRODUCTS_DIR}/sqflite/sqflite.framework", + "${BUILT_PRODUCTS_DIR}/sqlite3/sqlite3.framework", + "${BUILT_PRODUCTS_DIR}/sqlite3_flutter_libs/sqlite3_flutter_libs.framework", + "${BUILT_PRODUCTS_DIR}/url_launcher/url_launcher.framework", + "${BUILT_PRODUCTS_DIR}/video_player/video_player.framework", + "${BUILT_PRODUCTS_DIR}/wakelock/wakelock.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Starscream.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/StreamChatClient.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DKImagePickerController.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/DKPhotoGallery.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FMDB.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Protobuf.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftyGif.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/file_picker.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_apns.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_keyboard_visibility.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_local_notifications.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/image_picker.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqflite.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqlite3.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqlite3_flutter_libs.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_player.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/wakelock.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -489,7 +540,6 @@ }; 249021D3217E4FDB00AE95B9 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -573,7 +623,6 @@ }; 97C147031CF9000F007C117D /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -629,7 +678,6 @@ }; 97C147041CF9000F007C117D /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 9e62c5e5..fe31540a 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -1,7 +1,7 @@ name: example description: A new Flutter project. -version: 1.0.6+7 +version: 1.0.7+8 environment: sdk: ">=2.2.2 <3.0.0"