Skip to content

Commit 999b033

Browse files
YogendraShelkeYogendraShelke
authored
Merge pull request #1077 from mendix/moo/moo-1847-react-native-fast-image-upgrade-15.x.x
[MOO-1847] - react-native-fast-image upgrade
2 parents 646378e + b2caa70 commit 999b033

6 files changed

Lines changed: 60 additions & 24 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
77
## [Unreleased]
88

99
- We have added a USE_BIOMETRIC permission in Android.
10+
- We have migrated from react-native-fast-image to @d11/react-native-fast-image for new architecture compatibility.
1011

1112
## Fixes
1213

‎android/app/proguard-rules.pro‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,13 @@
1717
#}
1818
-keep class androidx.biometric.** { *; }
1919
-keep class com.sbaiahmed1.reactnativebiometrics.** { *; }
20+
21+
#@d11/react-native-fast-image
22+
-keep public class com.dylanvann.fastimage.* {*;}
23+
-keep public class com.dylanvann.fastimage.** {*;}
24+
-keep public class * implements com.bumptech.glide.module.GlideModule
25+
-keep public class * extends com.bumptech.glide.module.AppGlideModule
26+
-keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
27+
**[] $VALUES;
28+
public *;
29+
}

‎ios/Podfile.lock‎

Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@ PODS:
99
- hermes-engine/Pre-built (= 0.77.3)
1010
- hermes-engine/Pre-built (0.77.3)
1111
- IQKeyboardManager (6.5.19)
12+
- libavif/core (0.11.1)
13+
- libavif/libdav1d (0.11.1):
14+
- libavif/core
15+
- libdav1d (>= 0.6.0)
16+
- libdav1d (1.2.0)
1217
- libwebp (1.5.0):
1318
- libwebp/demux (= 1.5.0)
1419
- libwebp/mux (= 1.5.0)
@@ -1638,10 +1643,13 @@ PODS:
16381643
- React-Core
16391644
- RNDeviceInfo (14.0.4):
16401645
- React-Core
1641-
- RNFastImage (8.6.3):
1646+
- RNFastImage (8.11.1):
1647+
- libavif/core (~> 0.11.1)
1648+
- libavif/libdav1d (~> 0.11.1)
16421649
- React-Core
1643-
- SDWebImage (~> 5.11.1)
1644-
- SDWebImageWebPCoder (~> 0.8.4)
1650+
- SDWebImage (>= 5.19.1)
1651+
- SDWebImageAVIFCoder (~> 0.11.0)
1652+
- SDWebImageWebPCoder (~> 0.14)
16451653
- RNGestureHandler (2.23.1):
16461654
- DoubleConversion
16471655
- glog
@@ -1804,12 +1812,15 @@ PODS:
18041812
- ReactCommon/turbomodule/bridging
18051813
- ReactCommon/turbomodule/core
18061814
- Yoga
1807-
- SDWebImage (5.11.1):
1808-
- SDWebImage/Core (= 5.11.1)
1809-
- SDWebImage/Core (5.11.1)
1810-
- SDWebImageWebPCoder (0.8.5):
1815+
- SDWebImage (5.21.1):
1816+
- SDWebImage/Core (= 5.21.1)
1817+
- SDWebImage/Core (5.21.1)
1818+
- SDWebImageAVIFCoder (0.11.0):
1819+
- libavif/core (>= 0.11.0)
1820+
- SDWebImage (~> 5.10)
1821+
- SDWebImageWebPCoder (0.14.6):
18111822
- libwebp (~> 1.0)
1812-
- SDWebImage/Core (~> 5.10)
1823+
- SDWebImage/Core (~> 5.17)
18131824
- SocketRocket (0.7.1)
18141825
- SSZipArchive (2.6.0)
18151826
- Yoga (0.0.0)
@@ -1895,7 +1906,7 @@ DEPENDENCIES:
18951906
- "RNCPicker (from `../node_modules/@react-native-picker/picker`)"
18961907
- "RNDateTimePicker (from `../node_modules/@react-native-community/datetimepicker`)"
18971908
- RNDeviceInfo (from `../node_modules/react-native-device-info`)
1898-
- RNFastImage (from `../node_modules/react-native-fast-image`)
1909+
- "RNFastImage (from `../node_modules/@d11/react-native-fast-image`)"
18991910
- RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
19001911
- RNLocalize (from `../node_modules/react-native-localize`)
19011912
- "RNNotifee (from `../node_modules/@notifee/react-native`)"
@@ -1910,9 +1921,12 @@ DEPENDENCIES:
19101921
SPEC REPOS:
19111922
trunk:
19121923
- IQKeyboardManager
1924+
- libavif
1925+
- libdav1d
19131926
- libwebp
19141927
- OpenSSL-Universal
19151928
- SDWebImage
1929+
- SDWebImageAVIFCoder
19161930
- SDWebImageWebPCoder
19171931
- SocketRocket
19181932
- SSZipArchive
@@ -2074,7 +2088,7 @@ EXTERNAL SOURCES:
20742088
RNDeviceInfo:
20752089
:path: "../node_modules/react-native-device-info"
20762090
RNFastImage:
2077-
:path: "../node_modules/react-native-fast-image"
2091+
:path: "../node_modules/@d11/react-native-fast-image"
20782092
RNGestureHandler:
20792093
:path: "../node_modules/react-native-gesture-handler"
20802094
RNLocalize:
@@ -2103,6 +2117,8 @@ SPEC CHECKSUMS:
21032117
glog: eb93e2f488219332457c3c4eafd2738ddc7e80b8
21042118
hermes-engine: b2187dbe13edb0db8fcb2a93a69c1987a30d98a4
21052119
IQKeyboardManager: c8665b3396bd0b79402b4c573eac345a31c7d485
2120+
libavif: 84bbb62fb232c3018d6f1bab79beea87e35de7b7
2121+
libdav1d: 23581a4d8ec811ff171ed5e2e05cd27bad64c39f
21062122
libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8
21072123
op-sqlite: 137cd6d3df9b86e147fb7e2f70c8d6f97bd0941b
21082124
OpenSSL-Universal: 6082b0bf950e5636fe0d78def171184e2b3899c2
@@ -2175,7 +2191,7 @@ SPEC CHECKSUMS:
21752191
RNCPicker: 4f6d5e8d107064be32dfc8f1bcb5a3741135db0b
21762192
RNDateTimePicker: 40ffda97d071a98a10fdca4fa97e3977102ccd14
21772193
RNDeviceInfo: feea80a690d2bde1fe51461cf548039258bd03f2
2178-
RNFastImage: 5c9c9fed9c076e521b3f509fe79e790418a544e8
2194+
RNFastImage: 1e4df4dcbe3b0804dba6a276de8bb78eaae344cf
21792195
RNGestureHandler: de78ee811b577ae76d679715e5e9298b23a8c278
21802196
RNLocalize: 4f22418187ecd5ca693231093ff1d912d1b3c9bc
21812197
RNNotifee: 4a6ee5c7deaf00e005050052d73ee6315dff7ec9
@@ -2184,8 +2200,9 @@ SPEC CHECKSUMS:
21842200
RNScreens: e9bb7c3063237983e75d01bb45ce591cc4e7afc2
21852201
RNSVG: 515a902fc18a375907eb4c3abec0b803fbfa37ef
21862202
RNVectorIcons: 85ed086927e7548461d593e68b190c38a6606a05
2187-
SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
2188-
SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
2203+
SDWebImage: f29024626962457f3470184232766516dee8dfea
2204+
SDWebImageAVIFCoder: 00310d246aab3232ce77f1d8f0076f8c4b021d90
2205+
SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380
21892206
SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
21902207
SSZipArchive: 8a6ee5677c8e304bebc109e39cf0da91ccef22ea
21912208
Yoga: 92f3bb322c40a86b7233b815854730442e01b8c4

