Skip to content

Commit b0ab5fd

Browse files
imtooriimtoori
authored
Merge pull request GetStream#74 from GetStream/release/4.0
Release/4.0
2 parents 2ea26e2 + 1ff344f commit b0ab5fd

23 files changed

+1035
-1134
lines changed

‎packages/chatty/lib/ui/common/my_channel_preview.dart‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
import 'package:collection/collection.dart' show IterableExtension;
22
import 'package:flutter/material.dart';
3-
import 'package:flutter/widgets.dart';
4-
import 'package:jiffy/jiffy.dart';
53
import 'package:stream_chat_flutter/stream_chat_flutter.dart';
6-
import 'package:stream_chat_flutter_core/stream_chat_flutter_core.dart';
74

85
/*Navigator.push(
96
context,

‎packages/imessage/lib/message_page.dart‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import 'package:flutter/cupertino.dart';
2-
import 'package:flutter/material.dart';
32
import 'package:imessage/message_list_view.dart';
43
import 'package:stream_chat_flutter_core/stream_chat_flutter_core.dart'
54
show

‎packages/stream_chat_v1/ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 46;
6+
objectVersion = 50;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -177,7 +177,7 @@
177177
isa = PBXProject;
178178
attributes = {
179179
LastSwiftUpdateCheck = 1140;
180-
LastUpgradeCheck = 1020;
180+
LastUpgradeCheck = 1300;
181181
ORGANIZATIONNAME = "The Chromium Authors";
182182
TargetAttributes = {
183183
97C146ED1CF9000F007C117D = {
@@ -245,7 +245,7 @@
245245
"${BUILT_PRODUCTS_DIR}/DKImagePickerController/DKImagePickerController.framework",
246246
"${BUILT_PRODUCTS_DIR}/DKPhotoGallery/DKPhotoGallery.framework",
247247
"${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework",
248-
"${BUILT_PRODUCTS_DIR}/Reachability/Reachability.framework",
248+
"${BUILT_PRODUCTS_DIR}/ReachabilitySwift/Reachability.framework",
249249
"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
250250
"${BUILT_PRODUCTS_DIR}/SwiftyGif/SwiftyGif.framework",
251251
"${BUILT_PRODUCTS_DIR}/connectivity_plus/connectivity_plus.framework",
@@ -256,16 +256,16 @@
256256
"${BUILT_PRODUCTS_DIR}/image_gallery_saver/image_gallery_saver.framework",
257257
"${BUILT_PRODUCTS_DIR}/image_picker/image_picker.framework",
258258
"${BUILT_PRODUCTS_DIR}/libwebp/libwebp.framework",
259-
"${BUILT_PRODUCTS_DIR}/path_provider/path_provider.framework",
259+
"${BUILT_PRODUCTS_DIR}/path_provider_ios/path_provider_ios.framework",
260260
"${BUILT_PRODUCTS_DIR}/photo_manager/photo_manager.framework",
261261
"${BUILT_PRODUCTS_DIR}/share_plus/share_plus.framework",
262-
"${BUILT_PRODUCTS_DIR}/shared_preferences/shared_preferences.framework",
262+
"${BUILT_PRODUCTS_DIR}/shared_preferences_ios/shared_preferences_ios.framework",
263263
"${BUILT_PRODUCTS_DIR}/sqflite/sqflite.framework",
264264
"${BUILT_PRODUCTS_DIR}/sqlite3/sqlite3.framework",
265265
"${BUILT_PRODUCTS_DIR}/sqlite3_flutter_libs/sqlite3_flutter_libs.framework",
266-
"${BUILT_PRODUCTS_DIR}/url_launcher/url_launcher.framework",
266+
"${BUILT_PRODUCTS_DIR}/url_launcher_ios/url_launcher_ios.framework",
267267
"${BUILT_PRODUCTS_DIR}/video_compress/video_compress.framework",
268-
"${BUILT_PRODUCTS_DIR}/video_player/video_player.framework",
268+
"${BUILT_PRODUCTS_DIR}/video_player_avfoundation/video_player_avfoundation.framework",
269269
"${BUILT_PRODUCTS_DIR}/video_thumbnail/video_thumbnail.framework",
270270
"${BUILT_PRODUCTS_DIR}/wakelock/wakelock.framework",
271271
);
@@ -285,16 +285,16 @@
285285
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/image_gallery_saver.framework",
286286
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/image_picker.framework",
287287
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/libwebp.framework",
288-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider.framework",
288+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider_ios.framework",
289289
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/photo_manager.framework",
290290
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/share_plus.framework",
291-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences.framework",
291+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences_ios.framework",
292292
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqflite.framework",
293293
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqlite3.framework",
294294
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqlite3_flutter_libs.framework",
295-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher.framework",
295+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher_ios.framework",
296296
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_compress.framework",
297-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_player.framework",
297+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_player_avfoundation.framework",
298298
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_thumbnail.framework",
299299
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/wakelock.framework",
300300
);
@@ -442,7 +442,10 @@
442442
);
443443
INFOPLIST_FILE = Runner/Info.plist;
444444
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
445-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
445+
LD_RUNPATH_SEARCH_PATHS = (
446+
"$(inherited)",
447+
"@executable_path/Frameworks",
448+
);
446449
LIBRARY_SEARCH_PATHS = (
447450
"$(inherited)",
448451
"$(PROJECT_DIR)/Flutter",
@@ -581,7 +584,10 @@
581584
);
582585
INFOPLIST_FILE = Runner/Info.plist;
583586
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
584-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
587+
LD_RUNPATH_SEARCH_PATHS = (
588+
"$(inherited)",
589+
"@executable_path/Frameworks",
590+
);
585591
LIBRARY_SEARCH_PATHS = (
586592
"$(inherited)",
587593
"$(PROJECT_DIR)/Flutter",
@@ -615,7 +621,10 @@
615621
);
616622
INFOPLIST_FILE = Runner/Info.plist;
617623
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
618-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
624+
LD_RUNPATH_SEARCH_PATHS = (
625+
"$(inherited)",
626+
"@executable_path/Frameworks",
627+
);
619628
LIBRARY_SEARCH_PATHS = (
620629
"$(inherited)",
621630
"$(PROJECT_DIR)/Flutter",

‎packages/stream_chat_v1/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1020"
3+
LastUpgradeVersion = "1300"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎packages/stream_chat_v1/lib/advanced_options_page.dart‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import 'package:example/localizations.dart';
33
import 'package:example/routes/routes.dart';
44
import 'package:example/stream_version.dart';
55
import 'package:flutter/material.dart';
6-
import 'package:flutter/services.dart';
76
import 'package:flutter_secure_storage/flutter_secure_storage.dart';
87
import 'package:stream_chat_flutter/stream_chat_flutter.dart';
98

0 commit comments

Comments
 (0)