|
| 1 | +diff --git a/android/build.gradle b/android/build.gradle |
| 2 | +index 96acaf0f66e2e62252fb56b65db17f261e684773..0599b2a81494d2e5aa37cd1815a4d4506d99e2ae 100644 |
| 3 | +--- a/android/build.gradle |
| 4 | ++++ b/android/build.gradle |
| 5 | +@@ -115,9 +115,6 @@ android { |
| 6 | + unitTests.includeAndroidResources = true |
| 7 | + |
| 8 | + packagingOptions { |
| 9 | +- pickFirst "**/libfbjni.so" |
| 10 | +- pickFirst "**/libc++_shared.so" |
| 11 | +- |
| 12 | + resources.excludes.add("META-INF/LICENSE.md") |
| 13 | + resources.excludes.add("META-INF/LICENSE-notice.md") |
| 14 | + } |
1 | 15 | diff --git a/android/src/main/java/expo/modules/updates/UpdatesController.kt b/android/src/main/java/expo/modules/updates/UpdatesController.kt |
2 | 16 | index 9abf5b3bb92cda5bc4ab7501c35abe2bffeed59c..4ce541561208d8cd1ccaaf46f49211a5818a4015 100644 |
3 | 17 | --- a/android/src/main/java/expo/modules/updates/UpdatesController.kt |
@@ -109,7 +123,7 @@ index 4cbb7670f0a1853f9ecc9a5e41d033884df793fb..6a74db0df9083635588534e88fb154cd |
109 | 123 | } |
110 | 124 |
|
111 | 125 | diff --git a/android/src/main/java/expo/modules/updates/procedures/RestartReactAppExtensions.kt b/android/src/main/java/expo/modules/updates/procedures/RestartReactAppExtensions.kt |
112 | | -index 7392ca808be584f994a26f5b7294cd2d29f1fc8d..23252f652bcfbab569541d5ed2d371b7843e2e09 100644 |
| 126 | +index 7392ca808be584f994a26f5b7294cd2d29f1fc8d..39dccdd3c2ee165653a94f8404f8a7489d51e4d2 100644 |
113 | 127 | --- a/android/src/main/java/expo/modules/updates/procedures/RestartReactAppExtensions.kt |
114 | 128 | +++ b/android/src/main/java/expo/modules/updates/procedures/RestartReactAppExtensions.kt |
115 | 129 | @@ -2,19 +2,29 @@ package expo.modules.updates.procedures |
@@ -154,29 +168,3 @@ index 7392ca808be584f994a26f5b7294cd2d29f1fc8d..23252f652bcfbab569541d5ed2d371b7 |
154 | 168 | } |
155 | 169 | - reactHost.reload(reason) |
156 | 170 | } |
157 | | -\ No newline at end of file |
158 | | -diff --git a/android/build.gradle b/android/build.gradle |
159 | | -index c0f4ed40a0ad93db7cd77adf8f95f6641f4207ee..f52a0de0e844fd0e7ca514db358b42f6997d98bb 100644 |
160 | | ---- a/android/build.gradle |
161 | | -+++ b/android/build.gradle |
162 | | -@@ -114,20 +114,17 @@ android { |
163 | | - testOptions { |
164 | | - unitTests.includeAndroidResources = true |
165 | | - |
166 | | - packagingOptions { |
167 | | -- pickFirst "**/libfbjni.so" |
168 | | -- pickFirst "**/libc++_shared.so" |
169 | | -- |
170 | | - resources.excludes.add("META-INF/LICENSE.md") |
171 | | - resources.excludes.add("META-INF/LICENSE-notice.md") |
172 | | - } |
173 | | - } |
174 | | - packagingOptions { |
175 | | - excludes += [ |
176 | | - "**/libc++_shared.so", |
177 | | - "**/libfbjni.so", |
178 | | - ] |
179 | | - } |
180 | | - sourceSets { |
181 | | - main.assets.srcDirs += files("$projectDir/src/main/certificates".toString()) |
182 | | - androidTest.assets.srcDirs += files("$projectDir/src/androidTest/schemas".toString()) |
0 commit comments