‎ios/nativeTemplate.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -488,6 +488,7 @@
488488
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Zocial.ttf",
489489
"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/React-Core_privacy.bundle",
490490
"${PODS_CONFIGURATION_BUILD_DIR}/React-cxxreact/React-cxxreact_privacy.bundle",
491+
"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.bundle",
491492
"${PODS_CONFIGURATION_BUILD_DIR}/SSZipArchive/SSZipArchive.bundle",
492493
"${PODS_CONFIGURATION_BUILD_DIR}/boost/boost_privacy.bundle",
493494
"${PODS_CONFIGURATION_BUILD_DIR}/glog/glog_privacy.bundle",
@@ -522,6 +523,7 @@
522523
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Zocial.ttf",
523524
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-Core_privacy.bundle",
524525
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-cxxreact_privacy.bundle",
526+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SDWebImage.bundle",
525527
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SSZipArchive.bundle",
526528
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/boost_privacy.bundle",
527529
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/glog_privacy.bundle",
@@ -588,6 +590,7 @@
588590
"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Zocial.ttf",
589591
"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/React-Core_privacy.bundle",
590592
"${PODS_CONFIGURATION_BUILD_DIR}/React-cxxreact/React-cxxreact_privacy.bundle",
593+
"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.bundle",
591594
"${PODS_CONFIGURATION_BUILD_DIR}/SSZipArchive/SSZipArchive.bundle",
592595
"${PODS_CONFIGURATION_BUILD_DIR}/boost/boost_privacy.bundle",
593596
"${PODS_CONFIGURATION_BUILD_DIR}/glog/glog_privacy.bundle",
@@ -622,6 +625,7 @@
622625
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Zocial.ttf",
623626
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-Core_privacy.bundle",
624627
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-cxxreact_privacy.bundle",
628+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SDWebImage.bundle",
625629
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SSZipArchive.bundle",
626630
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/boost_privacy.bundle",
627631
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/glog_privacy.bundle",

‎package-lock.json‎

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

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"configure": "native-mobile-toolkit configure --config-path='./config.json' --verbose"
88
},
99
"dependencies": {
10+
"@d11/react-native-fast-image": "8.11.1",
1011
"@gorhom/bottom-sheet": "^5.1.1",
1112
"@mendix/native": "10.2.0",
1213
"@op-engineering/op-sqlite": "12.0.2",
@@ -22,7 +23,6 @@
2223
"react-native": "0.77.3",
2324
"react-native-device-info": "14.0.4",
2425
"react-native-blob-util": "0.21.2",
25-
"react-native-fast-image": "8.6.3",
2626
"react-native-gesture-handler": "2.23.1",
2727
"react-native-image-picker": "7.2.3",
2828
"react-native-localize": "3.2.1",

0 commit comments

Comments
 (0)