Skip to content

Commit 4b4b711

Browse files
committed
Upgraded RN, dependencies, refactor
1 parent e1d9587 commit 4b4b711

35 files changed

+500
-332
lines changed

.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
tsconfig.json

.prettierrc.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,6 @@ module.exports = {
55
printWidth: 120,
66
bracketSpacing: true,
77
arrowParens: 'avoid',
8+
importOrder: ['<THIRD_PARTY_MODULES>', '^[./]'],
9+
importOrderSeparation: false,
810
};

Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ GEM
33
specs:
44
CFPropertyList (3.0.5)
55
rexml
6-
activesupport (6.1.4.4)
6+
activesupport (6.1.4.6)
77
concurrent-ruby (~> 1.0, >= 1.0.2)
88
i18n (>= 1.6, < 2)
99
minitest (>= 5.1)
@@ -63,7 +63,7 @@ GEM
6363
fuzzy_match (2.0.4)
6464
gh_inspector (1.1.3)
6565
httpclient (2.8.3)
66-
i18n (1.9.1)
66+
i18n (1.10.0)
6767
concurrent-ruby (~> 1.0)
6868
json (2.6.1)
6969
minitest (5.15.0)

android/app/build.gradle

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,17 @@ android {
139139
versionName "1.0"
140140
multiDexEnabled true
141141
}
142+
143+
dexOptions {
144+
incremental true
145+
javaMaxHeapSize "4g"
146+
}
147+
142148
splits {
143149
abi {
144150
reset()
145151
enable enableSeparateBuildPerCPUArchitecture
146-
universalApk false // If true, also generate a universal APK
152+
universalApk true // If true, also generate a universal APK
147153
include "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
148154
}
149155
}
@@ -193,21 +199,23 @@ android {
193199
dependencies {
194200
implementation fileTree(dir: "libs", include: ["*.jar"])
195201
implementation project(':react-native-splash-screen')
196-
implementation 'androidx.appcompat:appcompat:1.1.0-rc01'
202+
// implementation 'androidx.appcompat:appcompat:1.1.0-rc01'
197203
//noinspection GradleDynamicVersion
198204
implementation "com.facebook.react:react-native:+" // From node_modules
199205

200206
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
201207

208+
implementation 'com.facebook.fresco:fresco:2.6.0'
209+
202210
// For animated GIF support
203-
implementation 'com.facebook.fresco:animated-gif:2.0.0'
211+
implementation 'com.facebook.fresco:animated-gif:2.6.0'
204212

205213
// For WebP support, including animated WebP
206-
implementation 'com.facebook.fresco:animated-webp:2.0.0'
207-
implementation 'com.facebook.fresco:webpsupport:2.0.0'
214+
implementation 'com.facebook.fresco:animated-webp:2.6.0'
215+
implementation 'com.facebook.fresco:webpsupport:2.6.0'
208216

209217
// For WebP support, without animations
210-
implementation 'com.facebook.fresco:webpsupport:2.0.0'
218+
implementation 'com.facebook.fresco:webpsupport:2.6.0'
211219

212220
debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
213221
exclude group:'com.facebook.fbjni'
-68.7 KB
Binary file not shown.
-64 KB
Binary file not shown.
-13.1 KB
Binary file not shown.
-54.7 KB
Binary file not shown.
-162 KB
Binary file not shown.
-130 KB
Binary file not shown.

0 commit comments

Comments
 (0)