Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into master-milq
* master: (61 commits) Add missing __bridge to casts in order to avoid errors building for iOS 6 Adding Communication section to README Minor README copy-editing Add accessibility documentation to README Replace deprecated `leading` with `lineSpacing` in README. Bumping version to 1.10.0 Replacing __LP64__ macros with more semantic CGFLOAT_IS_DOUBLE [Issue #380] Taking minimumScaleFactor into account for automatic resizing of text [Issue #376] Fixing alignment and trunctionation issue on last line of text [Issue #385] Deprecating leading property, in favor of lineSpacing property [Issue #383] Reorganizing and refactoring boundingRectForCharacterRange: [Issue #383] Adding support for UIAccessibilityElement fix hitTest:WithEvent: Fixing precision warning with double to CGFloat conversion Changing return type of initWithFrame to instancetype [Issue #359] Implementing init, to allow for use with non-designated initializer with auto layout [Issue #372] Punching up documentation for active and inactive links [Issue #372] Minor code reformatting [FIX] lineHeightMultiple is ignored. [Issue #371] Opt out of inactive link styling when inactiveLinkAttributes is `nil` or empty. ...
- Loading branch information
Showing
7 changed files
with
483 additions
and
217 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,18 @@ | ||
Pod::Spec.new do |s| | ||
s.name = 'TTTAttributedLabel' | ||
s.version = '1.8.1' | ||
s.version = '1.10.0' | ||
s.authors = {'Mattt Thompson' => 'm@mattt.me'} | ||
s.homepage = 'https://github.com/mattt/TTTAttributedLabel/' | ||
s.social_media_url = 'https://twitter.com/mattt' | ||
s.summary = 'A drop-in replacement for UILabel that supports attributes, data detectors, links, and more.' | ||
s.source = {:git => 'https://github.com/mattt/TTTAttributedLabel.git', :tag => '1.8.1'} | ||
s.source = {:git => 'https://github.com/mattt/TTTAttributedLabel.git', :tag => '1.10.0'} | ||
s.license = 'MIT' | ||
|
||
s.requires_arc = true | ||
|
||
s.platform = :ios | ||
s.ios.deployment_target = '4.3' | ||
|
||
s.frameworks = 'CoreText', 'CoreGraphics' | ||
s.frameworks = 'CoreText', 'CoreGraphics', 'QuartzCore' | ||
s.source_files = 'TTTAttributedLabel' | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.