Skip to content

Commit 87c899b

Browse files
Merge pull request #63 from cometchat-pro/v3.0.6-2
V3.0.6 2
2 parents 315aee3 + aa32abc commit 87c899b

File tree

15 files changed

+1279
-109
lines changed

15 files changed

+1279
-109
lines changed

CometChatWorkspace/android/app/build.gradle

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ import com.android.build.OutputFile
7979

8080
project.ext.react = [
8181
enableHermes: false, // clean and rebuild if changing
82+
entryFile : "index.js"
8283
]
8384

8485
apply from: "../../node_modules/react-native/react.gradle"
@@ -145,23 +146,35 @@ android {
145146
}
146147
}
147148
signingConfigs {
148-
debug {
149+
debug {
149150
storeFile file('debug.keystore')
150151
storePassword 'android'
151152
keyAlias 'androiddebugkey'
152153
keyPassword 'android'
153154
}
155+
release {
156+
157+
storeFile file('my-release-key.keystore')
158+
storePassword 'cometchat'
159+
keyAlias 'my-key-alias'
160+
keyPassword 'cometchat'
161+
162+
}
154163
}
155164
buildTypes {
156-
debug {
165+
debug {
166+
// Caution! In production, you need to generate your own keystore file.
167+
// see https://reactnative.dev/docs/signed-apk-android.
157168
signingConfig signingConfigs.debug
169+
minifyEnabled false
170+
158171
}
159172
release {
160173
// Caution! In production, you need to generate your own keystore file.
161174
// see https://reactnative.dev/docs/signed-apk-android.
162-
signingConfig signingConfigs.debug
163-
minifyEnabled enableProguardInReleaseBuilds
164-
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
175+
signingConfig signingConfigs.release
176+
minifyEnabled false
177+
165178
}
166179
}
167180

@@ -185,6 +198,7 @@ dependencies {
185198
implementation fileTree(dir: "libs", include: ["*.jar"])
186199
//noinspection GradleDynamicVersion
187200
implementation "com.facebook.react:react-native:+" // From node_modules
201+
implementation 'com.facebook.soloader:soloader:0.9.0+'
188202

189203
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
190204

@@ -213,7 +227,7 @@ dependencies {
213227
// Run this once to be able to run the application with BUCK
214228
// puts all compile dependencies into folder libs for BUCK to use
215229
task copyDownloadableDepsToLibs(type: Copy) {
216-
from configurations.compile
230+
from configurations.implementation
217231
into 'libs'
218232
}
219233

2.2 KB
Binary file not shown.
2.49 KB
Binary file not shown.

CometChatWorkspace/android/app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
package="com.example">
33

44
<uses-permission android:name="android.permission.INTERNET" />
5-
5+
<uses-permission-sdk-23 android:name="android.permission.VIBRATE"/>
66
<application
77
android:name=".MainApplication"
8+
android:usesCleartextTraffic="true"
89
android:label="@string/app_name"
910
android:icon="@mipmap/ic_launcher"
1011
android:roundIcon="@mipmap/ic_launcher_round"

CometChatWorkspace/android/app/src/main/assets/index.android.bundle

Lines changed: 1205 additions & 0 deletions
Large diffs are not rendered by default.

CometChatWorkspace/android/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,15 @@ buildscript {
1313
minSdkVersion = 24
1414
compileSdkVersion = 29
1515
targetSdkVersion = 29
16+
ndkVersion = "21.4.7075529"
17+
1618
}
1719
repositories {
1820
google()
1921
jcenter()
2022
}
2123
dependencies {
22-
classpath('com.android.tools.build:gradle:4.2.1')
24+
classpath('com.android.tools.build:gradle:4.0.2')
2325
// NOTE: Do not place your application dependencies here; they belong
2426
// in the individual module build.gradle files
2527
}

CometChatWorkspace/android/gradle.properties

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,9 @@ android.enableJetifier=true
2626

2727
# Version of flipper SDK to use with React Native
2828
FLIPPER_VERSION=0.54.0
29-
29+
MYAPP_UPLOAD_STORE_FILE=my-upload-key.keystore
30+
MYAPP_UPLOAD_KEY_ALIAS=my-key-alias
31+
MYAPP_UPLOAD_STORE_PASSWORD=cometchat
32+
MYAPP_UPLOAD_KEY_PASSWORD=cometchat
3033
org.gradle.jvmargs=-Xmx4608m
34+

CometChatWorkspace/ios/Podfile.lock

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -198,20 +198,20 @@ PODS:
198198
- react-native-cometchat-rtc (2.1.1):
199199
- CometChatCalls (= 2.1.1)
200200
- React
201-
- react-native-document-picker (4.3.0):
201+
- react-native-document-picker (7.1.3):
202202
- React-Core
203-
- react-native-image-picker (3.8.1):
203+
- react-native-image-picker (4.7.0):
204204
- React-Core
205205
- react-native-keep-awake (4.0.0):
206206
- React
207-
- react-native-safe-area-context (3.2.0):
207+
- react-native-safe-area-context (3.3.2):
208208
- React-Core
209-
- react-native-video (5.1.1):
209+
- react-native-video (5.2.0):
210210
- React-Core
211-
- react-native-video/Video (= 5.1.1)
212-
- react-native-video/Video (5.1.1):
211+
- react-native-video/Video (= 5.2.0)
212+
- react-native-video/Video (5.2.0):
213213
- React-Core
214-
- react-native-webview (11.6.3):
214+
- react-native-webview (11.15.1):
215215
- React-Core
216216
- React-RCTActionSheet (0.63.3):
217217
- React-Core/RCTActionSheetHeaders (= 0.63.3)
@@ -275,35 +275,36 @@ PODS:
275275
- React-jsi (= 0.63.3)
276276
- rn-fetch-blob (0.12.0):
277277
- React-Core
278-
- RNCAsyncStorage (1.15.5):
278+
- RNCAsyncStorage (1.15.14):
279279
- React-Core
280280
- RNCMaskedView (0.1.11):
281281
- React
282-
- RNCPicker (1.16.1):
282+
- RNCPicker (2.2.1):
283283
- React-Core
284-
- RNFastImage (8.3.4):
284+
- RNFastImage (8.5.11):
285285
- React-Core
286-
- SDWebImage (~> 5.8)
287-
- SDWebImageWebPCoder (~> 0.6.1)
286+
- SDWebImage (~> 5.11.1)
287+
- SDWebImageWebPCoder (~> 0.8.4)
288288
- RNGestureHandler (1.10.3):
289289
- React-Core
290290
- RNReanimated (1.13.3):
291291
- React-Core
292-
- RNScreens (2.18.1):
292+
- RNScreens (3.10.1):
293293
- React-Core
294-
- RNSound (0.11.0):
295-
- React
296-
- RNSound/Core (= 0.11.0)
297-
- RNSound/Core (0.11.0):
298-
- React
299-
- RNVectorIcons (7.1.0):
300-
- React
301-
- SDWebImage (5.12.1):
302-
- SDWebImage/Core (= 5.12.1)
303-
- SDWebImage/Core (5.12.1)
304-
- SDWebImageWebPCoder (0.6.1):
294+
- React-RCTImage
295+
- RNSound (0.11.1):
296+
- React-Core
297+
- RNSound/Core (= 0.11.1)
298+
- RNSound/Core (0.11.1):
299+
- React-Core
300+
- RNVectorIcons (9.0.0):
301+
- React-Core
302+
- SDWebImage (5.11.1):
303+
- SDWebImage/Core (= 5.11.1)
304+
- SDWebImage/Core (5.11.1)
305+
- SDWebImageWebPCoder (0.8.4):
305306
- libwebp (~> 1.0)
306-
- SDWebImage/Core (~> 5.7)
307+
- SDWebImage/Core (~> 5.10)
307308
- Yoga (1.14.0)
308309

309310
DEPENDENCIES:
@@ -469,12 +470,12 @@ SPEC CHECKSUMS:
469470
React-jsiexecutor: b56c03e61c0dd5f5801255f2160a815f4a53d451
470471
React-jsinspector: 8e68ffbfe23880d3ee9bafa8be2777f60b25cbe2
471472
react-native-cometchat-rtc: e1aac9a0dbed313662ed8eea1c16e942aea1a623
472-
react-native-document-picker: 20f652c2402d3ddc81f396d8167c3bd978add4a2
473-
react-native-image-picker: 31971f6184e7c1dcb4fc1f122e1ba2c3fb11ef1e
473+
react-native-document-picker: ec07866a30707f23660c0f3ae591d669d3e89096
474+
react-native-image-picker: 4b090b73077c3a71b91fddc739a594feebd00184
474475
react-native-keep-awake: afad8a51dfef9fe9655a6344771be32c8596d774
475-
react-native-safe-area-context: f0906bf8bc9835ac9a9d3f97e8bde2a997d8da79
476-
react-native-video: 0bb76b6d6b77da3009611586c7dbf817b947f30e
477-
react-native-webview: d172aa35a17915e1ae9a1c476d20984c1efaf4f0
476+
react-native-safe-area-context: 584dc04881deb49474363f3be89e4ca0e854c057
477+
react-native-video: a4c2635d0802f983594b7057e1bce8f442f0ad28
478+
react-native-webview: ea4899a1056c782afa96dd082179a66cbebf5504
478479
React-RCTActionSheet: 53ea72699698b0b47a6421cb1c8b4ab215a774aa
479480
React-RCTAnimation: 1befece0b5183c22ae01b966f5583f42e69a83c2
480481
React-RCTBlob: 0b284339cbe4b15705a05e2313a51c6d8b51fa40
@@ -486,19 +487,19 @@ SPEC CHECKSUMS:
486487
React-RCTVibration: 8e9fb25724a0805107fc1acc9075e26f814df454
487488
ReactCommon: 4167844018c9ed375cc01a843e9ee564399e53c3
488489
rn-fetch-blob: f065bb7ab7fb48dd002629f8bdcb0336602d3cba
489-
RNCAsyncStorage: 56a3355a10b5d660c48c6e37325ac85ebfd09885
490+
RNCAsyncStorage: ea6b5c280997b2b32a587793163b1f10e580c4f7
490491
RNCMaskedView: 0e1bc4bfa8365eba5fbbb71e07fbdc0555249489
491-
RNCPicker: 61c7a0645b9e4ac67960aa7f22a3effcecfdfb8d
492-
RNFastImage: d4870d58f5936111c56218dbd7fcfc18e65b58ff
492+
RNCPicker: cb57c823d5ce8d2d0b5dfb45ad97b737260dc59e
493+
RNFastImage: 1f2cab428712a4baaf78d6169eaec7f622556dd7
493494
RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211
494495
RNReanimated: 514a11da3a2bcc6c3dfd9de32b38e2b9bf101926
495-
RNScreens: f7ad633b2e0190b77b6a7aab7f914fad6f198d8d
496-
RNSound: da030221e6ac7e8290c6b43f2b5f2133a8e225b0
497-
RNVectorIcons: bc69e6a278b14842063605de32bec61f0b251a59
498-
SDWebImage: 4dc3e42d9ec0c1028b960a33ac6b637bb432207b
499-
SDWebImageWebPCoder: d0dac55073088d24b2ac1b191a71a8f8d0adac21
496+
RNScreens: 522705f2e5c9d27efb17f24aceb2bf8335bc7b8e
497+
RNSound: 27e8268bdb0a1f191f219a33267f7e0445e8d62f
498+
RNVectorIcons: 4143ba35feebab8fdbe6bc43d1e776b393d47ac8
499+
SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
500+
SDWebImageWebPCoder: f93010f3f6c031e2f8fb3081ca4ee6966c539815
500501
Yoga: 7d13633d129fd179e01b8953d38d47be90db185a
501502

502503
PODFILE CHECKSUM: 1ba0ec105dabbe3963d3fa4c0ad548618d04cab0
503504

504-
COCOAPODS: 1.11.2
505+
COCOAPODS: 1.11.3

CometChatWorkspace/package-lock.json

Lines changed: 0 additions & 40 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

CometChatWorkspace/package.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
{
22
"name": "example",
3-
43
"version": "3.0.6-2",
5-
64
"private": true,
75
"scripts": {
86
"android": "react-native run-android",
@@ -37,7 +35,6 @@
3735
"react-native-gesture-handler": "^1.9.0",
3836
"react-native-image-picker": "^4.6.1",
3937
"react-native-keep-awake": "^4.0.0",
40-
"react-native-modal": "^13.0.1",
4138
"react-native-reanimated": "^1.13.2",
4239
"react-native-safe-area-context": "^3.1.9",
4340
"react-native-screens": "^3.10.1",

0 commit comments

Comments
 (0)