toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(MM-63733): patch expo-image to use the latest version of APNG4Android (#8765)

Browse source
This commit is contained in:
Rahim Rahman 2025-04-12 19:52:18 -06:00 committed by GitHub
parent 972f59b6cd
commit c85101af10
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 3 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/settings.gradle
View file

@ -8,10 +8,6 @@ include ':reactnativenotifications'
project(':reactnativenotifications').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-notifications/lib/android/app')
include ':watermelondb-jsi'
project(':watermelondb-jsi').projectDir = new File(rootProject.projectDir, '../node_modules/@nozbe/watermelondb/native/android-jsi')
include ':frameanimation'
project(':frameanimation').projectDir = new File('../node_modules/APNG4Android/frameanimation')
include ':gif'
project(':gif').projectDir = new File('../node_modules/APNG4Android/gif')
includeBuild('../node_modules/@react-native/gradle-plugin')
apply from: new File(["node", "--print", "require.resolve('expo/package.json')"].execute(null, rootDir).text.trim(), "../scripts/autolinking.gradle")
useExpoModules()

6
package-lock.json generated
View file

@ -44,7 +44,6 @@
"@shopify/flash-list": "1.8.0",
"@stream-io/flat-list-mvcp": "0.10.3",
"@voximplant/react-native-foreground-service": "3.0.2",
"APNG4Android": "github:mattermost/APNG4Android#15a7e93d59542d18c1e562d49b3f4896dd1643a6",
"base-64": "1.0.0",
"commonmark": "npm:@mattermost/commonmark@0.31.2-0",
"commonmark-react-renderer": "github:mattermost/commonmark-react-renderer#81b5d27509652bae50b4b510ede777dd3bd923cf",
@ -9253,11 +9252,6 @@
"node": ">= 8"
}
},
"node_modules/APNG4Android": {
"version": "1.0.0",
"resolved": "git+ssh://git@github.com/mattermost/APNG4Android.git#15a7e93d59542d18c1e562d49b3f4896dd1643a6",
"integrity": "sha512-Aqhpb5ZvjJJPmCjwWnekWHMNOx3P4DuRzmEh+lHEdH2FiB1f/nnbQ7ex5jSXPRIEFMlLY5YnsMLsfbZ6RdZNtA=="
},
"node_modules/appdirsjs": {
"version": "1.2.7",
"license": "MIT"

1
package.json
View file

@ -45,7 +45,6 @@
"@shopify/flash-list": "1.8.0",
"@stream-io/flat-list-mvcp": "0.10.3",
"@voximplant/react-native-foreground-service": "3.0.2",
"APNG4Android": "github:mattermost/APNG4Android#15a7e93d59542d18c1e562d49b3f4896dd1643a6",
"base-64": "1.0.0",
"commonmark": "npm:@mattermost/commonmark@0.31.2-0",
"commonmark-react-renderer": "github:mattermost/commonmark-react-renderer#81b5d27509652bae50b4b510ede777dd3bd923cf",

11
patches/expo-image+2.0.7.patch
View file

@ -1,18 +1,13 @@
diff --git a/node_modules/expo-image/android/build.gradle b/node_modules/expo-image/android/build.gradle
index a85fb5e..ac568c1 100644
index 11492a2..b6bb941 100644
--- a/node_modules/expo-image/android/build.gradle
+++ b/node_modules/expo-image/android/build.gradle
@@ -44,7 +44,12 @@ dependencies {
@@ -44,7 +44,7 @@ dependencies {
kapt "com.github.bumptech.glide:compiler:${GLIDE_VERSION}"
api 'com.caverock:androidsvg-aar:1.4'
- implementation "com.github.penfeizhou.android.animation:glide-plugin:3.0.2"
+ implementation project(':frameanimation')
+ implementation project(':gif')
+ implementation("com.github.penfeizhou.android.animation:glide-plugin:3.0.2") {
+ exclude group: 'com.github.penfeizhou.android.animation', module: 'frameanimation'
+ exclude group: 'com.github.penfeizhou.android.animation', module: 'gif'
+ }
+ implementation("com.github.penfeizhou.android.animation:glide-plugin:3.0.3")
implementation "com.github.bumptech.glide:avif-integration:${GLIDE_VERSION}"
api 'com.github.bumptech.glide:okhttp3-integration:4.11.0'