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.

Sign up for GitHub

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

Feature/update #2

Merged
merged 2 commits into from
Aug 6, 2018
Merged

Feature/update #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b18ab79
Updates to tvOS & iOS (lock files & project files), committed package…
sanderlooijenga Aug 6, 2018
0227476
Merge remote-tracking branch 'origin/master' into feature/update
sanderlooijenga Aug 6, 2018
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
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ Ideal starting point for advanced projects.
## Requirements
- [Node](https://nodejs.org) `6.x` or newer
- [NPM](https://npmjs.com/) `4.0.0` or newer
- [Cocoapods](https://cocoapods.org) `1.4.x` or newer
- [Cocoapods](https://cocoapods.org) `1.5.3` or newer
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pavjacko is this correct?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yep. while it can work with lower.. it's better to avoid lock diffs

- [React Native](http://facebook.github.io/react-native/docs/getting-started.html) for development
- [Xcode](https://developer.apple.com/xcode/) for iOS development
- [Android Studio](https://developer.android.com/studio/index.html) for Android development
Expand Down Expand Up @@ -121,7 +121,7 @@ npm run ios
npm run android

//tvOS
npm run ios
npm run tvos

//AndroidTV (make sure you have 1 android device connected or 1 emulator running)
npm run androidtv
Expand Down
16 changes: 10 additions & 6 deletions ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,17 +73,21 @@ DEPENDENCIES:
- React/RCTWebSocket (from `../node_modules/react-native`)
- yoga (from `../node_modules/react-native/ReactCommon/yoga`)

SPEC REPOS:
https://github.com/cocoapods/specs.git:
- boost-for-react-native

EXTERNAL SOURCES:
DoubleConversion:
:podspec: ../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec
:podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
Folly:
:podspec: ../node_modules/react-native/third-party-podspecs/Folly.podspec
:podspec: "../node_modules/react-native/third-party-podspecs/Folly.podspec"
glog:
:podspec: ../node_modules/react-native/third-party-podspecs/glog.podspec
:podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec"
React:
:path: ../node_modules/react-native
:path: "../node_modules/react-native"
yoga:
:path: ../node_modules/react-native/ReactCommon/yoga
:path: "../node_modules/react-native/ReactCommon/yoga"

SPEC CHECKSUMS:
boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
Expand All @@ -95,4 +99,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 800096735503f1f7f49a8f66ffd00208e15bcb11

COCOAPODS: 1.4.0
COCOAPODS: 1.5.3
16 changes: 0 additions & 16 deletions ios/ReactNativeVanilla.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@
2070914F21078B0D00FFF1DB /* Frameworks */,
2070915021078B0D00FFF1DB /* Resources */,
078FA032F331DECA70CAAFA9 /* [CP] Embed Pods Frameworks */,
A675FF24942ADB045A1C9B5E /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -177,21 +176,6 @@
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ReactNativeVanilla/Pods-ReactNativeVanilla-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
A675FF24942ADB045A1C9B5E /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ReactNativeVanilla/Pods-ReactNativeVanilla-resources.sh\"\n";
showEnvVarsInLog = 0;
};
DCD72F9D17945D99199178F9 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down
Loading