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

Correct pods dependency to allow Text to render #1

Merged
merged 1 commit into from
Mar 31, 2015
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: 2 additions & 1 deletion Podfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
source 'https://github.com/CocoaPods/Specs.git'

pod 'React', :git => 'https://github.com/facebook/react-native'
pod 'React'
Copy link
Owner

Choose a reason for hiding this comment

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

I’m not sure we also needed to change sourcing the React CocoaPod, but that’s okay for now. Pulling the podspec directly from the repo was an attempt to fix the problem that this PR actually fixes. 👍

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I actually originally left it there, but it was yelling at me. When I simplified it down to just React it worked 😕 ... end of the day seemed like working was an improvement

pod 'React/RCTText'
24 changes: 9 additions & 15 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,21 +1,15 @@
PODS:
- React (0.3.1):
- React/Core (= 0.3.1)
- React/Core (0.3.1)
- React (0.2.1):
- React/Core (= 0.2.1)
- React/Core (0.2.1)
- React/RCTText (0.2.1):
- React/Core

DEPENDENCIES:
- React (from `https://github.com/facebook/react-native`)

EXTERNAL SOURCES:
React:
:git: https://github.com/facebook/react-native

CHECKOUT OPTIONS:
React:
:commit: 02298b59e23ec79a956aff73a394731d9a119443
:git: https://github.com/facebook/react-native
- React
- React/RCTText

SPEC CHECKSUMS:
React: 78d8905a15ecfd3c6b6b20abe4ca3fc49cb04b3b
React: a7828490bf8e5976d201558a28cb812c498a0eeb

COCOAPODS: 0.36.0
COCOAPODS: 0.36.1
1 change: 1 addition & 0 deletions Pods/Headers/Private/React/RCTRawTextManager.h

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

1 change: 1 addition & 0 deletions Pods/Headers/Private/React/RCTShadowRawText.h

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

1 change: 1 addition & 0 deletions Pods/Headers/Private/React/RCTShadowText.h

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

1 change: 1 addition & 0 deletions Pods/Headers/Private/React/RCTText.h

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

1 change: 1 addition & 0 deletions Pods/Headers/Private/React/RCTTextManager.h

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

1 change: 1 addition & 0 deletions Pods/Headers/Public/React/RCTRawTextManager.h

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

1 change: 1 addition & 0 deletions Pods/Headers/Public/React/RCTShadowRawText.h

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

1 change: 1 addition & 0 deletions Pods/Headers/Public/React/RCTShadowText.h

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

1 change: 1 addition & 0 deletions Pods/Headers/Public/React/RCTText.h

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

1 change: 1 addition & 0 deletions Pods/Headers/Public/React/RCTTextManager.h

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

24 changes: 9 additions & 15 deletions Pods/Manifest.lock

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

1,262 changes: 655 additions & 607 deletions Pods/Pods.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

8 changes: 2 additions & 6 deletions Pods/React/Libraries/Animation/POPAnimationMixin.js

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

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

14 changes: 7 additions & 7 deletions Pods/React/Libraries/CustomComponents/Navigator/Navigator.js

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

3 changes: 1 addition & 2 deletions Pods/React/Libraries/Geolocation/Geolocation.ios.js

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

3 changes: 0 additions & 3 deletions Pods/React/Libraries/Image/Image.ios.js

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

1 change: 0 additions & 1 deletion Pods/React/Libraries/Image/ImageResizeMode.js

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

5 changes: 2 additions & 3 deletions Pods/React/Libraries/Image/ImageStylePropTypes.js

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

7 changes: 3 additions & 4 deletions Pods/React/Libraries/Interaction/InteractionManager.js

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

7 changes: 3 additions & 4 deletions Pods/React/Libraries/Interaction/InteractionMixin.js

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

Loading