Skip to content

Commit c457a00

Browse files
vdovbnya-qbvdovbnya-qb
authored
Merge pull request #20 from QuickBlox/update_chat_sample
1.0.1-chat-flutter
2 parents d62309b + 1c8ca66 commit c457a00

File tree

4 files changed

+46
-46
lines changed

4 files changed

+46
-46
lines changed

‎chat_sample/android/app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
2626
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2727

2828
android {
29-
compileSdkVersion 31
29+
compileSdkVersion 33
3030

3131
sourceSets {
3232
main.java.srcDirs += 'src/main/kotlin'
@@ -39,7 +39,7 @@ android {
3939
defaultConfig {
4040
applicationId "com.quickblox.flutter.chat"
4141
minSdkVersion 21
42-
targetSdkVersion 31
42+
targetSdkVersion 33
4343
versionCode flutterVersionCode.toInteger()
4444
versionName flutterVersionName
4545
}

‎chat_sample/ios/Flutter/AppFrameworkInfo.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>9.0</string>
24+
<string>11.0</string>
2525
</dict>
2626
</plist>

‎chat_sample/ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88

99
/* Begin PBXBuildFile section */
1010
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
11+
23834C09F9B80D9D5E149150 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2A793675D49DBF32DAE5DB5D /* Pods_Runner.framework */; };
1112
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
1213
74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
1314
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
1415
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
1516
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
16-
FB482B9FD309770746597056 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 938AAEC0E4248FBA4D70B126 /* Pods_Runner.framework */; };
1717
/* End PBXBuildFile section */
1818

1919
/* Begin PBXCopyFilesBuildPhase section */
@@ -32,35 +32,43 @@
3232
/* Begin PBXFileReference section */
3333
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
3434
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
35-
1FDDCB6FAA351E09F8EEF5BE /* 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 = "<group>"; };
35+
2A793675D49DBF32DAE5DB5D /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
36+
386B22149122897B75925F59 /* 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 = "<group>"; };
3637
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
3738
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
3839
74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
39-
77C9D257E7D45A706B669099 /* 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 = "<group>"; };
4040
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
41-
853B7C1D126BD39716A43C52 /* 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 = "<group>"; };
42-
938AAEC0E4248FBA4D70B126 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
41+
8A3EEFCD9DA5A1769870EB73 /* 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 = "<group>"; };
4342
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
4443
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
4544
97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
4645
97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
4746
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
4847
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
4948
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
49+
B78F2434FCACD3DF3AA4EC3B /* 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 = "<group>"; };
5050
/* End PBXFileReference section */
5151

5252
/* Begin PBXFrameworksBuildPhase section */
5353
97C146EB1CF9000F007C117D /* Frameworks */ = {
5454
isa = PBXFrameworksBuildPhase;
5555
buildActionMask = 2147483647;
5656
files = (
57-
FB482B9FD309770746597056 /* Pods_Runner.framework in Frameworks */,
57+
23834C09F9B80D9D5E149150 /* Pods_Runner.framework in Frameworks */,
5858
);
5959
runOnlyForDeploymentPostprocessing = 0;
6060
};
6161
/* End PBXFrameworksBuildPhase section */
6262

6363
/* Begin PBXGroup section */
64+
44B972EC7CCA97D335CBFFA5 /* Frameworks */ = {
65+
isa = PBXGroup;
66+
children = (
67+
2A793675D49DBF32DAE5DB5D /* Pods_Runner.framework */,
68+
);
69+
name = Frameworks;
70+
sourceTree = "<group>";
71+
};
6472
9740EEB11CF90186004384FC /* Flutter */ = {
6573
isa = PBXGroup;
6674
children = (
@@ -79,7 +87,7 @@
7987
97C146F01CF9000F007C117D /* Runner */,
8088
97C146EF1CF9000F007C117D /* Products */,
8189
B44C99286DD213B7F44F735D /* Pods */,
82-
A7382597BB12386586B00CBE /* Frameworks */,
90+
44B972EC7CCA97D335CBFFA5 /* Frameworks */,
8391
);
8492
sourceTree = "<group>";
8593
};
@@ -106,20 +114,12 @@
106114
path = Runner;
107115
sourceTree = "<group>";
108116
};
109-
A7382597BB12386586B00CBE /* Frameworks */ = {
110-
isa = PBXGroup;
111-
children = (
112-
938AAEC0E4248FBA4D70B126 /* Pods_Runner.framework */,
113-
);
114-
name = Frameworks;
115-
sourceTree = "<group>";
116-
};
117117
B44C99286DD213B7F44F735D /* Pods */ = {
118118
isa = PBXGroup;
119119
children = (
120-
1FDDCB6FAA351E09F8EEF5BE /* Pods-Runner.debug.xcconfig */,
121-
853B7C1D126BD39716A43C52 /* Pods-Runner.release.xcconfig */,
122-
77C9D257E7D45A706B669099 /* Pods-Runner.profile.xcconfig */,
120+
8A3EEFCD9DA5A1769870EB73 /* Pods-Runner.debug.xcconfig */,
121+
386B22149122897B75925F59 /* Pods-Runner.release.xcconfig */,
122+
B78F2434FCACD3DF3AA4EC3B /* Pods-Runner.profile.xcconfig */,
123123
);
124124
path = Pods;
125125
sourceTree = "<group>";
@@ -131,14 +131,14 @@
131131
isa = PBXNativeTarget;
132132
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
133133
buildPhases = (
134-
09ACD134C1059E10964F7B17 /* [CP] Check Pods Manifest.lock */,
134+
9B671F5FE377A765BF814538 /* [CP] Check Pods Manifest.lock */,
135135
9740EEB61CF901F6004384FC /* Run Script */,
136136
97C146EA1CF9000F007C117D /* Sources */,
137137
97C146EB1CF9000F007C117D /* Frameworks */,
138138
97C146EC1CF9000F007C117D /* Resources */,
139139
9705A1C41CF9048500538489 /* Embed Frameworks */,
140140
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
141-
A97CF96FB2D2395640852B8E /* [CP] Embed Pods Frameworks */,
141+
5F32653136A44C8ED80754AF /* [CP] Embed Pods Frameworks */,
142142
);
143143
buildRules = (
144144
);
@@ -197,41 +197,36 @@
197197
/* End PBXResourcesBuildPhase section */
198198

199199
/* Begin PBXShellScriptBuildPhase section */
200-
09ACD134C1059E10964F7B17 /* [CP] Check Pods Manifest.lock */ = {
200+
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
201201
isa = PBXShellScriptBuildPhase;
202202
buildActionMask = 2147483647;
203203
files = (
204204
);
205-
inputFileListPaths = (
206-
);
207205
inputPaths = (
208-
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
209-
"${PODS_ROOT}/Manifest.lock",
210-
);
211-
name = "[CP] Check Pods Manifest.lock";
212-
outputFileListPaths = (
213206
);
207+
name = "Thin Binary";
214208
outputPaths = (
215-
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
216209
);
217210
runOnlyForDeploymentPostprocessing = 0;
218211
shellPath = /bin/sh;
219-
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";
220-
showEnvVarsInLog = 0;
212+
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
221213
};
222-
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
214+
5F32653136A44C8ED80754AF /* [CP] Embed Pods Frameworks */ = {
223215
isa = PBXShellScriptBuildPhase;
224216
buildActionMask = 2147483647;
225217
files = (
226218
);
227-
inputPaths = (
219+
inputFileListPaths = (
220+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
228221
);
229-
name = "Thin Binary";
230-
outputPaths = (
222+
name = "[CP] Embed Pods Frameworks";
223+
outputFileListPaths = (
224+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
231225
);
232226
runOnlyForDeploymentPostprocessing = 0;
233227
shellPath = /bin/sh;
234-
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
228+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
229+
showEnvVarsInLog = 0;
235230
};
236231
9740EEB61CF901F6004384FC /* Run Script */ = {
237232
isa = PBXShellScriptBuildPhase;
@@ -247,21 +242,26 @@
247242
shellPath = /bin/sh;
248243
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
249244
};
250-
A97CF96FB2D2395640852B8E /* [CP] Embed Pods Frameworks */ = {
245+
9B671F5FE377A765BF814538 /* [CP] Check Pods Manifest.lock */ = {
251246
isa = PBXShellScriptBuildPhase;
252247
buildActionMask = 2147483647;
253248
files = (
254249
);
255250
inputFileListPaths = (
256-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
257251
);
258-
name = "[CP] Embed Pods Frameworks";
252+
inputPaths = (
253+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
254+
"${PODS_ROOT}/Manifest.lock",
255+
);
256+
name = "[CP] Check Pods Manifest.lock";
259257
outputFileListPaths = (
260-
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
258+
);
259+
outputPaths = (
260+
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
261261
);
262262
runOnlyForDeploymentPostprocessing = 0;
263263
shellPath = /bin/sh;
264-
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
264+
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";
265265
showEnvVarsInLog = 0;
266266
};
267267
/* End PBXShellScriptBuildPhase section */

‎chat_sample/pubspec.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
1515
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
1616
# Read more about iOS versioning at
1717
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
18-
version: 1.0.0+13
18+
version: 1.0.1+0
1919

2020
environment:
2121
sdk: ">=2.13.4 <3.0.0"
@@ -31,7 +31,7 @@ dependencies:
3131
build_runner: ^2.1.2
3232
package_info: ^2.0.2
3333
flutter_svg: ^0.22.0
34-
quickblox_sdk: ^0.7.0-beta
34+
quickblox_sdk: ^0.12.3
3535
intl: ^0.17.0
3636
grouped_list: ^4.1.0
3737
connectivity: ^3.0.6

0 commit comments

Comments
 (0)