Skip to content

Commit

Permalink
Merge pull request #35 from mdewolfe/master
Browse files Browse the repository at this point in the history
Added full support for ARC.
  • Loading branch information
cbess committed May 15, 2014
2 parents cdb8a03 + 2e594e7 commit 6c64a28
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 20 deletions.
6 changes: 3 additions & 3 deletions AutoScrollLabel.podspec
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
Pod::Spec.new do |s|
s.name = 'AutoScrollLabel'
s.version = '0.2.1'
s.version = '0.3.0'
s.summary = 'A marquee like scrolling UILabel, think iPod track title scrolling. Provides edge fading, speed adjustment, scroll direction, etc.'
s.homepage = 'https://github.com/cbess/AutoScrollLabel'

s.license = { :type => 'MIT', :file => 'LICENSE.txt' }
s.author = { 'Christopher Bess' => '[email protected]' }
s.source = { :git => 'https://github.com/cbess/AutoScrollLabel.git', :tag => 'v0.2.1' }
s.source = { :git => 'https://github.com/cbess/AutoScrollLabel.git', :tag => 'v0.3.0' }

s.platform = :ios, '6.0'
s.requires_arc = false
s.requires_arc = true
s.source_files = 'CBAutoScrollLabel/*.{h,m}'
s.frameworks = 'QuartzCore', 'CoreGraphics'
s.screenshots = 'https://github.com/cbess/AutoScrollLabel/raw/master/AutoScrollLabelDemo/screenshot.png'
Expand Down
17 changes: 0 additions & 17 deletions CBAutoScrollLabel/CBAutoScrollLabel.m
Original file line number Diff line number Diff line change
Expand Up @@ -84,18 +84,10 @@ - (void)commonInit
// store labels
[self.scrollView addSubview:label];
[labelSet addObject:label];

#if ! __has_feature(objc_arc)
[label release];
#endif
}

self.labels = [labelSet.allObjects copy];

#if ! __has_feature(objc_arc)
[labelSet release];
#endif

// default values
_scrollDirection = CBAutoScrollDirectionLeft;
_scrollSpeed = kDefaultPixelsPerSecond;
Expand All @@ -114,13 +106,8 @@ - (void)commonInit

- (void)dealloc
{
self.labels = nil;
[NSObject cancelPreviousPerformRequestsWithTarget:self];
[[NSNotificationCenter defaultCenter] removeObserver:self];

#if ! __has_feature(objc_arc)
[super dealloc];
#endif
}

- (void)setFrame:(CGRect)frame
Expand All @@ -140,10 +127,6 @@ - (UIScrollView *)scrollView
_scrollView.backgroundColor = [UIColor clearColor];

[self addSubview:_scrollView];

#if ! __has_feature(objc_arc)
[_scrollView release];
#endif
}
return _scrollView;
}
Expand Down

0 comments on commit 6c64a28

Please sign in to comment.