Skip to content

Commit 6b791c5

Browse files
committed
Migrate native modules linking with react native auto linking
1 parent b9b265c commit 6b791c5

23 files changed

+155
-288
lines changed

android/app/build.gradle

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,15 @@ android {
174174
}
175175
}
176176
}
177+
178+
packagingOptions {
179+
pickFirst '**/armeabi-v7a/libc++_shared.so'
180+
pickFirst '**/x86/libc++_shared.so'
181+
pickFirst '**/arm64-v8a/libc++_shared.so'
182+
pickFirst '**/x86_64/libc++_shared.so'
183+
pickFirst '**/x86/libjsc.so'
184+
pickFirst '**/armeabi-v7a/libjsc.so'
185+
}
177186
}
178187

179188
repositories {
@@ -185,31 +194,10 @@ repositories {
185194
apply from: "../../node_modules/react-native-vector-icons/fonts.gradle"
186195

187196
dependencies {
188-
implementation project(':@react-native-firebase_crashlytics')
189-
implementation project(':@react-native-firebase_app')
190-
implementation project(':react-native-photo-view-ex')
191-
implementation project(':@react-native-community_masked-view')
192-
implementation project(':react-native-safe-area-context')
193-
implementation project(':react-native-reanimated')
194-
implementation project(':@react-native-community_async-storage')
195-
implementation project(':@react-native-community_viewpager')
196-
implementation project(':react-native-screens')
197-
implementation project(':react-native-gesture-handler')
198-
implementation project(':react-native-webview')
199-
implementation project(':rn-fetch-blob')
200-
implementation project(':@react-native-community_cameraroll')
201-
implementation project(':react-native-zip-archive')
202-
implementation project(':react-native-linear-gradient')
203-
implementation project(':react-native-splash-screen')
204-
implementation project(':react-native-device-info')
205-
implementation project(':react-native-localization')
206-
implementation project(':react-native-share')
207-
implementation project(':react-native-vector-icons')
208197
debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5'
209198
releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
210199
testImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5'
211200

212-
implementation project(':react-native-spinkit')
213201
implementation 'com.github.bumptech.glide:glide:4.9.0'
214202
annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
215203
implementation 'io.reactivex.rxjava2:rxjava:2.1.5'
@@ -258,4 +246,6 @@ crashlytics {
258246
enableNdk true
259247
}
260248

249+
apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
250+
261251
apply plugin: 'com.google.gms.google-services'
-68.7 KB
Binary file not shown.
-64 KB
Binary file not shown.
-13.1 KB
Binary file not shown.
-56.9 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
-306 KB
Binary file not shown.
-55.6 KB
Binary file not shown.
-110 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
-27.7 KB
Binary file not shown.
Binary file not shown.
-25 KB
Binary file not shown.

android/app/src/main/java/com/utopia/pxview/MainApplication.java

Lines changed: 5 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,11 @@
77
import androidx.multidex.MultiDex;
88

99
import com.squareup.leakcanary.LeakCanary;
10-
import com.rnziparchive.RNZipArchivePackage;
11-
import com.BV.LinearGradient.LinearGradientPackage;
12-
import org.devio.rn.splashscreen.SplashScreenReactPackage;
13-
import com.learnium.RNDeviceInfo.RNDeviceInfo;
1410
// import com.psykar.cookiemanager.CookieManagerPackage;
15-
import com.babisoft.ReactNativeLocalization.ReactNativeLocalizationPackage;
16-
import cl.json.RNSharePackage;
17-
import com.oblador.vectoricons.VectorIconsPackage;
18-
import com.react.rnspinkit.RNSpinkitPackage;
19-
// import com.facebook.react.PackageList;
11+
import com.facebook.react.PackageList;
2012
import com.facebook.hermes.reactexecutor.HermesExecutorFactory;
2113
import com.facebook.react.bridge.JavaScriptExecutorFactory;
2214
import com.facebook.react.ReactApplication;
23-
import io.invertase.firebase.crashlytics.ReactNativeFirebaseCrashlyticsPackage;
24-
import io.invertase.firebase.app.ReactNativeFirebaseAppPackage;
25-
import io.amarcruz.photoview.PhotoViewPackage;
26-
import org.reactnative.maskedview.RNCMaskedViewPackage;
27-
import com.th3rdwave.safeareacontext.SafeAreaContextPackage;
28-
import com.swmansion.reanimated.ReanimatedPackage;
29-
import com.reactnativecommunity.asyncstorage.AsyncStoragePackage;
30-
import com.reactnativecommunity.viewpager.RNCViewPagerPackage;
31-
import com.swmansion.rnscreens.RNScreensPackage;
32-
import com.swmansion.gesturehandler.react.RNGestureHandlerPackage;
33-
import com.reactnativecommunity.webview.RNCWebViewPackage;
34-
import com.RNFetchBlob.RNFetchBlobPackage;
35-
import com.reactnativecommunity.cameraroll.CameraRollPackage;
3615
import com.facebook.react.ReactNativeHost;
3716
import com.facebook.react.ReactPackage;
3817
import com.facebook.react.shell.MainReactPackage;
@@ -53,40 +32,14 @@ public boolean getUseDeveloperSupport() {
5332

5433
@Override
5534
protected List<ReactPackage> getPackages() {
56-
// @SuppressWarnings("UnnecessaryLocalVariable")
57-
// List<ReactPackage> packages = new PackageList(this).getPackages();
35+
@SuppressWarnings("UnnecessaryLocalVariable")
36+
List<ReactPackage> packages = new PackageList(this).getPackages();
5837
// // Packages that cannot be autolinked yet can be added manually here, for example:
5938
// // packages.add(new MyReactNativePackage());
6039
// packages.add(new RNFetchBlobPackage());
6140
// packages.add(new CameraRollPackage());
62-
// packages.add(new UgoiraViewPackage());
63-
// return packages;
64-
65-
return Arrays.<ReactPackage>asList(
66-
new MainReactPackage(),
67-
new ReactNativeFirebaseCrashlyticsPackage(),
68-
new ReactNativeFirebaseAppPackage(),
69-
new PhotoViewPackage(),
70-
new RNCMaskedViewPackage(),
71-
new SafeAreaContextPackage(),
72-
new ReanimatedPackage(),
73-
new AsyncStoragePackage(),
74-
new RNCViewPagerPackage(),
75-
new RNScreensPackage(),
76-
new RNGestureHandlerPackage(),
77-
new RNCWebViewPackage(),
78-
new RNFetchBlobPackage(),
79-
new CameraRollPackage(),
80-
new UgoiraViewPackage(),
81-
new RNZipArchivePackage(),
82-
new LinearGradientPackage(),
83-
new SplashScreenReactPackage(),
84-
new RNDeviceInfo(),
85-
new ReactNativeLocalizationPackage(),
86-
new RNSharePackage(),
87-
new VectorIconsPackage(),
88-
new RNSpinkitPackage()
89-
);
41+
packages.add(new UgoiraViewPackage());
42+
return packages;
9043
}
9144

9245
@Override

android/settings.gradle

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,3 @@
11
rootProject.name = 'PxView'
2-
include ':@react-native-firebase_crashlytics'
3-
project(':@react-native-firebase_crashlytics').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-firebase/crashlytics/android')
4-
include ':@react-native-firebase_app'
5-
project(':@react-native-firebase_app').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-firebase/app/android')
6-
include ':react-native-photo-view-ex'
7-
project(':react-native-photo-view-ex').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-photo-view-ex/android')
8-
include ':@react-native-community_masked-view'
9-
project(':@react-native-community_masked-view').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/masked-view/android')
10-
include ':react-native-safe-area-context'
11-
project(':react-native-safe-area-context').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-safe-area-context/android')
12-
include ':react-native-reanimated'
13-
project(':react-native-reanimated').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-reanimated/android')
14-
include ':@react-native-community_async-storage'
15-
project(':@react-native-community_async-storage').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/async-storage/android')
16-
include ':@react-native-community_viewpager'
17-
project(':@react-native-community_viewpager').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/viewpager/android')
18-
include ':react-native-screens'
19-
project(':react-native-screens').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-screens/android')
20-
include ':react-native-gesture-handler'
21-
project(':react-native-gesture-handler').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-gesture-handler/android')
22-
include ':react-native-webview'
23-
project(':react-native-webview').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webview/android')
242
apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
25-
include ':rn-fetch-blob'
26-
project(':rn-fetch-blob').projectDir = new File(rootProject.projectDir, '../node_modules/rn-fetch-blob/android')
27-
include ':@react-native-community_cameraroll'
28-
project(':@react-native-community_cameraroll').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/cameraroll/android')
293
include ':app'

ios/Podfile

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -31,39 +31,23 @@ target 'PxView' do
3131
pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
3232
pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
3333
pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
34-
pod 'react-native-cameraroll', :path => '../node_modules/@react-native-community/cameraroll'
3534

36-
pod 'rn-fetch-blob', :path => '../node_modules/rn-fetch-blob'
3735

38-
pod 'RNShare', :path => '../node_modules/react-native-share'
3936

40-
pod 'react-native-webview', :path => '../node_modules/react-native-webview'
4137

42-
pod 'RNGestureHandler', :path => '../node_modules/react-native-gesture-handler'
4338

44-
pod 'RNScreens', :path => '../node_modules/react-native-screens'
4539

46-
pod 'RNCViewpager', :path => '../node_modules/@react-native-community/viewpager'
4740

48-
pod 'RNVectorIcons', :path => '../node_modules/react-native-vector-icons'
4941

50-
pod 'RNCAsyncStorage', :path => '../node_modules/@react-native-community/async-storage'
5142

52-
pod 'RNZipArchive', :path => '../node_modules/react-native-zip-archive'
5343

54-
pod 'RNReanimated', :path => '../node_modules/react-native-reanimated'
5544

56-
pod 'react-native-safe-area-context', :path => '../node_modules/react-native-safe-area-context'
5745

58-
pod 'RNCMaskedView', :path => '../node_modules/@react-native-community/masked-view'
5946

60-
pod 'ReactNativeWebPFormat', :path => '../node_modules/react-native-webp-format'
6147

62-
pod 'react-native-photo-view-ex', :path => '../node_modules/react-native-photo-view-ex'
6348

64-
pod 'RNFBApp', :path => '../node_modules/@react-native-firebase/app'
6549

66-
pod 'RNFBCrashlytics', :path => '../node_modules/@react-native-firebase/crashlytics'
50+
6751

6852
target 'PxViewTests' do
6953
inherit! :search_paths

ios/Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,6 +590,6 @@ SPEC CHECKSUMS:
590590
SSZipArchive: fa16b8cc4cdeceb698e5e5d9f67e9558532fbf23
591591
Yoga: 14927e37bd25376d216b150ab2a561773d57911f
592592

593-
PODFILE CHECKSUM: 777c3d1d5656c96a2241b7b5338787885b84b409
593+
PODFILE CHECKSUM: 889cfa9f3c23b93188dc827fc3c180fbd96905bf
594594

595595
COCOAPODS: 1.7.5

0 commit comments

Comments
 (0)