Skip to content

Commit

Permalink
Updates in response to react-native-daily-js package specifying depen…
Browse files Browse the repository at this point in the history
…dencies with native code as `peerDependencies` rather than `dependencies`, which let this playground app make use of autolinking. See react-native-community/cli#870 for background
  • Loading branch information
kompfner committed Jun 16, 2020
1 parent f66b6eb commit a05a9b7
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import android.content.Context;
import com.facebook.react.PackageList;
import com.facebook.react.ReactApplication;
import com.reactnativecommunity.asyncstorage.AsyncStoragePackage;
import com.facebook.react.ReactInstanceManager;
import com.facebook.react.ReactNativeHost;
import com.facebook.react.ReactPackage;
Expand All @@ -27,7 +28,6 @@ protected List<ReactPackage> getPackages() {
List<ReactPackage> packages = new PackageList(this).getPackages();
// Packages that cannot be autolinked yet can be added manually here, for example:
// packages.add(new MyReactNativePackage());
packages.add(new WebRTCModulePackage());
return packages;
}

Expand Down
2 changes: 2 additions & 0 deletions DailyPlayground/android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
rootProject.name = 'DailyPlayground'
include ':@react-native-community_async-storage'
project(':@react-native-community_async-storage').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/async-storage/android')
apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
include ':WebRTCModule', ':app'
project(':WebRTCModule').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webrtc/android')
4 changes: 0 additions & 4 deletions DailyPlayground/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ def add_flipper_pods!(versions = {})
pod 'FlipperKit/FlipperKitHighlightOverlay', versions['Flipper'], :configuration => 'Debug'
pod 'FlipperKit/FlipperKitLayoutTextSearchable', versions['Flipper'], :configuration => 'Debug'
pod 'FlipperKit/FlipperKitNetworkPlugin', versions['Flipper'], :configuration => 'Debug'

pod 'react-native-webrtc', :path => '../node_modules/react-native-webrtc'
end

# Post Install processing for Flipper
Expand Down Expand Up @@ -79,8 +77,6 @@ target 'DailyPlayground' 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 'RNCAsyncStorage', :path => '../node_modules/@react-native-community/async-storage'

target 'DailyPlaygroundTests' do
inherit! :complete
# Pods for testing
Expand Down
2 changes: 1 addition & 1 deletion DailyPlayground/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,6 @@ SPEC CHECKSUMS:
Yoga: 3ebccbdd559724312790e7742142d062476b698e
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a

PODFILE CHECKSUM: 17254efca30ad76cd05ce035bf4e04b320291020
PODFILE CHECKSUM: c2981d2d137f80ecb0d79625a35d85da1750cb18

COCOAPODS: 1.9.1
28 changes: 22 additions & 6 deletions DailyPlayground/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion DailyPlayground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,10 @@
},
"dependencies": {
"@daily-co/react-native-daily-js": "0.0.1",
"@react-native-community/async-storage": "^1.11.0",
"react": "16.11.0",
"react-native": "0.62.2"
"react-native": "0.62.2",
"react-native-webrtc": "^1.75.3"
},
"devDependencies": {
"@babel/core": "^7.6.2",
Expand Down

0 comments on commit a05a9b7

Please sign in to comment.