Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug/fix spurious linking errors yarn install #596

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -198,13 +198,10 @@ android {

dependencies {
implementation project(':react-native-reanimated')
implementation project(':react-native-gesture-handler')
implementation project(':react-native-webview')
implementation fileTree(dir: "libs", include: ["*.jar"])
implementation "com.facebook.react:react-native:+" // From node_modules
implementation "androidx.annotation:annotation:1.1.0"

compile project(':react-native-fs')

if (enableHermes) {
def hermesPath = "../../node_modules/hermes-engine/android/";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
import com.facebook.react.PackageList;
import com.facebook.react.ReactApplication;
import com.swmansion.reanimated.ReanimatedPackage;
import com.swmansion.gesturehandler.react.RNGestureHandlerPackage;
import com.reactnativecommunity.webview.RNCWebViewPackage;
import com.facebook.react.ReactNativeHost;
import com.facebook.react.ReactPackage;
import com.facebook.soloader.SoLoader;
Expand Down
4 changes: 0 additions & 4 deletions android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
rootProject.name = 'COVIDSafePaths'
include ':react-native-reanimated'
project(':react-native-reanimated').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-reanimated/android')
include ':react-native-gesture-handler'
project(':react-native-gesture-handler').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-gesture-handler/android')
include ':react-native-fs'
project(':react-native-fs').projectDir = new File(settingsDir, '../node_modules/react-native-fs/android')
include ':react-native-zip-archive'
project(':react-native-zip-archive').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-zip-archive/android')
include ':react-native-webview'
project(':react-native-webview').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webview/android')
include ':react-native-push-notification'
project(':react-native-push-notification').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-push-notification/android')
include ':@mauron85_react-native-background-geolocation'
Expand Down
2 changes: 0 additions & 2 deletions ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ target 'COVIDSafePaths' do
pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'

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

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

target 'COVIDSafePathsTests' do
Expand Down
8 changes: 1 addition & 7 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,6 @@ PODS:
- React
- react-native-viewpager (3.3.0):
- React
- react-native-webview (8.2.1):
- React
- React-RCTActionSheet (0.61.5):
- React-Core/RCTActionSheetHeaders (= 0.61.5)
- React-RCTAnimation (0.61.5):
Expand Down Expand Up @@ -308,7 +306,6 @@ DEPENDENCIES:
- react-native-splash-screen (from `../node_modules/react-native-splash-screen`)
- react-native-uuid-generator (from `../node_modules/react-native-uuid-generator`)
- "react-native-viewpager (from `../node_modules/@react-native-community/viewpager`)"
- react-native-webview (from `../node_modules/react-native-webview`)
- React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`)
- React-RCTAnimation (from `../node_modules/react-native/Libraries/NativeAnimation`)
- React-RCTBlob (from `../node_modules/react-native/Libraries/Blob`)
Expand Down Expand Up @@ -394,8 +391,6 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native-uuid-generator"
react-native-viewpager:
:path: "../node_modules/@react-native-community/viewpager"
react-native-webview:
:path: "../node_modules/react-native-webview"
React-RCTActionSheet:
:path: "../node_modules/react-native/Libraries/ActionSheetIOS"
React-RCTAnimation:
Expand Down Expand Up @@ -475,7 +470,6 @@ SPEC CHECKSUMS:
react-native-splash-screen: 200d11d188e2e78cea3ad319964f6142b6384865
react-native-uuid-generator: 82ffa2a1cac94242ebed52c4dedc5044d3412717
react-native-viewpager: a7b438ca32c57b2614ece2a123e7fe116f743131
react-native-webview: 160ac8d6bb974e2933f2de6bb7464a8e934ff31d
React-RCTActionSheet: 600b4d10e3aea0913b5a92256d2719c0cdd26d76
React-RCTAnimation: 791a87558389c80908ed06cc5dfc5e7920dfa360
React-RCTBlob: d89293cc0236d9cb0933d85e430b0bbe81ad1d72
Expand Down Expand Up @@ -503,6 +497,6 @@ SPEC CHECKSUMS:
SSZipArchive: fa16b8cc4cdeceb698e5e5d9f67e9558532fbf23
Yoga: f2a7cd4280bfe2cca5a7aed98ba0eb3d1310f18b

PODFILE CHECKSUM: 8210ab026428e53d909db91142f627bb251c5dc8
PODFILE CHECKSUM: 87c7ffe808bd84ff30ccdc4349cddb30eea2b0ec

COCOAPODS: 1.9.1
10 changes: 10 additions & 0 deletions react-native.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,14 @@ module.exports = {
android: {},
},
assets: ['./app/assets/fonts'],
// add dependencies to this list when they require manual linking,
// so that the CLI does not return an error
dependencies: {
'react-native-reanimated': {
platforms: {
android: undefined,
ios: null,
},
},
},
};